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

Paul Gofman : ddraw: Port light delete / add test for ddraw2.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: ce67874d61f7a4c7c1c8ec0a93ad0bb3702eac63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce67874d61f7a4c7c1c8ec0a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 28 14:23:32 2019 +0300 ddraw: Port light delete / add test for ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4ae04d1..d056949 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7209,8 +7209,16 @@ static void test_lighting(void) light_desc.dwFlags = D3DLIGHT_ACTIVE; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); - ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport2_DeleteLight(viewport, light); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + light_desc.dwFlags = 0; + hr = IDirect3DLight_GetLight(light, (D3DLIGHT *)&light_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(light_desc.dwFlags == D3DLIGHT_ACTIVE, "Got unexpected flags %#x.\n", light_desc.dwFlags); + hr = IDirect3DViewport2_AddLight(viewport, light); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice2_SetTransform(device, D3DTRANSFORMSTATE_WORLD, tests[i].world_matrix);

1 0

Paul Gofman : ddraw: Port light delete / add test for ddraw1.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 56404595d5c42168d4fd4c1ec3a1b802a6aab5c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56404595d5c42168d4fd4c1e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 28 14:23:33 2019 +0300 ddraw: Port light delete / add test for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 44e4c88..ee1a9cb 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6213,6 +6213,11 @@ static void test_lighting(void) ok(hr == D3DERR_LIGHTHASVIEWPORT, "Got unexpected hr %#x.\n", hr); destroy_viewport(device, viewport2); + hr = IDirect3DViewport_DeleteLight(viewport, light); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport_AddLight(viewport, light); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice_SetMatrix(device, world_handle, tests[i].world_matrix);

1 0

Piotr Caban : tapi32: Don't use strncasecmp.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: e66370bfb3c8d9b0faa05c36d2cf0994ba9561cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=e66370bfb3c8d9b0faa05c36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 18:51:03 2019 +0200 tapi32: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/line.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index c0e25ba..d21fd91 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -24,6 +24,7 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wingdi.h" #include "winreg.h" #include "winnls.h" @@ -845,7 +846,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, == ERROR_SUCCESS){ DWORD size_val; i++; - if( strncasecmp(loc_key_name, "location", 8) || + if( _strnicmp(loc_key_name, "location", 8) || (RegOpenKeyA(hkLocations, loc_key_name, &hsubkey) != ERROR_SUCCESS)) continue; @@ -907,7 +908,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, ERROR_SUCCESS){ DWORD size_val; i++; - if( strncasecmp(card_key_name, "card", 4) || ERROR_SUCCESS != + if( _strnicmp(card_key_name, "card", 4) || ERROR_SUCCESS != (RegOpenKeyA(hkCards, card_key_name, &hsubkey) )) continue; numcards++; @@ -984,7 +985,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, == ERROR_SUCCESS){ DWORD size_val; i++; - if( strncasecmp(loc_key_name, "location", 8) || + if( _strnicmp(loc_key_name, "location", 8) || (RegOpenKeyA(hkLocations, loc_key_name, &hsubkey) != ERROR_SUCCESS)) continue; @@ -1077,7 +1078,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, ERROR_SUCCESS){ DWORD size_val; i++; - if( strncasecmp(card_key_name, "card", 4) || + if( _strnicmp(card_key_name, "card", 4) || (RegOpenKeyA(hkCards, card_key_name, &hsubkey) != ERROR_SUCCESS)) continue; size_val=sizeof(DWORD);

1 0

André Hentschel : ntdll: Add stub for RtlInstallFunctionTableCallback on ARM/ARM64.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 0e26aaa3ed80341b213508d7f2666e740bda90c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e26aaa3ed80341b213508d7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 31 20:24:54 2019 +0200 ntdll: Add stub for RtlInstallFunctionTableCallback on ARM/ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_arm64.c | 12 +++++++++++- include/winnt.h | 6 ++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec index 1c5744d..644e868 100644 --- a/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec +++ b/dlls/api-ms-win-core-rtlsupport-l1-1-0/api-ms-win-core-rtlsupport-l1-1-0.spec @@ -5,7 +5,7 @@ @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall -norelay RtlRaiseException(ptr) ntdll.RtlRaiseException diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ff695a..233c4ef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -722,7 +722,7 @@ # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) @ stdcall RtlInt64ToUnicodeString(int64 long ptr) @ stdcall RtlIntegerToChar(long long long ptr) @ stdcall RtlIntegerToUnicodeString(long long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 75a1133..32205ea 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1058,6 +1058,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/********************************************************************** + * RtlInstallFunctionTableCallback (NTDLL.@) + */ +BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD table, DWORD base, DWORD length, + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) +{ + FIXME( "%x %x %d %p %p %s: stub\n", table, base, length, callback, context, wine_dbgstr_w(dll) ); + return TRUE; +} + /************************************************************************* * RtlAddGrowableFunctionTable (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 1d26125..94520c9 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -637,7 +637,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; ucontext_t *context = ucontext; - DWORD *orig_pc = PC_sig(context); + DWORD *orig_pc = (DWORD *)PC_sig(context); /* check for page fault inside the thread stack */ if (signal == SIGSEGV && @@ -977,6 +977,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P return TRUE; } +/********************************************************************** + * RtlInstallFunctionTableCallback (NTDLL.@) + */ +BOOLEAN CDECL RtlInstallFunctionTableCallback( ULONG_PTR table, ULONG_PTR base, DWORD length, + PGET_RUNTIME_FUNCTION_CALLBACK callback, PVOID context, PCWSTR dll ) +{ + FIXME( "%lx %lx %d %p %p %s: stub\n", table, base, length, callback, context, wine_dbgstr_w(dll) ); + return TRUE; +} + /************************************************************************* * RtlAddGrowableFunctionTable (NTDLL.@) diff --git a/include/winnt.h b/include/winnt.h index 5694ad7..28e87c7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1745,8 +1745,11 @@ typedef struct _CONTEXT ULONG Padding2[2]; /* 198 */ } CONTEXT; +typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD,PVOID); + BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +BOOLEAN CDECL RtlInstallFunctionTableCallback(DWORD,DWORD,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); #endif /* __arm__ */ @@ -1878,8 +1881,11 @@ typedef struct _CONTEXT DWORD64 Wvr[ARM64_MAX_WATCHPOINTS]; /* 380 */ } CONTEXT; +typedef PRUNTIME_FUNCTION (CALLBACK *PGET_RUNTIME_FUNCTION_CALLBACK)(DWORD64,PVOID); + BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,ULONG_PTR); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); +BOOLEAN CDECL RtlInstallFunctionTableCallback(ULONG_PTR,ULONG_PTR,DWORD,PGET_RUNTIME_FUNCTION_CALLBACK,PVOID,PCWSTR); #endif /* __aarch64__ */

1 0

Paul Gofman : ddraw: Fix ddraw[1-4] light activation / deactivation.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: addc611b2ac56d4fc59a9df8f129f96ea4105773 URL: https://source.winehq.org/git/wine.git/?a=commit;h=addc611b2ac56d4fc59a9df8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 28 21:50:12 2019 +0300 ddraw: Fix ddraw[1-4] light activation / deactivation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42572 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 38 +++++++++++++++++--------------------- dlls/ddraw/light.c | 27 ++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 11 ++++++++++- dlls/ddraw/viewport.c | 19 +++++++++++-------- 5 files changed, 51 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 087c709..2e58123 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -519,6 +519,7 @@ struct d3d_viewport *unsafe_impl_from_IDirect3DViewport(IDirect3DViewport *iface /* Helper functions */ void viewport_activate(struct d3d_viewport *viewport, BOOL ignore_lights) DECLSPEC_HIDDEN; +void viewport_deactivate(struct d3d_viewport *viewport) DECLSPEC_HIDDEN; void d3d_viewport_init(struct d3d_viewport *viewport, struct ddraw *ddraw) DECLSPEC_HIDDEN; /***************************************************************************** diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 85ebfb6..adfbc41 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -819,7 +819,9 @@ static HRESULT WINAPI d3d_device3_DeleteViewport(IDirect3DDevice3 *iface, IDirec if (device->current_viewport == vp) { - TRACE("Deleting current viewport, unsetting and releasing\n"); + TRACE("Deleting current viewport, unsetting and releasing.\n"); + + viewport_deactivate(vp); IDirect3DViewport3_Release(viewport); device->current_viewport = NULL; } @@ -1689,48 +1691,42 @@ static HRESULT WINAPI d3d_device1_GetDirect3D(IDirect3DDevice *iface, IDirect3D * (Is a NULL viewport valid?) * *****************************************************************************/ -static HRESULT WINAPI d3d_device3_SetCurrentViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *Direct3DViewport3) +static HRESULT WINAPI d3d_device3_SetCurrentViewport(IDirect3DDevice3 *iface, IDirect3DViewport3 *viewport) { - struct d3d_device *This = impl_from_IDirect3DDevice3(iface); - struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport3(Direct3DViewport3); + struct d3d_viewport *vp = unsafe_impl_from_IDirect3DViewport3(viewport); + struct d3d_device *device = impl_from_IDirect3DDevice3(iface); - TRACE("iface %p, viewport %p.\n", iface, Direct3DViewport3); + TRACE("iface %p, viewport %p, current_viewport %p.\n", iface, viewport, device->current_viewport); if (!vp) { - WARN("Direct3DViewport3 is NULL, returning DDERR_INVALIDPARAMS\n"); + WARN("Direct3DViewport3 is NULL.\n"); return DDERR_INVALIDPARAMS; } wined3d_mutex_lock(); /* Do nothing if the specified viewport is the same as the current one */ - if (This->current_viewport == vp) + if (device->current_viewport == vp) { wined3d_mutex_unlock(); return D3D_OK; } - if (vp->active_device != This) + if (vp->active_device != device) { - WARN("Viewport %p active device is %p.\n", vp, vp->active_device); + WARN("Viewport %p, active device %p.\n", vp, vp->active_device); wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; } - /* Release previous viewport and AddRef the new one */ - if (This->current_viewport) + IDirect3DViewport3_AddRef(viewport); + if (device->current_viewport) { - TRACE("ViewportImpl is at %p, interface is at %p\n", This->current_viewport, - &This->current_viewport->IDirect3DViewport3_iface); - IDirect3DViewport3_Release(&This->current_viewport->IDirect3DViewport3_iface); + viewport_deactivate(device->current_viewport); + IDirect3DViewport3_Release(&device->current_viewport->IDirect3DViewport3_iface); } - IDirect3DViewport3_AddRef(Direct3DViewport3); - - /* Set this viewport as the current viewport */ - This->current_viewport = vp; - - /* Activate this viewport */ - viewport_activate(This->current_viewport, FALSE); + device->current_viewport = vp; + viewport_activate(device->current_viewport, FALSE); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index f99b144..c6513ff 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -54,15 +54,14 @@ void light_activate(struct d3d_light *light) TRACE("light %p.\n", light); - if (!light->active_viewport || !light->active_viewport->active_device) return; + if (!light->active_viewport || !light->active_viewport->active_device + || light->active_viewport->active_device->current_viewport != light->active_viewport) + return; device = light->active_viewport->active_device; light_update(light); - if (!(light->light.dwFlags & D3DLIGHT_ACTIVE)) - { + if (light->light.dwFlags & D3DLIGHT_ACTIVE) IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, TRUE); - light->light.dwFlags |= D3DLIGHT_ACTIVE; - } } /***************************************************************************** @@ -78,14 +77,13 @@ void light_deactivate(struct d3d_light *light) TRACE("light %p.\n", light); - if (!light->active_viewport || !light->active_viewport->active_device) return; - device = light->active_viewport->active_device; + if (!light->active_viewport || !light->active_viewport->active_device + || light->active_viewport->active_device->current_viewport != light->active_viewport) + return; + device = light->active_viewport->active_device; if (light->light.dwFlags & D3DLIGHT_ACTIVE) - { IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); - light->light.dwFlags &= ~D3DLIGHT_ACTIVE; - } } static inline struct d3d_light *impl_from_IDirect3DLight(IDirect3DLight *iface) @@ -195,13 +193,12 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) wined3d_mutex_lock(); memcpy(&light->light, data, sizeof(*data)); - if (!(light->light.dwFlags & D3DLIGHT_ACTIVE) && flags & D3DLIGHT_ACTIVE) - light_activate(light); - else if (light->light.dwFlags & D3DLIGHT_ACTIVE && !(flags & D3DLIGHT_ACTIVE)) + + if (!(flags & D3DLIGHT_ACTIVE)) light_deactivate(light); - else if (flags & D3DLIGHT_ACTIVE) - light_update(light); + light->light.dwFlags = flags; + light_activate(light); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 263679d..0116106 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4211,7 +4211,16 @@ static void test_lighting(void) light_desc.dwFlags = D3DLIGHT_ACTIVE; hr = IDirect3DLight_SetLight(light, (D3DLIGHT *)&light_desc); - ok(SUCCEEDED(hr), "Failed to set light, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DViewport3_DeleteLight(viewport, light); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + light_desc.dwFlags = 0; + hr = IDirect3DLight_GetLight(light, (D3DLIGHT *)&light_desc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(light_desc.dwFlags == D3DLIGHT_ACTIVE, "Got unexpected flags %#x.\n", light_desc.dwFlags); + + hr = IDirect3DViewport3_AddLight(viewport, light); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(tests); ++i) { diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e7e4463..daa5ac8 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -112,6 +112,16 @@ void viewport_activate(struct d3d_viewport *This, BOOL ignore_lights) IDirect3DDevice7_SetViewport(&This->active_device->IDirect3DDevice7_iface, &vp); } +void viewport_deactivate(struct d3d_viewport *viewport) +{ + struct d3d_light *light; + + LIST_FOR_EACH_ENTRY(light, &viewport->light_list, struct d3d_light, entry) + { + light_deactivate(light); + } +} + /***************************************************************************** * _dump_D3DVIEWPORT, _dump_D3DVIEWPORT2 * @@ -783,14 +793,7 @@ static HRESULT WINAPI d3d_viewport_AddLight(IDirect3DViewport3 *iface, IDirect3D /* Attach the light to the viewport */ light_impl->active_viewport = This; - - /* If active, activate the light */ - if (This->active_device && light_impl->light.dwFlags & D3DLIGHT_ACTIVE) - { - /* Disable the flag so that light_activate actually does its job. */ - light_impl->light.dwFlags &= ~D3DLIGHT_ACTIVE; - light_activate(light_impl); - } + light_activate(light_impl); wined3d_mutex_unlock();

1 0

Piotr Caban : user.exe16: Don't use strncasecmp.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 49ce3132d9161e0f28304ae8ce6bc7e21b2d184e URL: https://source.winehq.org/git/wine.git/?a=commit;h=49ce3132d9161e0f28304ae8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 18:50:55 2019 +0200 user.exe16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/comm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index a9141db..a1715c8 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -416,7 +416,7 @@ INT16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb) TRACE("(%s), ptr %p\n", device, lpdcb); - if (strncasecmp(device,"COM",3)) + if (_strnicmp(device,"COM",3)) return -1; port = device[3] - '0'; @@ -457,7 +457,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) if (port-- == 0) ERR("BUG ! COM0 or LPT0 don't exist !\n"); - if (!strncasecmp(device,"COM",3)) + if (!_strnicmp(device,"COM",3)) { if (COM[port].handle) return IE_OPEN; @@ -508,7 +508,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) } } else - if (!strncasecmp(device,"LPT",3)) { + if (!_strnicmp(device,"LPT",3)) { if (LPT[port].handle) return IE_OPEN;

1 0

Nikolay Sivov : mferror: Add more media source and stream error codes.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: f56bcd0e7958efe6242cc76542cb59bc71881cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f56bcd0e7958efe6242cc765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:02 2019 +0300 mferror: Add more media source and stream error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mferror/mferror.mc | 84 +++++++++++++++++++++++++++++++++++++++++++ include/mferror.h | 12 +++++++ po/ar.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/bg.po | 81 ++++++++++++++++++++++++++++++++++-------- po/ca.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/cs.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/da.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/de.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/el.po | 81 ++++++++++++++++++++++++++++++++++-------- po/en.po | 76 +++++++++++++++++++++++++++++++-------- po/en_US.po | 76 +++++++++++++++++++++++++++++++-------- po/eo.po | 86 ++++++++++++++++++++++++++++++++++++-------- po/es.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/fa.po | 80 +++++++++++++++++++++++++++++++++-------- po/fi.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/fr.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/he.po | 82 ++++++++++++++++++++++++++++++++++-------- po/hi.po | 79 +++++++++++++++++++++++++++++++++-------- po/hr.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/hu.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/it.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ja.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ko.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/lt.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ml.po | 81 ++++++++++++++++++++++++++++++++++-------- po/nb_NO.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/nl.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/or.po | 79 +++++++++++++++++++++++++++++++++-------- po/pa.po | 79 +++++++++++++++++++++++++++++++++-------- po/pl.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/pt_BR.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/pt_PT.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/rm.po | 77 ++++++++++++++++++++++++++++++++-------- po/ro.po | 91 +++++++++++++++++++++++++++++++++++++++-------- po/ru.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/si.po | 88 +++++++++++++++++++++++++++++++++++++-------- po/sk.po | 87 +++++++++++++++++++++++++++++++++++++-------- po/sl.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 84 +++++++++++++++++++++++++++++++++++-------- po/sr_RS(a)latin.po | 84 +++++++++++++++++++++++++++++++++++-------- po/sv.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ta.po | 76 +++++++++++++++++++++++++++++++-------- po/te.po | 79 +++++++++++++++++++++++++++++++++-------- po/th.po | 81 ++++++++++++++++++++++++++++++++++-------- po/tr.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/uk.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/wa.po | 80 +++++++++++++++++++++++++++++++++-------- po/wine.pot | 76 +++++++++++++++++++++++++++++++-------- po/zh_CN.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/zh_TW.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- 50 files changed, 3651 insertions(+), 672 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f56bcd0e7958efe6242c…

1 0

Nikolay Sivov : mfplat: Use attributes helpers for stream descriptor.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: e4e9d3a2f3579fb5b3139b72ed96aefda7730613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e9d3a2f3579fb5b3139b72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:07 2019 +0300 mfplat: Use attributes helpers for stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 157 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 124 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4e9d3a2f3579fb5b313…

1 0

Zebediah Figura : hid: Fix length argument to GetOverlappedResult().
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: a0a3b6b90e2d938200bbe86fd131e1ed320d2744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a3b6b90e2d938200bbe86f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 29 16:18:31 2019 -0500 hid: Fix length argument to GetOverlappedResult(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidd.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4b703ca..ca14c4f 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,15 +38,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); -static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len) { OVERLAPPED ovl = {0}; + DWORD ret_len; BOOL ret; ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, &ret_len, &ovl); if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + ret = GetOverlappedResult(file, &ovl, &ret_len, TRUE); CloseHandle(ovl.hEvent); return ret; } @@ -65,7 +66,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION)); if (ret) { @@ -79,7 +80,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -91,43 +92,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers)); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -137,14 +138,12 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(info))) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, data, info.DescriptorSize)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -156,5 +155,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); }

1 0

Zebediah Figura : rpcrt4: Write type format strings for complex structs.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: ad2cba9d8427a9543a0cca18267136b45741ba66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad2cba9d8427a9543a0cca18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:19 2019 -0500 rpcrt4: Write type format strings for complex structs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46378 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 231 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 221 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 3d3d42b..5a4de51 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -355,24 +355,42 @@ static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) return FC_BOGUS_ARRAY; } -static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, +static BOOL type_is_non_iface_pointer(ITypeInfo *typeinfo, TYPEDESC *desc) +{ + if (desc->vt == VT_PTR) + return !type_pointer_is_iface(typeinfo, desc->lptdesc); + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + TYPEATTR *attr; + BOOL ret; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + ret = type_is_non_iface_pointer(refinfo, &attr->tdescAlias); + else + ret = FALSE; + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + + return ret; + } + else + return FALSE; +} + +static void write_struct_members(ITypeInfo *typeinfo, unsigned char *str, size_t *len, TYPEATTR *attr) { - unsigned char fc = get_struct_fc(typeinfo, attr); unsigned int struct_offset = 0; unsigned char basetype; - size_t off = *len; TYPEDESC *tdesc; VARDESC *desc; WORD i; - if (fc != FC_STRUCT) - FIXME("fc %02x not implemented\n", fc); - - WRITE_CHAR (str, *len, FC_STRUCT); - WRITE_CHAR (str, *len, attr->cbAlignment - 1); - WRITE_SHORT(str, *len, attr->cbSizeInstance); - for (i = 0; i < attr->cVars; i++) { ITypeInfo_GetVarDesc(typeinfo, i, &desc); @@ -391,12 +409,205 @@ static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, if ((basetype = get_basetype(typeinfo, tdesc))) WRITE_CHAR(str, *len, basetype); + else if (type_is_non_iface_pointer(typeinfo, tdesc)) + WRITE_CHAR(str, *len, FC_POINTER); + else + { + WRITE_CHAR(str, *len, FC_EMBEDDED_COMPLEX); + WRITE_CHAR(str, *len, 0); + WRITE_SHORT(str, *len, 0); + } ITypeInfo_ReleaseVarDesc(typeinfo, desc); } if (!(*len & 1)) WRITE_CHAR (str, *len, FC_PAD); WRITE_CHAR (str, *len, FC_END); +} + +static void write_simple_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, + size_t *len, TYPEATTR *attr) +{ + write_struct_members(typeinfo, str, len, attr); +} + +static BOOL type_needs_pointer_deref(ITypeInfo *typeinfo, TYPEDESC *desc) +{ + if (desc->vt == VT_PTR || desc->vt == VT_UNKNOWN || desc->vt == VT_DISPATCH) + return TRUE; + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + BOOL ret = FALSE; + TYPEATTR *attr; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + ret = type_needs_pointer_deref(refinfo, &attr->tdescAlias); + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + + return ret; + } + else + return FALSE; +} + +static void write_complex_struct_pointer_layout(ITypeInfo *typeinfo, + TYPEDESC *desc, unsigned char *str, size_t *len) +{ + unsigned char basetype; + + if (desc->vt == VT_PTR && !type_pointer_is_iface(typeinfo, desc->lptdesc)) + { + WRITE_CHAR(str, *len, FC_UP); + if ((basetype = get_basetype(typeinfo, desc->lptdesc))) + { + WRITE_CHAR(str, *len, FC_SIMPLE_POINTER); + WRITE_CHAR(str, *len, basetype); + WRITE_CHAR(str, *len, FC_PAD); + } + else + { + if (type_needs_pointer_deref(typeinfo, desc->lptdesc)) + WRITE_CHAR(str, *len, FC_POINTER_DEREF); + else + WRITE_CHAR(str, *len, 0); + WRITE_SHORT(str, *len, 0); + } + } + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + TYPEATTR *attr; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + write_complex_struct_pointer_layout(refinfo, &attr->tdescAlias, str, len); + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + } +} + +static size_t write_complex_struct_pointer_ref(ITypeInfo *typeinfo, + TYPEDESC *desc, unsigned char *str, size_t *len) +{ + if (desc->vt == VT_PTR && !type_pointer_is_iface(typeinfo, desc->lptdesc) + && !get_basetype(typeinfo, desc->lptdesc)) + { + return write_type_tfs(typeinfo, str, len, desc->lptdesc, FALSE, FALSE); + } + else if (desc->vt == VT_USERDEFINED) + { + ITypeInfo *refinfo; + TYPEATTR *attr; + size_t ret = 0; + + ITypeInfo_GetRefTypeInfo(typeinfo, desc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); + + if (attr->typekind == TKIND_ALIAS) + ret = write_complex_struct_pointer_ref(refinfo, &attr->tdescAlias, str, len); + + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + + return ret; + } + + return 0; +} + +static void write_complex_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, + size_t *len, TYPEATTR *attr) +{ + size_t pointer_layout_offset, pointer_layout, member_layout, ref; + unsigned int struct_offset = 0; + TYPEDESC *tdesc; + VARDESC *desc; + WORD i; + + WRITE_SHORT(str, *len, 0); /* conformant array description */ + pointer_layout_offset = *len; + WRITE_SHORT(str, *len, 0); /* pointer layout; will be filled in later */ + member_layout = *len; + + /* First pass: write the struct members and pointer layout, but do not yet + * write the offsets for embedded complexes and pointer refs. These must be + * handled after we write the whole struct description, since it must be + * contiguous. */ + + write_struct_members(typeinfo, str, len, attr); + + pointer_layout = *len; + if (str) *((short *)(str + pointer_layout_offset)) = pointer_layout - pointer_layout_offset; + + for (i = 0; i < attr->cVars; i++) + { + ITypeInfo_GetVarDesc(typeinfo, i, &desc); + write_complex_struct_pointer_layout(typeinfo, &desc->elemdescVar.tdesc, str, len); + ITypeInfo_ReleaseVarDesc(typeinfo, desc); + } + + /* Second pass: write types for embedded complexes and non-simple pointers. */ + + struct_offset = 0; + + for (i = 0; i < attr->cVars; i++) + { + ITypeInfo_GetVarDesc(typeinfo, i, &desc); + tdesc = &desc->elemdescVar.tdesc; + + if (struct_offset != desc->oInst) + member_layout++; /* alignment directive */ + struct_offset = desc->oInst + type_memsize(typeinfo, tdesc); + + if (get_basetype(typeinfo, tdesc)) + member_layout++; + else if (type_is_non_iface_pointer(typeinfo, tdesc)) + { + member_layout++; + if ((ref = write_complex_struct_pointer_ref(typeinfo, tdesc, str, len))) + { + if (str) *((short *)(str + pointer_layout + 2)) = ref - (pointer_layout + 2); + } + pointer_layout += 4; + } + else + { + ref = write_type_tfs(typeinfo, str, len, tdesc, FALSE, FALSE); + if (str) *((short *)(str + member_layout + 2)) = ref - (member_layout + 2); + member_layout += 4; + } + + ITypeInfo_ReleaseVarDesc(typeinfo, desc); + } +} + +static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, + size_t *len, TYPEATTR *attr) +{ + unsigned char fc = get_struct_fc(typeinfo, attr); + size_t off = *len; + + /* For the sake of simplicity, write pointer structs as complex structs. */ + if (fc == FC_PSTRUCT) + fc = FC_BOGUS_STRUCT; + + WRITE_CHAR (str, *len, fc); + WRITE_CHAR (str, *len, attr->cbAlignment - 1); + WRITE_SHORT(str, *len, attr->cbSizeInstance); + + if (fc == FC_STRUCT) + write_simple_struct_tfs(typeinfo, str, len, attr); + else if (fc == FC_BOGUS_STRUCT) + write_complex_struct_tfs(typeinfo, str, len, attr); return off; }

1 0

Zebediah Figura : oleaut32/tests: Test marshalling of complex structs.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: c299f09e255fdea7f6e06ea2f59c9b799c86a5b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c299f09e255fdea7f6e06ea2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:20 2019 -0500 oleaut32/tests: Test marshalling of complex structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 21 ++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 9a7d995..4f84442 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1441,6 +1441,28 @@ static HRESULT WINAPI Widget_rect(IWidget *iface, RECT in, RECT *out, RECT *in_p return S_OK; } +static HRESULT WINAPI Widget_complex_struct(IWidget *iface, struct complex in) +{ + HRESULT hr; + + ok(in.c == 98, "Got char %d.\n", in.c); + ok(in.i == 76543, "Got int %d.\n", in.i); + ok(*in.pi == 2, "Got int pointer %d.\n", *in.pi); + ok(**in.ppi == 10, "Got int double pointer %d.\n", **in.ppi); + hr = ISomethingFromDispatch_anotherfn(in.iface); + ok(hr == 0x01234567, "Got wrong hr %#x.\n", hr); + hr = ISomethingFromDispatch_anotherfn(*in.iface_ptr); + ok(hr == 0x01234567, "Got wrong hr %#x.\n", hr); + ok(!lstrcmpW(in.bstr, test_bstr2), "Got string %s.\n", wine_dbgstr_w(in.bstr)); + ok(V_VT(&in.var) == VT_I4, "Got wrong type %u.\n", V_VT(&in.var)); + ok(V_I4(&in.var) == 123, "Got wrong value %d.\n", V_I4(&in.var)); + ok(!memcmp(&in.mystruct, &test_mystruct1, sizeof(MYSTRUCT)), "Structs didn't match.\n"); + ok(!memcmp(in.arr, test_array1, sizeof(array_t)), "Arrays didn't match.\n"); + ok(in.myint == 456, "Got int %d.\n", in.myint); + + return S_OK; +} + static HRESULT WINAPI Widget_array(IWidget *iface, array_t in, array_t out, array_t in_out) { static const array_t empty = {0}; @@ -1600,6 +1622,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_mystruct_ptr_ptr, Widget_thin_struct, Widget_rect, + Widget_complex_struct, Widget_array, Widget_variant_array, Widget_mystruct_array, @@ -2500,6 +2523,9 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) { MYSTRUCT out, in_ptr, in_out, *in_ptr_ptr; RECT rect_out, rect_in_ptr, rect_in_out; + ISomethingFromDispatch *sfd; + struct complex complex; + int i, i2, *pi = &i2; HRESULT hr; memcpy(&out, &test_mystruct2, sizeof(MYSTRUCT)); @@ -2531,6 +2557,25 @@ static void test_marshal_struct(IWidget *widget, IDispatch *disp) ok(EqualRect(&rect_out, &test_rect5), "Rects didn't match.\n"); ok(EqualRect(&rect_in_ptr, &test_rect3), "Rects didn't match.\n"); ok(EqualRect(&rect_in_out, &test_rect7), "Rects didn't match.\n"); + + /* Test complex structs. */ + complex.c = 98; + complex.i = 76543; + i = 2; + complex.pi = &i; + i2 = 10; + complex.ppi = π + complex.iface = create_disp_obj(); + sfd = create_disp_obj(); + complex.iface_ptr = &sfd; + complex.bstr = SysAllocString(test_bstr2); + V_VT(&complex.var) = VT_I4; + V_I4(&complex.var) = 123; + memcpy(&complex.mystruct, &test_mystruct1, sizeof(MYSTRUCT)); + memcpy(complex.arr, test_array1, sizeof(array_t)); + complex.myint = 456; + hr = IWidget_complex_struct(widget, complex); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_marshal_array(IWidget *widget, IDispatch *disp) diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index cdc7dc1..14b80c4 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -65,6 +65,7 @@ enum IWidget_dispids DISPID_TM_STRUCT_PTR_PTR, DISPID_TM_THIN_STRUCT, DISPID_TM_RECT, + DISPID_TM_COMPLEX_STRUCT, DISPID_TM_ARRAY, DISPID_TM_VARIANT_ARRAY, DISPID_TM_STRUCT_ARRAY, @@ -105,6 +106,8 @@ library TestTypelib typedef [public] int myint_t; + typedef int array_t[4]; + coclass ApplicationObject2; [ @@ -335,7 +338,23 @@ library TestTypelib [id(DISPID_TM_RECT)] HRESULT rect([in] RECT in, [out] RECT *out, [in] RECT *in_ptr, [in, out] RECT *in_out); - typedef int array_t[4]; + struct complex + { + char c; + int i; + int *pi; + int **ppi; + ISomethingFromDispatch *iface; + ISomethingFromDispatch **iface_ptr; + BSTR bstr; + VARIANT var; + MYSTRUCT mystruct; + array_t arr; + myint_t myint; + }; + + [id(DISPID_TM_COMPLEX_STRUCT)] + HRESULT complex_struct([in] struct complex in); [id(DISPID_TM_ARRAY)] HRESULT array([in] array_t in, [out] array_t out, [in, out] array_t in_out);

1 0

Henri Verbeet : wined3d: Introduce a Vulkan based adapter implementation.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 7cf3edcdc85e7a0c9262fa8325ce0bc243e991d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cf3edcdc85e7a0c9262fa83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 1 17:38:26 2019 +0430 wined3d: Introduce a Vulkan based adapter implementation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/adapter_vk.c | 105 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/directx.c | 3 ++ dlls/wined3d/utils.c | 5 ++ dlls/wined3d/wined3d_main.c | 27 +++++++---- dlls/wined3d/wined3d_private.h | 24 +++++++++- 6 files changed, 156 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 39fed38..7ebd010 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = opengl32 user32 gdi32 advapi32 C_SRCS = \ adapter_gl.c \ + adapter_vk.c \ arb_program_shader.c \ ati_fragment_shader.c \ buffer.c \ diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c new file mode 100644 index 0000000..e2c940d --- /dev/null +++ b/dlls/wined3d/adapter_vk.c @@ -0,0 +1,105 @@ +/* + * Copyright 2018 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +static void adapter_vk_destroy(struct wined3d_adapter *adapter) +{ + wined3d_adapter_cleanup(adapter); + heap_free(adapter); +} + +static BOOL adapter_vk_create_context(struct wined3d_context *context, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + return TRUE; +} + +static void adapter_vk_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) +{ +} + +static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, + const struct wined3d_format *adapter_format, const struct wined3d_format *rt_format, + const struct wined3d_format *ds_format) +{ + return TRUE; +} + +static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = +{ + adapter_vk_destroy, + adapter_vk_create_context, + adapter_vk_get_wined3d_caps, + adapter_vk_check_format, +}; + +static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, + unsigned int ordinal, unsigned int wined3d_creation_flags) +{ + const struct wined3d_gpu_description *gpu_description; + struct wined3d_adapter *adapter = &adapter_vk->a; + + TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", + adapter_vk, ordinal, wined3d_creation_flags); + + if (!wined3d_adapter_init(adapter, ordinal)) + return FALSE; + + if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) + { + ERR("Failed to get GPU description.\n"); + return FALSE; + } + wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + + if (!wined3d_adapter_vk_init_format_info(adapter)) + return FALSE; + + adapter->vertex_pipe = &none_vertex_pipe; + adapter->fragment_pipe = &none_fragment_pipe; + adapter->shader_backend = &none_shader_backend; + adapter->adapter_ops = &wined3d_adapter_vk_ops; + + adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; + + return TRUE; +} + +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) +{ + struct wined3d_adapter_vk *adapter_vk; + + if (!(adapter_vk = heap_alloc_zero(sizeof(*adapter_vk)))) + return NULL; + + if (!wined3d_adapter_vk_init(adapter_vk, ordinal, wined3d_creation_flags)) + { + heap_free(adapter_vk); + return NULL; + } + + TRACE("Created adapter %p.\n", adapter_vk); + + return &adapter_vk->a; +} diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 83fa47a..49e56e0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2314,6 +2314,9 @@ static struct wined3d_adapter *wined3d_adapter_create(unsigned int ordinal, DWOR if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_create(ordinal, wined3d_creation_flags); + if (wined3d_settings.renderer == WINED3D_RENDERER_VULKAN) + return wined3d_adapter_vk_create(ordinal, wined3d_creation_flags); + return wined3d_adapter_gl_create(ordinal, wined3d_creation_flags); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a242283..be76dbb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4067,6 +4067,11 @@ fail: return FALSE; } +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter *adapter) +{ + return wined3d_adapter_init_format_info(adapter, sizeof(struct wined3d_format)); +} + const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int bind_flags) { diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 5ca58ae..d2e4978 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -89,7 +89,7 @@ struct wined3d_settings wined3d_settings = ~0U, /* No GS shader model limit by default. */ ~0U, /* No PS shader model limit by default. */ ~0u, /* No CS shader model limit by default. */ - FALSE, /* 3D support enabled by default. */ + WINED3D_RENDERER_AUTO, WINED3D_SHADER_BACKEND_AUTO, }; @@ -104,11 +104,10 @@ struct wined3d * CDECL wined3d_create(DWORD flags) return NULL; } - if (wined3d_settings.no_3d) + if (wined3d_settings.renderer == WINED3D_RENDERER_NO3D) flags |= WINED3D_NO3D; - hr = wined3d_init(object, flags); - if (FAILED(hr)) + if (FAILED(hr = wined3d_init(object, flags))) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); heap_free(object); @@ -327,12 +326,24 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelCS", &wined3d_settings.max_sm_cs)) TRACE("Limiting CS shader model to %u.\n", wined3d_settings.max_sm_cs); - if ((!get_config_key(hkey, appkey, "renderer", buffer, size) + if (!get_config_key(hkey, appkey, "renderer", buffer, size) || !get_config_key(hkey, appkey, "DirectDrawRenderer", buffer, size)) - && !strcmp(buffer, "gdi")) { - TRACE("Disabling 3D support.\n"); - wined3d_settings.no_3d = TRUE; + if (!strcmp(buffer, "vulkan")) + { + ERR_(winediag)("Using the Vulkan renderer.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_VULKAN; + } + else if (!strcmp(buffer, "gl")) + { + ERR_(winediag)("Using the OpenGL renderer.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_OPENGL; + } + else if (!strcmp(buffer, "gdi") || !strcmp(buffer, "no3d")) + { + ERR_(winediag)("Disabling 3D support.\n"); + wined3d_settings.renderer = WINED3D_RENDERER_NO3D; + } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f482bb9..5a455ed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -379,6 +379,14 @@ static inline void wined3d_pause(void) #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */ +enum wined3d_renderer +{ + WINED3D_RENDERER_AUTO, + WINED3D_RENDERER_VULKAN, + WINED3D_RENDERER_OPENGL, + WINED3D_RENDERER_NO3D, +}; + enum wined3d_shader_backend { WINED3D_SHADER_BACKEND_AUTO, @@ -409,7 +417,7 @@ struct wined3d_settings unsigned int max_sm_gs; unsigned int max_sm_ps; unsigned int max_sm_cs; - BOOL no_3d; + enum wined3d_renderer renderer; enum wined3d_shader_backend shader_backend; }; @@ -2741,6 +2749,19 @@ struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; +struct wined3d_adapter_vk +{ + struct wined3d_adapter a; +}; + +static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapter *adapter) +{ + return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); +} + +struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, + unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; + struct wined3d_caps_gl_ctx { HDC dc; @@ -2757,6 +2778,7 @@ struct wined3d_caps_gl_ctx BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_vk_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN;

1 0

Piotr Caban : version: Don't use strncasecmp.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 2e2278177c2637d32244bb97088e66b139523595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2278177c2637d32244bb97… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 18:50:37 2019 +0200 version: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index bd03b2b..0176713 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -870,7 +870,7 @@ static const VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( const VS_VERSION while ((char *)child < (char *)info + info->wLength ) { - if (!strncasecmp( child->szKey, szKey, cbKey ) && !child->szKey[cbKey]) + if (!_strnicmp( child->szKey, szKey, cbKey ) && !child->szKey[cbKey]) return child; if (!(child->wLength)) return NULL;

1 0

Piotr Caban : ver.dll16: Don't use strncasecmp.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 267064dcd3bcb26f831fb47ce5d64e6b4bea9886 URL: https://source.winehq.org/git/wine.git/?a=commit;h=267064dcd3bcb26f831fb47c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 18:50:46 2019 +0200 ver.dll16: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ver.dll16/version.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index b2cb9ae..aa7b49b 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -29,6 +29,7 @@ #define NONAMELESSSTRUCT #include "windef.h" #include "wine/winbase16.h" +#include "winternl.h" #include "winver.h" #include "lzexpand.h" #include "wine/unicode.h" @@ -212,7 +213,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, if (!(typeInfo->type_id & 0x8000)) { BYTE *p = resTab + typeInfo->type_id; - if ((*p == len) && !strncasecmp( (char*)p+1, typeid, len )) goto found_type; + if ((*p == len) && !_strnicmp( (char*)p+1, typeid, len )) goto found_type; } typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + typeInfo->count * sizeof(NE_NAMEINFO)); @@ -242,7 +243,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, { BYTE *p = resTab + nameInfo->id; if (nameInfo->id & 0x8000) continue; - if ((*p == len) && !strncasecmp( (char*)p+1, resid, len )) goto found_name; + if ((*p == len) && !_strnicmp( (char*)p+1, resid, len )) goto found_name; } } else /* numeric resource id */

1 0

Nikolay Sivov : mfreadwrite: Partially implement setting output media types for reader.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 0694d0f3219b933e85fd6344201ad4c170c30afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0694d0f3219b933e85fd6344… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:04 2019 +0300 mfreadwrite: Partially implement setting output media types for reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 128 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 121 insertions(+), 7 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 9bed201..2e1d24c 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -72,6 +72,11 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( mfinstance ); } +struct media_stream +{ + IMFMediaType *current; +}; + typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; @@ -83,6 +88,9 @@ typedef struct source_reader DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; BOOL shutdown_on_release; + struct media_stream *streams; + DWORD stream_count; + CRITICAL_SECTION cs; } srcreader; struct sink_writer @@ -214,6 +222,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); ULONG refcount = InterlockedDecrement(&reader->refcount); + unsigned int i; TRACE("%p, refcount %d.\n", iface, refcount); @@ -226,6 +235,14 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); IMFMediaSource_Release(reader->source); + + for (i = 0; i < reader->stream_count; ++i) + { + if (reader->streams[i].current) + IMFMediaType_Release(reader->streams[i].current); + } + heap_free(reader->streams); + DeleteCriticalSection(&reader->cs); heap_free(reader); } @@ -344,17 +361,70 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWORD index, IMFMediaType **type) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %p\n", This, index, type); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %p.\n", iface, index, type); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + default: + ; + } + + if (index >= reader->stream_count) + return MF_E_INVALIDSTREAMNUMBER; + + if (FAILED(hr = MFCreateMediaType(type))) + return hr; + + EnterCriticalSection(&reader->cs); + + hr = IMFMediaType_CopyAllItems(reader->streams[index].current, (IMFAttributes *)*type); + + LeaveCriticalSection(&reader->cs); + + return hr; } static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWORD index, DWORD *reserved, IMFMediaType *type) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %p, %p\n", This, index, reserved, type); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %p, %p.\n", iface, index, reserved, type); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + default: + ; + } + + if (index >= reader->stream_count) + return MF_E_INVALIDSTREAMNUMBER; + + /* FIXME: validate passed type and current presentation state. */ + + EnterCriticalSection(&reader->cs); + + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current); + + LeaveCriticalSection(&reader->cs); + + return hr; } static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFGUID format, REFPROPVARIANT position) @@ -533,7 +603,8 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, BOOL shutdown_on_release, REFIID riid, void **out) { - srcreader *object; + struct source_reader *object; + unsigned int i; HRESULT hr; object = heap_alloc_zero(sizeof(*object)); @@ -545,10 +616,53 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source); + InitializeCriticalSection(&object->cs); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(object->descriptor, &object->stream_count))) + goto failed; + + if (!(object->streams = heap_alloc_zero(object->stream_count * sizeof(*object->streams)))) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + /* Set initial current media types. */ + for (i = 0; i < object->stream_count; ++i) + { + IMFMediaTypeHandler *handler; + IMFStreamDescriptor *sd; + IMFMediaType *src_type; + BOOL selected; + + if (FAILED(hr = MFCreateMediaType(&object->streams[i].current))) + break; + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(object->descriptor, i, &selected, &sd))) + break; + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + IMFStreamDescriptor_Release(sd); + if (FAILED(hr)) + break; + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &src_type); + IMFMediaTypeHandler_Release(handler); + if (FAILED(hr)) + break; + + hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)object->streams[i].current); + IMFMediaType_Release(src_type); + if (FAILED(hr)) + break; + } + + if (FAILED(hr)) + goto failed; + /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video);

1 0

Nikolay Sivov : mfplat: Add symbolic names for event id tracing.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 86656f86042e02fe29d0e830e3139cc907724df4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86656f86042e02fe29d0e830… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:03 2019 +0300 mfplat: Add symbolic names for event id tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 03de81c..e52aeeb 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -817,6 +817,129 @@ static const char *debugstr_mf_guid(const GUID *guid) return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbgstr_guid(guid); } +struct event_id +{ + DWORD id; + const char *name; +}; + +static int debug_event_id(const void *a, const void *b) +{ + const DWORD *id = a; + const struct event_id *event_id = b; + return *id - event_id->id; +} + +static const char *debugstr_eventid(DWORD event) +{ + static const struct event_id + { + DWORD id; + const char *name; + } + event_ids[] = + { +#define X(e) { e, #e } + X(MEUnknown), + X(MEError), + X(MEExtendedType), + X(MENonFatalError), + X(MESessionUnknown), + X(MESessionTopologySet), + X(MESessionTopologiesCleared), + X(MESessionStarted), + X(MESessionPaused), + X(MESessionStopped), + X(MESessionClosed), + X(MESessionEnded), + X(MESessionRateChanged), + X(MESessionScrubSampleComplete), + X(MESessionCapabilitiesChanged), + X(MESessionTopologyStatus), + X(MESessionNotifyPresentationTime), + X(MENewPresentation), + X(MELicenseAcquisitionStart), + X(MELicenseAcquisitionCompleted), + X(MEIndividualizationStart), + X(MEIndividualizationCompleted), + X(MEEnablerProgress), + X(MEEnablerCompleted), + X(MEPolicyError), + X(MEPolicyReport), + X(MEBufferingStarted), + X(MEBufferingStopped), + X(MEConnectStart), + X(MEConnectEnd), + X(MEReconnectStart), + X(MEReconnectEnd), + X(MERendererEvent), + X(MESessionStreamSinkFormatChanged), + X(MESourceUnknown), + X(MESourceStarted), + X(MEStreamStarted), + X(MESourceSeeked), + X(MEStreamSeeked), + X(MENewStream), + X(MEUpdatedStream), + X(MESourceStopped), + X(MEStreamStopped), + X(MESourcePaused), + X(MEStreamPaused), + X(MEEndOfPresentation), + X(MEEndOfStream), + X(MEMediaSample), + X(MEStreamTick), + X(MEStreamThinMode), + X(MEStreamFormatChanged), + X(MESourceRateChanged), + X(MEEndOfPresentationSegment), + X(MESourceCharacteristicsChanged), + X(MESourceRateChangeRequested), + X(MESourceMetadataChanged), + X(MESequencerSourceTopologyUpdated), + X(MESinkUnknown), + X(MEStreamSinkStarted), + X(MEStreamSinkStopped), + X(MEStreamSinkPaused), + X(MEStreamSinkRateChanged), + X(MEStreamSinkRequestSample), + X(MEStreamSinkMarker), + X(MEStreamSinkPrerolled), + X(MEStreamSinkScrubSampleComplete), + X(MEStreamSinkFormatChanged), + X(MEStreamSinkDeviceChanged), + X(MEQualityNotify), + X(MESinkInvalidated), + X(MEAudioSessionNameChanged), + X(MEAudioSessionVolumeChanged), + X(MEAudioSessionDeviceRemoved), + X(MEAudioSessionServerShutdown), + X(MEAudioSessionGroupingParamChanged), + X(MEAudioSessionIconChanged), + X(MEAudioSessionFormatChanged), + X(MEAudioSessionDisconnected), + X(MEAudioSessionExclusiveModeOverride), + X(METrustUnknown), + X(MEPolicyChanged), + X(MEContentProtectionMessage), + X(MEPolicySet), + X(MEWMDRMLicenseBackupCompleted), + X(MEWMDRMLicenseBackupProgress), + X(MEWMDRMLicenseRestoreCompleted), + X(MEWMDRMLicenseRestoreProgress), + X(MEWMDRMLicenseAcquisitionCompleted), + X(MEWMDRMIndividualizationCompleted), + X(MEWMDRMIndividualizationProgress), + X(MEWMDRMProximityCompleted), + X(MEWMDRMLicenseStoreCleaned), + X(MEWMDRMRevocationDownloadCompleted), +#undef X + }; + + struct event_id *ret = bsearch(&event, event_ids, ARRAY_SIZE(event_ids), sizeof(*event_ids), debug_event_id); + return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbg_sprintf("%u", event); +} + static inline struct attributes *impl_from_IMFAttributes(IMFAttributes *iface) { return CONTAINING_RECORD(iface, struct attributes, IMFAttributes_iface); @@ -5378,7 +5501,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR mfmediaevent *object; HRESULT hr; - TRACE("%#x, %s, %08x, %p, %p\n", type, debugstr_guid(extended_type), status, value, event); + TRACE("%s, %s, %08x, %p, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, value, event); object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); if(!object) @@ -5401,6 +5524,8 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR *event = &object->IMFMediaEvent_iface; + TRACE("Created event %p.\n", *event); + return S_OK; } @@ -5650,7 +5775,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamVar(IMFMediaEventQueue *iface, M IMFMediaEvent *event; HRESULT hr; - TRACE("%p, %d, %s, %#x, %p\n", iface, event_type, debugstr_guid(extended_type), status, value); + TRACE("%p, %s, %s, %#x, %p\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, value); if (FAILED(hr = MFCreateMediaEvent(event_type, extended_type, status, value, &event))) return hr; @@ -5668,7 +5793,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamUnk(IMFMediaEventQueue *iface, M PROPVARIANT value; HRESULT hr; - TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(extended_type), status, unk); + TRACE("%p, %s, %s, %#x, %p.\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, unk); value.vt = VT_UNKNOWN; value.u.punkVal = unk;

1 0

Francois Gouget : imagehlp/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: cead1ded9a09947a4f8bd5f9eadfc689b10164a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cead1ded9a09947a4f8bd5f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 1 18:23:50 2019 +0200 imagehlp/tests: Add a trailing '\n' to some ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/tests/integrity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index a7774ad..4617c71 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -363,20 +363,20 @@ static void test_pe_checksum(void) checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, (char *)nt_header - (char *)modinfo.lpBaseOfDll, &checksum_orig, &checksum_new); - ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, sizeof(IMAGE_DOS_HEADER), &checksum_orig, &checksum_new); - ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); checksum_orig = checksum_new = 0xdeadbeef; ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, 0, &checksum_orig, &checksum_new); - ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p\n", ret); ok((checksum_orig == 0xdeadbeef) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); todo_wine ok((checksum_new == 0xdeadbeef) || (checksum_new != 0 && checksum_new != 0xdeadbeef), "Got unexpected value %x\n", checksum_new);

1 0

Zebediah Figura : rpcrt4: Improve struct type detection.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 583dca9d7231479774be92aca8a30da1d660246a URL: https://source.winehq.org/git/wine.git/?a=commit;h=583dca9d7231479774be92ac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:17 2019 -0500 rpcrt4: Improve struct type detection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 92 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index c756682..8f87693 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -231,34 +231,92 @@ static BOOL type_pointer_is_iface(ITypeInfo *typeinfo, TYPEDESC *tdesc) } static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc); +static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr); -static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) +static unsigned char get_struct_member_fc(ITypeInfo *typeinfo, TYPEDESC *tdesc) { - unsigned char fc = FC_STRUCT; - VARDESC *desc; - VARTYPE vt; - WORD i; + unsigned char fc; + ITypeInfo *refinfo; + TYPEATTR *attr; - for (i = 0; i < attr->cVars; i++) + switch (tdesc->vt) { - ITypeInfo_GetVarDesc(typeinfo, i, &desc); - vt = desc->elemdescVar.tdesc.vt; + case VT_BSTR: + case VT_SAFEARRAY: + return (sizeof(void *) == 4) ? FC_PSTRUCT : FC_BOGUS_STRUCT; + case VT_CY: + return FC_STRUCT; + case VT_UNKNOWN: + case VT_DISPATCH: + return FC_BOGUS_STRUCT; + case VT_CARRAY: + if (get_array_fc(typeinfo, &tdesc->lpadesc->tdescElem) == FC_BOGUS_ARRAY) + return FC_BOGUS_STRUCT; + return FC_STRUCT; + case VT_PTR: + if (type_pointer_is_iface(typeinfo, tdesc)) + fc = FC_BOGUS_STRUCT; + else + fc = (sizeof(void *) == 4) ? FC_PSTRUCT : FC_BOGUS_STRUCT; + break; + case VT_USERDEFINED: + ITypeInfo_GetRefTypeInfo(typeinfo, tdesc->hreftype, &refinfo); + ITypeInfo_GetTypeAttr(refinfo, &attr); - switch (vt) + switch (attr->typekind) { - case VT_CARRAY: - if (get_array_fc(typeinfo, &desc->elemdescVar.tdesc.lpadesc->tdescElem) == FC_BOGUS_ARRAY) - fc = FC_BOGUS_STRUCT; + case TKIND_ENUM: + fc = FC_STRUCT; + break; + case TKIND_RECORD: + fc = get_struct_fc(refinfo, attr); + break; + case TKIND_INTERFACE: + case TKIND_DISPATCH: + case TKIND_COCLASS: + fc = FC_BOGUS_STRUCT; + break; + case TKIND_ALIAS: + fc = get_struct_member_fc(refinfo, &attr->tdescAlias); break; default: - if (!get_basetype(typeinfo, &desc->elemdescVar.tdesc)) - { - FIXME("unhandled type %u\n", vt); - fc = FC_BOGUS_STRUCT; - } + FIXME("Unhandled kind %#x.\n", attr->typekind); + fc = FC_BOGUS_STRUCT; break; } + ITypeInfo_ReleaseTypeAttr(refinfo, attr); + ITypeInfo_Release(refinfo); + break; + default: + if (get_basetype(typeinfo, tdesc)) + return FC_STRUCT; + else + { + FIXME("Unhandled type %u.\n", tdesc->vt); + return FC_BOGUS_STRUCT; + } + } + + return fc; +} + +static unsigned char get_struct_fc(ITypeInfo *typeinfo, TYPEATTR *attr) +{ + unsigned char fc = FC_STRUCT, member_fc; + VARDESC *desc; + WORD i; + + for (i = 0; i < attr->cVars; i++) + { + ITypeInfo_GetVarDesc(typeinfo, i, &desc); + + member_fc = get_struct_member_fc(typeinfo, &desc->elemdescVar.tdesc); + if (member_fc == FC_BOGUS_STRUCT) + fc = FC_BOGUS_STRUCT; + else if (member_fc == FC_PSTRUCT && fc != FC_BOGUS_STRUCT) + fc = FC_PSTRUCT; + ITypeInfo_ReleaseVarDesc(typeinfo, desc); }

1 0

Zebediah Figura : rpcrt4: Abort if an interface is passed directly to write_type_tfs().
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 81745dfd082cc9156c3b1d5d04d05cabc90a9998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81745dfd082cc9156c3b1d5d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:16 2019 -0500 rpcrt4: Abort if an interface is passed directly to write_type_tfs(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 963a119..c756682 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -497,6 +497,11 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, case TKIND_RECORD: off = write_struct_tfs(refinfo, str, len, attr); break; + case TKIND_INTERFACE: + case TKIND_DISPATCH: + case TKIND_COCLASS: + assert(0); + break; case TKIND_ALIAS: off = write_type_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); break;

1 0

Zebediah Figura : winebus.sys: Retrieve hidraw device strings from the parent USB device.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: cc3820ca99e65150958af5410ac2de77f9a4a505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc3820ca99e65150958af541… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 29 16:18:32 2019 -0500 winebus.sys: Retrieve hidraw device strings from the parent USB device. This partially reverts 164517fe575564daa44f74cc3bc4a6bbdd7d3f3d. The manufacturer, product, and serial string attributes are not exposed by the HID device on Linux, but by its parent USB device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46711 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1f671cf..99753d6 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -674,23 +674,23 @@ static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, static NTSTATUS hidraw_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - struct udev_device *hiddev; + struct udev_device *usbdev; struct platform_private *private = impl_from_DEVICE_OBJECT(device); WCHAR *str = NULL; - hiddev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "hid", NULL); - if (hiddev) + usbdev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "usb", "usb_device"); + if (usbdev) { switch (index) { case HID_STRING_ID_IPRODUCT: - str = get_sysattr_string(hiddev, "product"); + str = get_sysattr_string(usbdev, "product"); break; case HID_STRING_ID_IMANUFACTURER: - str = get_sysattr_string(hiddev, "manufacturer"); + str = get_sysattr_string(usbdev, "manufacturer"); break; case HID_STRING_ID_ISERIALNUMBER: - str = get_sysattr_string(hiddev, "serial"); + str = get_sysattr_string(usbdev, "serial"); break; default: ERR("Unhandled string index %08x\n", index);

1 0

Piotr Caban : msvcr110: Fix __crtGetShowWindowMode implementation.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: b353ad7db8e013bab8bfd0ffde3610372fa3d644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b353ad7db8e013bab8bfd0ff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 1 17:46:07 2019 +0200 msvcr110: Fix __crtGetShowWindowMode implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46928 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/misc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 5a4e77b..21ab9be 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -26,6 +26,7 @@ #include "msvcrt.h" #include "wine/debug.h" #include "ntsecapi.h" +#include "windows.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -517,8 +518,8 @@ int CDECL MSVCR110__crtGetShowWindowMode(void) STARTUPINFOW si; GetStartupInfoW(&si); - TRACE("window=%d\n", si.wShowWindow); - return si.wShowWindow; + TRACE("flags=%x window=%d\n", si.dwFlags, si.wShowWindow); + return si.dwFlags & STARTF_USESHOWWINDOW ? si.wShowWindow : SW_SHOWDEFAULT; } /*********************************************************************

1 0

Zebediah Figura : rpcrt4: Write parameters for fixed structs.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 46e51ef7764a53fa40859b8a53ee7983f40cc544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46e51ef7764a53fa40859b8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:18 2019 -0500 rpcrt4: Write parameters for fixed structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 8f87693..3d3d42b 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -246,6 +246,7 @@ static unsigned char get_struct_member_fc(ITypeInfo *typeinfo, TYPEDESC *tdesc) return (sizeof(void *) == 4) ? FC_PSTRUCT : FC_BOGUS_STRUCT; case VT_CY: return FC_STRUCT; + case VT_VARIANT: case VT_UNKNOWN: case VT_DISPATCH: return FC_BOGUS_STRUCT; @@ -358,7 +359,12 @@ static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, size_t *len, TYPEATTR *attr) { unsigned char fc = get_struct_fc(typeinfo, attr); + unsigned int struct_offset = 0; + unsigned char basetype; size_t off = *len; + TYPEDESC *tdesc; + VARDESC *desc; + WORD i; if (fc != FC_STRUCT) FIXME("fc %02x not implemented\n", fc); @@ -366,7 +372,30 @@ static size_t write_struct_tfs(ITypeInfo *typeinfo, unsigned char *str, WRITE_CHAR (str, *len, FC_STRUCT); WRITE_CHAR (str, *len, attr->cbAlignment - 1); WRITE_SHORT(str, *len, attr->cbSizeInstance); - WRITE_CHAR (str, *len, FC_PAD); + + for (i = 0; i < attr->cVars; i++) + { + ITypeInfo_GetVarDesc(typeinfo, i, &desc); + tdesc = &desc->elemdescVar.tdesc; + + /* This may not match the intended alignment, but we don't have enough + * information to determine that. This should always give the correct + * layout. */ + if ((struct_offset & 7) && !(desc->oInst & 7)) + WRITE_CHAR(str, *len, FC_ALIGNM8); + else if ((struct_offset & 3) && !(desc->oInst & 3)) + WRITE_CHAR(str, *len, FC_ALIGNM4); + else if ((struct_offset & 1) && !(desc->oInst & 1)) + WRITE_CHAR(str, *len, FC_ALIGNM2); + struct_offset = desc->oInst + type_memsize(typeinfo, tdesc); + + if ((basetype = get_basetype(typeinfo, tdesc))) + WRITE_CHAR(str, *len, basetype); + + ITypeInfo_ReleaseVarDesc(typeinfo, desc); + } + if (!(*len & 1)) + WRITE_CHAR (str, *len, FC_PAD); WRITE_CHAR (str, *len, FC_END); return off;

1 0

Zebediah Figura : rpcrt4: Handle TKIND_ALIAS in more places.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: c73988178f834ba7fb9ca40f3da05d26d6a7a5c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c73988178f834ba7fb9ca40f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 31 23:31:15 2019 -0500 rpcrt4: Handle TKIND_ALIAS in more places. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index f182f1a..963a119 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -220,6 +220,8 @@ static BOOL type_pointer_is_iface(ITypeInfo *typeinfo, TYPEDESC *tdesc) || attr->typekind == TKIND_DISPATCH || attr->typekind == TKIND_COCLASS) ret = TRUE; + else if (attr->typekind == TKIND_ALIAS) + ret = type_pointer_is_iface(refinfo, &attr->tdescAlias); ITypeInfo_ReleaseTypeAttr(refinfo, attr); ITypeInfo_Release(refinfo); @@ -280,6 +282,8 @@ static unsigned char get_array_fc(ITypeInfo *typeinfo, TYPEDESC *desc) fc = FC_LGFARRAY; else if (attr->typekind == TKIND_RECORD && get_struct_fc(refinfo, attr) == FC_STRUCT) fc = FC_LGFARRAY; + else if (attr->typekind == TKIND_ALIAS) + fc = get_array_fc(refinfo, &attr->tdescAlias); else fc = FC_BOGUS_ARRAY; @@ -493,6 +497,9 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, case TKIND_RECORD: off = write_struct_tfs(refinfo, str, len, attr); break; + case TKIND_ALIAS: + off = write_type_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); + break; default: FIXME("unhandled kind %u\n", attr->typekind); off = *len;

1 0

Nikolay Sivov : mfreadwrite: Add a trace for async reader mode.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: e92bf051f5f4e6807118715ae1a6395f46f0bca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92bf051f5f4e6807118715a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:05 2019 +0300 mfreadwrite: Add a trace for async reader mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 2e1d24c..78d96e4 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -680,8 +680,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri } if (attributes) + { IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, &IID_IMFSourceReaderCallback, (void **)&object->async_callback); + if (object->async_callback) + TRACE("Using async callback %p.\n", object->async_callback); + } hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out);

1 0

Nikolay Sivov : mfplat: Add per-method helpers for attributes, use them for media type.
by Alexandre Julliard April 1, 2019

April 1, 2019

Module: wine Branch: master Commit: 7a13f42786c584c76e71226ad1f29236098cbeca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a13f42786c584c76e71226a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:06 2019 +0300 mfplat: Add per-method helpers for attributes, use them for media type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 438 ++++++++++++++++++++++++++++++------------- dlls/mfplat/mediatype.c | 67 +++---- dlls/mfplat/mfplat_private.h | 39 ++++ 3 files changed, 381 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a13f42786c584c76e71…

1 0