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

Alexandre Julliard : configure: Check for supported warning flags also for the cross-compiler.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 870f99eced99dc143efb71f95c2cb91d40ea46cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=870f99eced99dc143efb71f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 18:47:44 2019 +0200 configure: Check for supported warning flags also for the cross-compiler. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + aclocal.m4 | 23 ++ configure | 636 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 36 ++++ tools/makedep.c | 4 +- 5 files changed, 699 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=870f99eced99dc143efb…

1 0

Zebediah Figura : ddraw/tests: Add some tests for calling stateblock methods while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 7df470164bd4ba173921caacf0ad671e180894f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df470164bd4ba173921caac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:55 2019 -0500 ddraw/tests: Add some tests for calling stateblock methods while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 423dba5..168253e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15822,6 +15822,77 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_begin_end_state_block(void) +{ + DWORD stateblock, stateblock2; + IDirect3DDevice7 *device; + ULONG refcount; + DWORD value; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + stateblock = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!!stateblock && stateblock != 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); + + stateblock2 = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + todo_wine ok(hr == D3DERR_NOTINBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginStateBlock(device); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15966,4 +16037,5 @@ START_TEST(ddraw7) test_multiply_transform(); test_alphatest(); test_clipper_refcount(); + test_begin_end_state_block(); }

1 0

Zebediah Figura : ddraw: Forbid applying a stateblock while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 5fd14a4e6273089f3ecae6608240278ead563ae8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fd14a4e6273089f3ecae660… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:58 2019 -0500 ddraw: Forbid applying a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 49eb664..0ddf9a8 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5822,6 +5822,12 @@ static HRESULT d3d_device7_ApplyStateBlock(IDirect3DDevice7 *iface, DWORD stateb TRACE("iface %p, stateblock %#x.\n", iface, stateblock); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to apply a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK); if (!wined3d_sb) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e10aedb..ff73eea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15866,7 +15866,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); @@ -15886,7 +15886,7 @@ static void test_begin_end_state_block(void) hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + ok(value == TRUE, "Got unexpected value %#x.\n", value); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Zebediah Figura : ddraw: Forbid capturing a stateblock while recording.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 0da6f2a66a44e9bae5d724b59f54b58cb1359ff0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da6f2a66a44e9bae5d724b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 4 18:37:59 2019 -0500 ddraw: Forbid capturing a stateblock while recording. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 6 ++++++ dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0ddf9a8..b471612 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5882,6 +5882,12 @@ static HRESULT d3d_device7_CaptureStateBlock(IDirect3DDevice7 *iface, DWORD stat TRACE("iface %p, stateblock %#x.\n", iface, stateblock); wined3d_mutex_lock(); + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to capture a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INBEGINSTATEBLOCK; + } wined3d_sb = ddraw_get_object(&device->handle_table, stateblock - 1, DDRAW_HANDLE_STATEBLOCK); if (!wined3d_sb) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ff73eea..61042e3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15869,7 +15869,7 @@ static void test_begin_end_state_block(void) ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); - todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr);

1 0

Alexandre Julliard : makefiles: Don' t link against wine_port when using msvcrt.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 3e6a4c4a5cd8d47fac8e4cdc814ebb2a2b2f2ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6a4c4a5cd8d47fac8e4cdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 10:01:12 2019 +0200 makefiles: Don't link against wine_port when using msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2b916af..a03222b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2057,7 +2057,7 @@ static struct strarray add_default_libraries( const struct makefile *make, struc struct strarray all_libs = empty_strarray; unsigned int i, j; - strarray_add( &all_libs, "-lwine_port" ); + if (!make->use_msvcrt) strarray_add( &all_libs, "-lwine_port" ); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, libs );

1 0

Piotr Caban : msi: Use case sensitive compare in handle_msi_break.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 8c4b75f252dd5f127320144a43472d4558489af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c4b75f252dd5f127320144a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 19:57:05 2019 +0200 msi: Use case sensitive compare in handle_msi_break. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index facb1d8..647961c 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -468,7 +468,7 @@ static void handle_msi_break(LPCSTR target) if (!GetEnvironmentVariableA("MsiBreak", val, MAX_PATH)) return; - if (strcasecmp(val, target)) + if (strcmp(val, target)) return; sprintf(msg, format, GetCurrentProcessId(), GetCurrentProcessId());

1 0

Piotr Caban : wineps.drv: Don't use strcasecmp.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: c191a1d44dc4464ed7c6c69b03253d239f17743e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c191a1d44dc4464ed7c6c69b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:00:50 2019 +0200 wineps.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/builtin.c | 3 ++- dlls/wineps.drv/font.c | 5 +++-- dlls/wineps.drv/mkagl.c | 4 ++-- dlls/wineps.drv/ppd.c | 21 +++++++++++---------- dlls/wineps.drv/type1afm.c | 7 ++++--- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index e2106d3..75485cd 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -28,6 +28,7 @@ #include "winerror.h" #include "wingdi.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -168,7 +169,7 @@ BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, /* Look for a matching font family */ for(family = physDev->pi->Fonts; family; family = family->next) { - if(!strcasecmp(FaceName, family->FamilyName)) + if(!_strnicmp(FaceName, family->FamilyName, -1)) break; } diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index c8ec976..5c5033c 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -27,6 +27,7 @@ #include "wingdi.h" #include "winnls.h" #include "winspool.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -93,8 +94,8 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) for (i = 0; i < physDev->pi->FontSubTableSize; ++i) { - if (!strcasecmp (FaceName, - physDev->pi->FontSubTable[i].pValueName)) + if (!_strnicmp (FaceName, + physDev->pi->FontSubTable[i].pValueName, -1)) { TRACE ("substituting facename '%s' for '%s'\n", (LPSTR) physDev->pi->FontSubTable[i].pData, FaceName); diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c index f8919e3..788fb6e 100644 --- a/dlls/wineps.drv/mkagl.c +++ b/dlls/wineps.drv/mkagl.c @@ -190,8 +190,8 @@ static void read_afms(FILE *f_c, FILE *f_h) char *cp, linebuf[256], font_family[128]; int i, num_metrics; - cp = strrchr(de->d_name, '.'); /* Does it end in */ - if (cp == NULL || strcasecmp(cp, ".afm") != 0) /* .afm or .AFM? */ + cp = strrchr(de->d_name, '.'); /* Does it end in */ + if (cp == NULL || _strnicmp(cp, ".afm", -1) != 0) /* .afm or .AFM? */ continue; f = fopen(de->d_name, "r"); diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index f8de57b..08d07b8 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -30,6 +30,7 @@ #include <assert.h> #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "psdrv.h" @@ -748,7 +749,7 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*ColorDevice", tuple.key)) { - if(!strcasecmp(tuple.value, "true")) + if(!_strnicmp(tuple.value, "true", -1)) ppd->ColorDevice = CD_True; else ppd->ColorDevice = CD_False; @@ -966,13 +967,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) } else if(!strcmp("*TTRasterizer", tuple.key)) { - if(!strcasecmp("None", tuple.value)) + if(!_strnicmp("None", tuple.value, -1)) ppd->TTRasterizer = RO_None; - else if(!strcasecmp("Accept68K", tuple.value)) + else if(!_strnicmp("Accept68K", tuple.value, -1)) ppd->TTRasterizer = RO_Accept68K; - else if(!strcasecmp("Type42", tuple.value)) + else if(!_strnicmp("Type42", tuple.value, -1)) ppd->TTRasterizer = RO_Type42; - else if(!strcasecmp("TrueImage", tuple.value)) + else if(!_strnicmp("TrueImage", tuple.value, -1)) ppd->TTRasterizer = RO_TrueImage; else { FIXME("Unknown option %s for *TTRasterizer\n", @@ -988,14 +989,14 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) duplex->Name = tuple.option; duplex->FullName = tuple.opttrans; duplex->InvocationString = tuple.value; - if(!strcasecmp("None", tuple.option) || !strcasecmp("False", tuple.option) - || !strcasecmp("Simplex", tuple.option)) + if(!_strnicmp("None", tuple.option, -1) || !_strnicmp("False", tuple.option, -1) + || !_strnicmp("Simplex", tuple.option, -1)) duplex->WinDuplex = DMDUP_SIMPLEX; - else if(!strcasecmp("DuplexNoTumble", tuple.option)) + else if(!_strnicmp("DuplexNoTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_VERTICAL; - else if(!strcasecmp("DuplexTumble", tuple.option)) + else if(!_strnicmp("DuplexTumble", tuple.option, -1)) duplex->WinDuplex = DMDUP_HORIZONTAL; - else if(!strcasecmp("Notcapable", tuple.option)) + else if(!_strnicmp("Notcapable", tuple.option, -1)) duplex->WinDuplex = 0; else { FIXME("Unknown option %s for *Duplex defaulting to simplex\n", tuple.option); diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c index f9a8bcb..19bb2d3 100644 --- a/dlls/wineps.drv/type1afm.c +++ b/dlls/wineps.drv/type1afm.c @@ -48,6 +48,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "winternl.h" #include "psdrv.h" #include "wine/debug.h" @@ -464,7 +465,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "false") == 0) + if (_strnicmp(sz, "false", -1) == 0) { afm->IsFixedPitch = FALSE; *p_found = TRUE; @@ -472,7 +473,7 @@ static BOOL ReadFixedPitch(FILE *file, CHAR buffer[], INT bufsize, AFM *afm, return TRUE; } - if (strcasecmp(sz, "true") == 0) + if (_strnicmp(sz, "true", -1) == 0) { afm->IsFixedPitch = TRUE; *p_found = TRUE; @@ -1142,7 +1143,7 @@ static BOOL ReadAFMDir(LPCSTR dirname) CHAR *file_extension = strchr(dent->d_name, '.'); int fn_len; - if (file_extension == NULL || strcasecmp(file_extension, ".afm") != 0) + if (file_extension == NULL || _strnicmp(file_extension, ".afm", -1) != 0) continue; fn_len = snprintf(filename, 256, "%s/%s", dirname, dent->d_name);

1 0

Alexandre Julliard : kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 35d202fc0982da4e7ae3596414482318af118acb URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d202fc0982da4e7ae35964… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 09:42:09 2019 +0200 kernel32: Validate handle before freeing a LOAD_LIBRARY_AS_DATAFILE module. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46019 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 8 +++++++- dlls/kernel32/tests/module.c | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index eb0471c..2f078a0 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1102,6 +1102,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) if ((ULONG_PTR)hLibModule & 3) /* this is a datafile module */ { + void *ptr = (void *)((ULONG_PTR)hLibModule & ~3); + if (!RtlImageNtHeader( ptr )) + { + SetLastError( ERROR_BAD_EXE_FORMAT ); + return FALSE; + } if ((ULONG_PTR)hLibModule & 1) { struct exclusive_datafile *file; @@ -1119,7 +1125,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeLibrary(HINSTANCE hLibModule) } LdrUnlockLoaderLock( 0, magic ); } - return UnmapViewOfFile( (void *)((ULONG_PTR)hLibModule & ~3) ); + return UnmapViewOfFile( ptr ); } if ((nts = LdrUnloadDll( hLibModule )) == STATUS_SUCCESS) retv = TRUE; diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 3e077f3..c059b98 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -430,6 +430,11 @@ static void testLoadLibraryEx(void) ok(hmodule != 0, "Expected valid module handle\n"); SetLastError(0xdeadbeef); + ret = FreeLibrary( (HMODULE)((ULONG_PTR)hmodule + 0x1230)); + ok(!ret, "Free succeeded on wrong handle\n"); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = FreeLibrary(hmodule); ok(ret, "Expected to be able to free the module, failed with %d\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Paul Gofman : wined3d: Store and use stream offset in state block.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 57653b9527ed377747b898f11484219466902fed URL: https://source.winehq.org/git/wine.git/?a=commit;h=57653b9527ed377747b898f1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 4 19:07:13 2019 +0300 wined3d: Store and use stream offset in state block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21161 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/d3d9/tests/stateblock.c | 79 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/device.c | 1 + dlls/wined3d/stateblock.c | 30 ++++++++++++---- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 87 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57653b9527ed377747b8…

1 0

Alexandre Julliard : winmm/tests: Fix printf format warnings for the Windows build.
by Alexandre Julliard April 5, 2019

April 5, 2019

Module: wine Branch: master Commit: 1c7312a0c66e56c1d44d086849682a30145dd0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c7312a0c66e56c1d44d0868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 5 18:47:14 2019 +0200 winmm/tests: Fix printf format warnings for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/capture.c | 11 +++++------ dlls/winmm/tests/wave.c | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index ba71f9c..4290c35 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -141,7 +141,8 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD nSamplesPerSec = pwfx->nSamplesPerSec; win=NULL; - rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,CALLBACK_EVENT|flags); + flags |= CALLBACK_EVENT; + rc=waveInOpen(&win,device,pwfx,(DWORD_PTR)hevent,0,flags); /* Note: Win9x doesn't know WAVE_FORMAT_DIRECT */ ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_BADDEVICEID || rc==MMSYSERR_NOTENABLED || rc==MMSYSERR_NODRIVER || @@ -154,8 +155,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), "waveInOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc)); + pwfx->nChannels,flags,wave_open_flags(flags),wave_in_error(rc)); if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) trace(" Reason: The device lists this format as supported in its " @@ -261,10 +261,9 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, rc==MMSYSERR_ALLOCATED || ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && !(pcaps->dwFormats & format)), - "waveOutOpen(%s) format=%dx%2dx%d flags=%x(%s) rc=%s\n", + "waveOutOpen(%s) format=%dx%2dx%d flags=CALLBACK_EVENT rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT),wave_out_error(rc)); + pwfx->nChannels,wave_out_error(rc)); if (rc==MMSYSERR_NOERROR) { rc=waveOutPrepareHeader(wout, &frag, sizeof(frag)); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 9c114c8..a2f2a82 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -665,8 +665,7 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in (rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)), "waveOutOpen(%s): format=%dx%2dx%d flags=%x(%s) rc=%s\n", dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample, - pwfx->nChannels,CALLBACK_EVENT|flags, - wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc)); + pwfx->nChannels,flags,wave_open_flags(flags),wave_out_error(rc)); if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) && (flags & WAVE_FORMAT_DIRECT) && (pcaps->dwFormats & format)) trace(" Reason: The device lists this format as supported in its "

1 0