wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Paul Gofman : ddraw: Port light delete / add test for ddraw1.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

Paul Gofman : ddraw: Port light delete / add test for ddraw2.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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: Fix ddraw[1-4] light activation / deactivation.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

André Hentschel : ntdll: Add stub for RtlInstallFunctionTableCallback on ARM/ARM64.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

Piotr Caban : tapi32: Don't use strncasecmp.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

Piotr Caban : user.exe16: Don't use strncasecmp.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

Piotr Caban : ver.dll16: Don't use strncasecmp.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

Piotr Caban : version: Don't use strncasecmp.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

Francois Gouget : imagehlp/tests: Add a trailing '\n' to some ok() calls.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

Piotr Caban : msvcr110: Fix __crtGetShowWindowMode implementation.
by Alexandre Julliard 01 Apr '19

01 Apr '19

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

← Newer
1
...
73
74
75
76
77
78
79
80
81
Older →

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 April 2019