October 2015 - Wine-commits

Józef Kucia : dxgi/tests: Add test for maximum frame latency.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 718d35dcd6ef30818cf2bbc20ac2195fc6906c54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=718d35dcd6ef30818cf2bbc20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 26 02:30:24 2015 +0100 dxgi/tests: Add test for maximum frame latency. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 9e676b9..8a4b3f3 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,6 +21,12 @@ #include "d3d11.h" #include "wine/test.h" +enum frame_latency +{ + DEFAULT_FRAME_LATENCY = 3, + MAX_FRAME_LATENCY = 16, +}; + static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); @@ -1214,6 +1220,57 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_maximum_frame_latency(void) +{ + IDXGIDevice1 *device1; + IDXGIDevice *device; + UINT max_latency; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + if (SUCCEEDED(IDXGIDevice_QueryInterface(device, &IID_IDXGIDevice1, (void **)&device1))) + { + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(max_latency == DEFAULT_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + + hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + + hr = IDXGIDevice1_SetMaximumFrameLatency(device1, MAX_FRAME_LATENCY + 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(max_latency == MAX_FRAME_LATENCY, "Got unexpected maximum frame latency %u.\n", max_latency); + + hr = IDXGIDevice1_SetMaximumFrameLatency(device1, 0); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIDevice1_GetMaximumFrameLatency(device1, &max_latency); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* 0 does not reset to the default frame latency on all Windows versions. */ + ok(max_latency == DEFAULT_FRAME_LATENCY || broken(!max_latency), + "Got unexpected maximum frame latency %u.\n", max_latency); + + IDXGIDevice1_Release(device1); + } + else + { + win_skip("IDXGIDevice1 is not implemented.\n"); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { pCreateDXGIFactory1 = (void *)GetProcAddress(GetModuleHandleA("dxgi.dll"), "CreateDXGIFactory1"); @@ -1231,4 +1288,5 @@ START_TEST(device) test_private_data(); test_swapchain_resize(); test_swapchain_parameters(); + test_maximum_frame_latency(); }

1 0

Józef Kucia : d3d/tests: Check that device implements IDXGIDevice1.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 8b0b82a580b00ba69903d9b67f36a6cd6c563e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0b82a580b00ba69903d9b67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 26 02:30:25 2015 +0100 d3d/tests: Check that device implements IDXGIDevice1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 4 ++++ dlls/d3d10core/tests/device.c | 5 +++++ dlls/d3d11/tests/d3d11.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index fd865a3..c145181 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -95,6 +95,10 @@ static void test_device_interfaces(void) IDXGIAdapter_Release(dxgi_adapter); IDXGIDevice_Release(dxgi_device); + hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice1, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice1.\n"); + IUnknown_Release(iface); + hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 38e9e9c..5606c3b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -240,6 +240,11 @@ static void test_device_interfaces(void) IUnknown_Release(dxgi_adapter); IUnknown_Release(dxgi_device); + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Device should implement IDXGIDevice1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D10Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); ok(SUCCEEDED(hr), "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); IUnknown_Release(iface); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f54e6e3..7adea47 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -288,6 +288,10 @@ static void test_device_interfaces(void) IDXGIAdapter_Release(dxgi_adapter); IDXGIDevice_Release(dxgi_device); + hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice1, (void **)&iface); + ok(SUCCEEDED(hr), "Device should implement IDXGIDevice1.\n"); + IUnknown_Release(iface); + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Device should implement ID3D10Multithread interface, hr %#x.\n", hr);

1 0

Bruno Jesus : avifil32: Implement AVISave[A|W] by forwarding to AVISaveV.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: a9522d52fe8c37e0aec54934a03e8341bbb10d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9522d52fe8c37e0aec54934a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 23 04:12:53 2015 +0800 avifil32: Implement AVISave[A|W] by forwarding to AVISaveV. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 20985cd..4612611 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -2278,17 +2278,85 @@ HRESULT WINAPI AVIPutFileOnClipboard(PAVIFILE pfile) HRESULT WINAPIV AVISaveA(LPCSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, + va_list vl; + int i; + HRESULT ret; + PAVISTREAM *streams; + LPAVICOMPRESSOPTIONS *options; + + TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler, lpfnCallback, nStreams, pavi, lpOptions); - return AVIERR_UNSUPPORTED; + if (nStreams <= 0) return AVIERR_BADPARAM; + + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + if (!streams || !options) + { + ret = AVIERR_MEMORY; + goto error; + } + + streams[0] = pavi; + options[0] = lpOptions; + + va_start(vl, lpOptions); + for (i = 1; i < nStreams; i++) + { + streams[i] = va_arg(vl, void *); + options[i] = va_arg(vl, void *); + } + va_end(vl); + + for (i = 0; i < nStreams; i++) + TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); + + ret = AVISaveVA(szFile, pclsidHandler, lpfnCallback, nStreams, streams, options); +error: + HeapFree(GetProcessHeap(), 0, streams); + HeapFree(GetProcessHeap(), 0, options); + return ret; } HRESULT WINAPIV AVISaveW(LPCWSTR szFile, CLSID * pclsidHandler, AVISAVECALLBACK lpfnCallback, int nStreams, PAVISTREAM pavi, LPAVICOMPRESSOPTIONS lpOptions, ...) { - FIXME("(%s,%p,%p,0x%08x,%p,%p), stub!\n", debugstr_w(szFile), pclsidHandler, lpfnCallback, + va_list vl; + int i; + HRESULT ret; + PAVISTREAM *streams; + LPAVICOMPRESSOPTIONS *options; + + TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_w(szFile), pclsidHandler, lpfnCallback, nStreams, pavi, lpOptions); - return AVIERR_UNSUPPORTED; + if (nStreams <= 0) return AVIERR_BADPARAM; + + streams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + options = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(void *)); + if (!streams || !options) + { + ret = AVIERR_MEMORY; + goto error; + } + + streams[0] = pavi; + options[0] = lpOptions; + + va_start(vl, lpOptions); + for (i = 1; i < nStreams; i++) + { + streams[i] = va_arg(vl, void *); + options[i] = va_arg(vl, void *); + } + va_end(vl); + + for (i = 0; i < nStreams; i++) + TRACE("Pair[%d] - Stream = %p, Options = %p\n", i, streams[i], options[i]); + + ret = AVISaveVW(szFile, pclsidHandler, lpfnCallback, nStreams, streams, options); +error: + HeapFree(GetProcessHeap(), 0, streams); + HeapFree(GetProcessHeap(), 0, options); + return ret; }

1 0

Alexandre Julliard : makefiles: Fix expansion of '$$' in make variables.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 581be47a45b2c566083e543d28609708b26002e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=581be47a45b2c566083e543d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 14:39:06 2015 +0900 makefiles: Fix expansion of '$$' in make variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c81a57e..3c30a0c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1518,23 +1518,21 @@ static char *get_expanded_make_variable( struct makefile *make, const char *name var = get_make_variable( make, p + 2 ); tmp = replace_substr( expand, p, end - p, var ? var : "" ); free( var ); + /* switch to the new string */ + p = tmp + (p - expand); + free( expand ); + expand = tmp; } else if (p[1] == '{') /* don't expand ${} variables */ { if (!(end = strchr( p + 2, '}' ))) fatal_error( "syntax error in '%s'\n", expand ); p = end + 1; - continue; } else if (p[1] == '$') { - tmp = replace_substr( expand, p, 2, "$" ); + p += 2; } else fatal_error( "syntax error in '%s'\n", expand ); - - /* switch to the new string */ - p = tmp + (p - expand); - free( expand ); - expand = tmp; } /* consider empty variables undefined */

1 0

Alexandre Julliard : makefiles: Move wine.desktop to the loader directory.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 2207a8907ca71792ab27acf9bb61efa80431ea84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2207a8907ca71792ab27acf9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 23:03:08 2015 +0900 makefiles: Move wine.desktop to the loader directory. Also don't install it on Mac OS X or Android. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 ++++++++++- configure.ac | 11 ++++++++++- {tools => loader}/wine.desktop | 0 tools/Makefile.in | 7 ++----- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 8d17086..508cb0b 100755 --- a/configure +++ b/configure @@ -8825,6 +8825,15 @@ $wine_binary: main.o wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) " + if test -z "$with_wine64" + then + as_fn_append LOADER_RULES " +install install-lib:: + \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop +" + fi ;; esac @@ -18116,7 +18125,7 @@ wine_fn_config_program wusa enable_wusa install wine_fn_config_program xcopy enable_xcopy install,po wine_fn_config_test programs/xcopy/tests xcopy.exe_test wine_fn_config_makefile server enable_server clean,install-lib,manpage -wine_fn_config_tool tools clean,install-dev,install-lib,manpage +wine_fn_config_tool tools clean,install-dev,manpage wine_fn_config_tool tools/sfnt2fon clean wine_fn_config_tool tools/widl clean,install-dev,manpage wine_fn_config_tool tools/winebuild clean,install-dev,manpage diff --git a/configure.ac b/configure.ac index bfcf319..8bbb3f7 100644 --- a/configure.ac +++ b/configure.ac @@ -1039,6 +1039,15 @@ $wine_binary: main.o wine-installed: main.o \$(CC) -o \$@ $LDEXECFLAGS main.o \$(LIBWINE) \$(LIBPORT) \$(EXTRALIBS) \$(LDFLAGS) \$(LDRPATH_INSTALL) "]) + if test -z "$with_wine64" + then + AS_VAR_APPEND([LOADER_RULES],[" +install install-lib:: + \$(INSTALL_DATA) \$(srcdir)/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop +uninstall:: + \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop +"]) + fi ;; esac @@ -3589,7 +3598,7 @@ WINE_CONFIG_PROGRAM(wusa,,[install]) WINE_CONFIG_PROGRAM(xcopy,,[install,po]) WINE_CONFIG_TEST(programs/xcopy/tests) WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage]) -WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage]) +WINE_CONFIG_TOOL(tools,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/sfnt2fon,[clean]) WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage]) WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage]) diff --git a/tools/wine.desktop b/loader/wine.desktop similarity index 100% rename from tools/wine.desktop rename to loader/wine.desktop diff --git a/tools/Makefile.in b/tools/Makefile.in index c51b8e0..0aecc9f 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -18,13 +18,10 @@ all: wineapploader make_xftmpl$(EXEEXT): make_xftmpl.o $(CC) $(CFLAGS) -o $@ make_xftmpl.o $(LIBPORT) $(LDFLAGS) -.PHONY: install install-lib install-dev uninstall - -install install-lib:: - $(INSTALL_DATA) $(srcdir)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop +.PHONY: install install-dev uninstall install install-dev:: install-man-pages $(INSTALL_SCRIPT) $(srcdir)/winemaker $(DESTDIR)$(bindir)/winemaker uninstall:: - $(RM) $(DESTDIR)$(datadir)/applications/wine.desktop $(DESTDIR)$(bindir)/winemaker + $(RM) $(DESTDIR)$(bindir)/winemaker

1 0

Alexandre Julliard : krnl386.exe: Remove some redundant shifts.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 5767c63ae0edca8635ed70d7071759745997be81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5767c63ae0edca8635ed70d70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 17:54:48 2015 +0900 krnl386.exe: Remove some redundant shifts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/dma.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/krnl386.exe16/dma.c b/dlls/krnl386.exe16/dma.c index a0c4050..6734a25 100644 --- a/dlls/krnl386.exe16/dma.c +++ b/dlls/krnl386.exe16/dma.c @@ -342,31 +342,31 @@ BYTE DMA_ioport_in( WORD port ) channel = ((port-1)&0xC0)?(((port-1)-0xC0)>>2):(port>>1); dmachip = (channel<4) ? 0 : 1; if (!DMA_Toggle[dmachip]) - res = DMA_CurrentByteCount[channel] & 0xFF; + res = DMA_CurrentByteCount[channel]; else { - res = (DMA_CurrentByteCount[channel] & (0xFF << 8))>>8; + res = DMA_CurrentByteCount[channel] >> 8; TRACE("Read Current Count = %x.\n",DMA_CurrentByteCount[channel]); } DMA_Toggle[dmachip] = !DMA_Toggle[dmachip]; break; /* Low Page Base Address */ - case 0x87: res = (DMA_BaseAddress[0]&(0xFF<<16))>>16; break; - case 0x83: res = (DMA_BaseAddress[1]&(0xFF<<16))>>16; break; - case 0x81: res = (DMA_BaseAddress[2]&(0xFF<<16))>>16; break; - case 0x82: res = (DMA_BaseAddress[3]&(0xFF<<16))>>16; break; - case 0x8B: res = (DMA_BaseAddress[5]&(0xFF<<16))>>16; break; - case 0x89: res = (DMA_BaseAddress[6]&(0xFF<<16))>>16; break; - case 0x8A: res = (DMA_BaseAddress[7]&(0xFF<<16))>>16; break; + case 0x87: res = DMA_BaseAddress[0] >> 16; break; + case 0x83: res = DMA_BaseAddress[1] >> 16; break; + case 0x81: res = DMA_BaseAddress[2] >> 16; break; + case 0x82: res = DMA_BaseAddress[3] >> 16; break; + case 0x8B: res = DMA_BaseAddress[5] >> 16; break; + case 0x89: res = DMA_BaseAddress[6] >> 16; break; + case 0x8A: res = DMA_BaseAddress[7] >> 16; break; /* High Page Base Address */ - case 0x487: res = (DMA_BaseAddress[0]&(0xFF<<24))>>24; break; - case 0x483: res = (DMA_BaseAddress[1]&(0xFF<<24))>>24; break; - case 0x481: res = (DMA_BaseAddress[2]&(0xFF<<24))>>24; break; - case 0x482: res = (DMA_BaseAddress[3]&(0xFF<<24))>>24; break; - case 0x48B: res = (DMA_BaseAddress[5]&(0xFF<<24))>>24; break; - case 0x489: res = (DMA_BaseAddress[6]&(0xFF<<24))>>24; break; - case 0x48A: res = (DMA_BaseAddress[7]&(0xFF<<24))>>24; break; + case 0x487: res = DMA_BaseAddress[0] >> 24; break; + case 0x483: res = DMA_BaseAddress[1] >> 24; break; + case 0x481: res = DMA_BaseAddress[2] >> 24; break; + case 0x482: res = DMA_BaseAddress[3] >> 24; break; + case 0x48B: res = DMA_BaseAddress[5] >> 24; break; + case 0x489: res = DMA_BaseAddress[6] >> 24; break; + case 0x48A: res = DMA_BaseAddress[7] >> 24; break; case 0x08: case 0xD0:

1 0

Alexandre Julliard : ntdll: Remove some redundant shifts.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: e01dbac2bb4efcd3e93590f9b107cca38623713f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01dbac2bb4efcd3e93590f9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 26 17:57:50 2015 +0900 ntdll: Remove some redundant shifts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2acaa83..0bcc8b0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -971,15 +971,15 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if(regs2[3] & (1 << 26)) info->FeatureSet |= CPU_FEATURE_SSE2; user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1); - user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] & (1 << 4 )) >> 4; - user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = (regs2[3] & (1 << 6 )) >> 6; - user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] & (1 << 8 )) >> 8; - user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 23)) >> 23; - user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 25)) >> 25; - user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 26)) >> 26; + user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 4) & 1; + user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = (regs2[3] >> 6) & 1; + user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = (regs2[3] >> 8) & 1; + user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 23) & 1; + user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 25) & 1; + user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 26) & 1; user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = regs2[2] & 1; - user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] & (1 << 27)) >> 27; - user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] & (1 << 13)) >> 13; + user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] >> 27) & 1; + user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] >> 13) & 1; if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24))) /* has SSE2 and FXSAVE/FXRSTOR */ user_shared_data->ProcessorFeatures[PF_SSE_DAZ_MODE_AVAILABLE] = have_sse_daz_mode(); @@ -999,9 +999,9 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) if (regs[0] >= 0x80000001) { do_cpuid(0x80000001, regs2); /* get vendor features */ - user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 2 )) >> 2; - user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] & (1 << 20 )) >> 20; - user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] & (1 << 31 )) >> 31; + user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 2) & 1; + user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; + user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 31) & 1; if(regs2[3] & (1 << 31)) info->FeatureSet |= CPU_FEATURE_3DNOW; } } @@ -1016,13 +1016,13 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) info->Revision |= regs2[0] & 0xf; /* stepping */ if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS; - user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] & (1 << 5 )) >> 5; + user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 5) & 1; do_cpuid(0x80000000, regs); /* get vendor cpuid level */ if (regs[0] >= 0x80000001) { do_cpuid(0x80000001, regs2); /* get vendor features */ - user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] & (1 << 20 )) >> 20; + user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1; } } else

1 0

Dmitry Timoshkov : widl: Add support for unions to the typelib generator.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: e6e7055c0b8c27c4584bf1afb6a952ef37d718b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6e7055c0b8c27c4584bf1afb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 15 20:46:28 2015 +0800 widl: Add support for unions to the typelib generator. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a39e986..fc0eae7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -745,6 +745,7 @@ static importinfo_t *find_importinfo(msft_typelib_t *typelib, const char *name) static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure); static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface); static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); +static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion); static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls); static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface); @@ -993,6 +994,9 @@ static int encode_type( case TYPE_ENUM: add_enum_typeinfo(typelib, type); break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; case TYPE_COCLASS: add_coclass_typeinfo(typelib, type); break; @@ -1752,6 +1756,10 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) typedata[4] = typeinfo->datawidth; typeinfo->datawidth += var_datawidth; break; + case TKIND_UNION: + typedata[4] = typeinfo->datawidth; + typeinfo->datawidth = max(typeinfo->datawidth, var_datawidth); + break; case TKIND_DISPATCH: var_kind = 3; /* VAR_DISPATCH */ typeinfo->datawidth = pointer_size; @@ -2141,6 +2149,24 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration) add_var_desc(msft_typeinfo, idx++, cur); } +static void add_union_typeinfo(msft_typelib_t *typelib, type_t *tunion) +{ + int idx = 0; + var_t *cur; + msft_typeinfo_t *msft_typeinfo; + + if (-1 < tunion->typelib_idx) + return; + + tunion->typelib_idx = typelib->typelib_header.nrtypeinfos; + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_UNION, tunion->name, tunion->attrs); + msft_typeinfo->typeinfo->size = 0; + + if (type_union_get_cases(tunion)) + LIST_FOR_EACH_ENTRY(cur, type_union_get_cases(tunion), var_t, entry) + add_var_desc(msft_typeinfo, idx++, cur); +} + static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { msft_typeinfo_t *msft_typeinfo = NULL; @@ -2288,6 +2314,9 @@ static void add_type_typeinfo(msft_typelib_t *typelib, type_t *type) case TYPE_ENUM: add_enum_typeinfo(typelib, type); break; + case TYPE_UNION: + add_union_typeinfo(typelib, type); + break; case TYPE_COCLASS: add_coclass_typeinfo(typelib, type); break;

1 0

Dmitry Timoshkov : user32/tests: Move MDI tests out of the WM_CREATE handler.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 2e8166ec0e84499ceaccf650706f9f7045fc9b16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8166ec0e84499ceaccf6507… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 26 19:51:28 2015 +0800 user32/tests: Move MDI tests out of the WM_CREATE handler. This helps to avoid side effects of the not yet finished window creation process. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 90 ++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 46 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 34366a7..2f5e2b8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1869,51 +1869,7 @@ static LRESULT WINAPI mdi_main_wnd_procA(HWND hwnd, UINT msg, WPARAM wparam, LPA switch (msg) { case WM_CREATE: - { - CLIENTCREATESTRUCT client_cs; - RECT rc; - - GetClientRect(hwnd, &rc); - - client_cs.hWindowMenu = 0; - client_cs.idFirstChild = 1; - - /* MDIClient without MDIS_ALLCHILDSTYLES */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD /*| WS_VISIBLE*/, - /* tests depend on a not zero MDIClient size */ - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); - DestroyWindow(mdi_client); - - /* MDIClient with MDIS_ALLCHILDSTYLES */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD | MDIS_ALLCHILDSTYLES /*| WS_VISIBLE*/, - /* tests depend on a not zero MDIClient size */ - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_create(hwnd, mdi_client, client_cs.idFirstChild); - DestroyWindow(mdi_client); - - /* Test child window stack management */ - mdi_client = CreateWindowExA(0, "mdiclient", - NULL, - WS_CHILD, - 0, 0, rc.right, rc.bottom, - hwnd, 0, GetModuleHandleA(NULL), - &client_cs); - assert(mdi_client); - test_MDI_child_stack(mdi_client); - DestroyWindow(mdi_client); - break; - } + return 1; case WM_WINDOWPOSCHANGED: { @@ -1993,7 +1949,9 @@ static BOOL mdi_RegisterWindowClasses(void) static void test_mdi(void) { - HWND mdi_hwndMain; + HWND mdi_hwndMain, mdi_client; + CLIENTCREATESTRUCT client_cs; + RECT rc; /*MSG msg;*/ if (!mdi_RegisterWindowClasses()) assert(0); @@ -2005,6 +1963,46 @@ static void test_mdi(void) GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain); + + GetClientRect(mdi_hwndMain, &rc); + + client_cs.hWindowMenu = 0; + client_cs.idFirstChild = 1; + + /* MDIClient without MDIS_ALLCHILDSTYLES */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD /*| WS_VISIBLE*/, + /* tests depend on a not zero MDIClient size */ + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_create(mdi_hwndMain, mdi_client, client_cs.idFirstChild); + DestroyWindow(mdi_client); + + /* MDIClient with MDIS_ALLCHILDSTYLES */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD | MDIS_ALLCHILDSTYLES /*| WS_VISIBLE*/, + /* tests depend on a not zero MDIClient size */ + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_create(mdi_hwndMain, mdi_client, client_cs.idFirstChild); + DestroyWindow(mdi_client); + + /* Test child window stack management */ + mdi_client = CreateWindowExA(0, "mdiclient", + NULL, + WS_CHILD, + 0, 0, rc.right, rc.bottom, + mdi_hwndMain, 0, GetModuleHandleA(NULL), + &client_cs); + assert(mdi_client); + test_MDI_child_stack(mdi_client); + DestroyWindow(mdi_client); /* while(GetMessage(&msg, 0, 0, 0)) {

1 0

Dmitry Timoshkov : user32/tests: Add some tests for WM_MDIGETACTIVE.
by Alexandre Julliard 26 Oct '15

26 Oct '15

Module: wine Branch: master Commit: 12111d8c3b897df92fabc1c1a81567477952e9b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12111d8c3b897df92fabc1c1a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 26 19:51:34 2015 +0800 user32/tests: Add some tests for WM_MDIGETACTIVE. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2f5e2b8..b7c32d1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1290,7 +1290,7 @@ static char mdi_lParam_test_message[] = "just a test string"; static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) { MDICREATESTRUCTA mdi_cs; - HWND mdi_child; + HWND mdi_child, hwnd, exp_hwnd; INT_PTR id; static const WCHAR classW[] = {'M','D','I','_','c','h','i','l','d','_','C','l','a','s','s','_','1',0}; static const WCHAR titleW[] = {'M','D','I',' ','c','h','i','l','d',0}; @@ -1309,6 +1309,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1317,6 +1320,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1331,6 +1337,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1353,6 +1362,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1366,6 +1378,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1378,6 +1393,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1396,6 +1414,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1419,6 +1440,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1432,6 +1456,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1444,6 +1471,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); @@ -1462,6 +1492,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); +todo_wine + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1485,6 +1518,9 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) { id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == first_id, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + exp_hwnd = (GetWindowLongW(mdi_child, GWL_STYLE) & WS_VISIBLE) ? mdi_child : 0; + ok(hwnd == exp_hwnd, "WM_MDIGETACTIVE should return %p, got %p\n", exp_hwnd, hwnd); SendMessageA(mdi_client, WM_MDIDESTROY, (WPARAM)mdi_child, 0); ok(!IsWindow(mdi_child), "WM_MDIDESTROY failed\n"); } @@ -1510,6 +1546,8 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); mdi_child = CreateWindowExA(0, "MDI_child_Class_2", "MDI child", @@ -1521,6 +1559,8 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); /* maximized child */ @@ -1533,6 +1573,8 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); trace("Creating maximized child with a caption\n"); @@ -1545,6 +1587,8 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); trace("Creating maximized child with a caption and a thick frame\n"); @@ -1557,6 +1601,8 @@ static void test_MDI_create(HWND parent, HWND mdi_client, INT_PTR first_id) ok(mdi_child != 0, "MDI child creation failed\n"); id = GetWindowLongPtrA(mdi_child, GWLP_ID); ok(id == 0, "wrong child id %ld\n", id); + hwnd = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + ok(!hwnd, "WM_MDIGETACTIVE should return 0, got %p\n", hwnd); DestroyWindow(mdi_child); }

1 0