March 2017 - Wine-Commits - list.winehq.org

Andrey Gusev : api-ms-win-mm-misc-l1-1-1: Add dll.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: ad297e72951594ca3021e3608e39d5e3254d8e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad297e72951594ca3021e3608… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 29 17:28:37 2017 +0300 api-ms-win-mm-misc-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-mm-misc-l1-1-1/Makefile.in | 1 + .../api-ms-win-mm-misc-l1-1-1.spec | 30 ++++++++++++++++++++++ tools/make_specfiles | 4 +++ 5 files changed, 38 insertions(+) diff --git a/configure b/configure index 051b9c9..c893d02 100755 --- a/configure +++ b/configure @@ -1018,6 +1018,7 @@ enable_api_ms_win_eventing_consumer_l1_1_0 enable_api_ms_win_eventing_controller_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_eventlog_legacy_l1_1_0 +enable_api_ms_win_mm_misc_l1_1_1 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 @@ -17756,6 +17757,7 @@ wine_fn_config_dll api-ms-win-eventing-consumer-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_eventing_controller_l1_1_0 wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 +wine_fn_config_dll api-ms-win-mm-misc-l1-1-1 enable_api_ms_win_mm_misc_l1_1_1 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 diff --git a/configure.ac b/configure.ac index 97e0811..f2d3b01 100644 --- a/configure.ac +++ b/configure.ac @@ -2806,6 +2806,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-consumer-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-controller-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-mm-misc-l1-1-1) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) diff --git a/dlls/api-ms-win-mm-misc-l1-1-1/Makefile.in b/dlls/api-ms-win-mm-misc-l1-1-1/Makefile.in new file mode 100644 index 0000000..ab09048 --- /dev/null +++ b/dlls/api-ms-win-mm-misc-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-mm-misc-l1-1-1.dll diff --git a/dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec b/dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec new file mode 100644 index 0000000..617092d --- /dev/null +++ b/dlls/api-ms-win-mm-misc-l1-1-1/api-ms-win-mm-misc-l1-1-1.spec @@ -0,0 +1,30 @@ +@ stdcall CloseDriver(long long long) winmm.CloseDriver +@ stdcall DefDriverProc(long long long long long) winmm.DefDriverProc +@ stdcall DriverCallback(long long long long long long long) winmm.DriverCallback +@ stdcall DrvGetModuleHandle(long) winmm.DrvGetModuleHandle +@ stdcall GetDriverModuleHandle(long) winmm.GetDriverModuleHandle +@ stub mmDrvInstall +@ stdcall mmioAdvance(long ptr long) winmm.mmioAdvance +@ stdcall mmioAscend(long ptr long) winmm.mmioAscend +@ stdcall mmioClose(long long) winmm.mmioClose +@ stdcall mmioCreateChunk(long ptr long) winmm.mmioCreateChunk +@ stdcall mmioDescend(long ptr ptr long) winmm.mmioDescend +@ stdcall mmioFlush(long long) winmm.mmioFlush +@ stdcall mmioGetInfo(long ptr long) winmm.mmioGetInfo +@ stdcall mmioInstallIOProcA(long ptr long) winmm.mmioInstallIOProcA +@ stdcall mmioInstallIOProcW(long ptr long) winmm.mmioInstallIOProcW +@ stdcall mmioOpenA(str ptr long) winmm.mmioOpenA +@ stdcall mmioOpenW(wstr ptr long) winmm.mmioOpenW +@ stdcall mmioRead(long ptr long) winmm.mmioRead +@ stdcall mmioRenameA(str str ptr long) winmm.mmioRenameA +@ stdcall mmioRenameW(wstr wstr ptr long) winmm.mmioRenameW +@ stdcall mmioSeek(long long long) winmm.mmioSeek +@ stdcall mmioSendMessage(long long long long) winmm.mmioSendMessage +@ stdcall mmioSetBuffer(long ptr long long) winmm.mmioSetBuffer +@ stdcall mmioSetInfo(long ptr long) winmm.mmioSetInfo +@ stdcall mmioStringToFOURCCA(str long) winmm.mmioStringToFOURCCA +@ stdcall mmioStringToFOURCCW(wstr long) winmm.mmioStringToFOURCCW +@ stdcall mmioWrite(long ptr long) winmm.mmioWrite +@ stdcall OpenDriver(wstr wstr long) winmm.OpenDriver +@ stdcall SendDriverMessage(long long long long) winmm.SendDriverMessage +@ stub sndOpenSound diff --git a/tools/make_specfiles b/tools/make_specfiles index d00603a..84c2d8d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -311,6 +311,10 @@ my @dll_groups = "api-ms-win-downlevel-version-l1-1-0", ], [ + "winmm", + "api-ms-win-mm-misc-l1-1-1", + ], + [ "msvcrt", "ntdll", "ntoskrnl.exe",

1 0

Józef Kucia : wined3d: Acquire stream output buffers for draw calls.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: eb77e320d53a659f9fc0d4dda4ff8e8fd77f3834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb77e320d53a659f9fc0d4dda… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 29 15:11:07 2017 +0200 wined3d: Acquire stream output buffers for draw calls. 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/wined3d/cs.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index dd6feab..71099e7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -634,6 +634,11 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->streams[i].buffer) wined3d_resource_release(&state->streams[i].buffer->resource); } + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + if (state->stream_output[i].buffer) + wined3d_resource_release(&state->stream_output[i].buffer->resource); + } for (i = 0; i < ARRAY_SIZE(state->textures); ++i) { if (state->textures[i]) @@ -675,6 +680,11 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, int base if (state->streams[i].buffer) wined3d_resource_acquire(&state->streams[i].buffer->resource); } + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + if (state->stream_output[i].buffer) + wined3d_resource_acquire(&state->stream_output[i].buffer->resource); + } for (i = 0; i < ARRAY_SIZE(state->textures); ++i) { if (state->textures[i])

1 0

Jacek Caban : ntdll/tests: Added tests of partial reads and reads with invalid wait handle.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: e024094b75df417c9943a154c378d90bcf650f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e024094b75df417c9943a154c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 14:05:47 2017 +0200 ntdll/tests: Added tests of partial reads and reads with invalid wait handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index cfff0e5..e242cb4 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -840,6 +840,43 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) SleepEx( 1, TRUE ); /* alertable sleep */ ok( apc_count == 1, "apc not called\n" ); + /* now partial read with data ready */ + apc_count = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + ResetEvent( event ); + ret = WriteFile( write, buffer, 2, &written, NULL ); + ok(ret && written == 2, "WriteFile error %d\n", GetLastError()); + status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); + if (pipe_type & PIPE_READMODE_MESSAGE) + { + ok( status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", status ); + ok( U(iosb).Status == STATUS_BUFFER_OVERFLOW, "wrong status %x\n", U(iosb).Status ); + } + else + { + ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); + ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); + } + ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is not signaled\n" ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, FALSE ); /* non-alertable sleep */ + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( apc_count == 1, "apc not called\n" ); + apc_count = 0; + status = NtReadFile( read, event, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); + ok( status == STATUS_SUCCESS, "wrong status %x\n", status ); + ok( U(iosb).Status == 0, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 1, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is not signaled\n" ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, FALSE ); /* non-alertable sleep */ + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( apc_count == 1, "apc not called\n" ); + /* try read with no data */ apc_count = 0; U(iosb).Status = 0xdeadbabe; @@ -877,6 +914,19 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type) ok( !apc_count, "apc was called\n" ); CloseHandle( read ); + /* read from disconnected pipe, with invalid event handle */ + apc_count = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + status = NtReadFile( read, (HANDLE)0xdeadbeef, apc, &apc_count, &iosb, buffer, 1, NULL, NULL ); + ok( status == STATUS_INVALID_HANDLE, "wrong status %x\n", status ); + ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( !apc_count, "apc was called\n" ); + CloseHandle( read ); + /* read from closed handle */ apc_count = 0; U(iosb).Status = 0xdeadbabe;

1 0

Hans Leidekker : webservices: Don' t allocate an XML buffer until it is needed.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 4f1c7dc19528708cdf5cc644b26f008397d338ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1c7dc19528708cdf5cc644b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 29 11:14:48 2017 +0200 webservices: Don't allocate an XML buffer until it is needed. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index d15ab85..ae021cc 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -171,11 +171,6 @@ static HRESULT create_msg( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSIO free_msg( msg ); return hr; } - if ((hr = WsCreateXmlBuffer( msg->heap, NULL, 0, &msg->buf, NULL )) != S_OK) - { - free_msg( msg ); - return hr; - } UuidCreate( &msg->id ); msg->version_env = env_version;

1 0

Vitaly Lipatov : advapi32/tests: Add test prototype for RegQueryValueEx HKEY_PERFORMANCE_DATA.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 7cbaf1f56f6d1932123e4275b5fe6f63e7083674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbaf1f56f6d1932123e4275b… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Mar 22 14:03:46 2017 +0300 advapi32/tests: Add test prototype for RegQueryValueEx HKEY_PERFORMANCE_DATA. Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index eb9ab67..4ea0f68 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winternl.h" #include "winreg.h" +#include "winperf.h" #include "winsvc.h" #include "winerror.h" #include "aclapi.h" @@ -3480,6 +3481,54 @@ static void test_RegNotifyChangeKeyValue(void) CloseHandle(event); } +static void test_RegQueryValueExPerformanceData(void) +{ + DWORD cbData, len; + BYTE *value; + DWORD dwret; + LONG limit = 6; + PERF_DATA_BLOCK *pdb; + + /* Test with data == NULL */ + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, NULL, &cbData ); + todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + + /* Test ERROR_MORE_DATA, start with small buffer */ + len = 10; + value = HeapAlloc(GetProcessHeap(), 0, len); + cbData = len; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + todo_wine ok( dwret == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", dwret ); + while( dwret == ERROR_MORE_DATA && limit) + { + len = len * 10; + value = HeapReAlloc( GetProcessHeap(), 0, value, len ); + cbData = len; + dwret = RegQueryValueExA( HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, value, &cbData ); + limit--; + } + ok(limit > 0, "too many times ERROR_MORE_DATA returned\n"); + + todo_wine ok(dwret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", dwret); + + /* Check returned data */ + if (dwret == ERROR_SUCCESS) + { + todo_wine ok(len >= sizeof(PERF_DATA_BLOCK), "got size %d\n", len); + if (len >= sizeof(PERF_DATA_BLOCK)) { + pdb = (PERF_DATA_BLOCK*) value; + ok(pdb->Signature[0] == 'P', "expected Signature[0] = 'P', got 0x%x\n", pdb->Signature[0]); + ok(pdb->Signature[1] == 'E', "expected Signature[1] = 'E', got 0x%x\n", pdb->Signature[1]); + ok(pdb->Signature[2] == 'R', "expected Signature[2] = 'R', got 0x%x\n", pdb->Signature[2]); + ok(pdb->Signature[3] == 'F', "expected Signature[3] = 'F', got 0x%x\n", pdb->Signature[3]); + /* TODO: check other field */ + } + } + + HeapFree(GetProcessHeap(), 0, value); +} + + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3515,6 +3564,7 @@ START_TEST(registry) test_delete_key_value(); test_RegOpenCurrentUser(); test_RegNotifyChangeKeyValue(); + test_RegQueryValueExPerformanceData(); /* cleanup */ delete_key( hkey_main );

1 0

Vitaly Lipatov : include: Add PERF_DATA_BLOCK struct definition.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 2884205db3a1d25d407b7c88e378520606f93578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2884205db3a1d25d407b7c88e… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Wed Mar 22 14:03:45 2017 +0300 include: Add PERF_DATA_BLOCK struct definition. Signed-off-by: Vitaly Lipatov <lav(a)etersoft.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winperf.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/winperf.h b/include/winperf.h index b62f24b..dce1a6d 100644 --- a/include/winperf.h +++ b/include/winperf.h @@ -67,4 +67,25 @@ #define PERF_DETAIL_EXPERT 300 #define PERF_DETAIL_WIZARD 400 +/* Performance data structure header + * returned in answer to HKEY_PERFORMANCE_DATA request + */ + +typedef struct _PERF_DATA_BLOCK { + WCHAR Signature[4]; + DWORD LittleEndian; + DWORD Version; + DWORD Revision; + DWORD TotalByteLength; + DWORD HeaderLength; + DWORD NumObjectTypes; + DWORD DefaultObject; + SYSTEMTIME SystemTime; + LARGE_INTEGER PerfTime; + LARGE_INTEGER PerfFreq; + LARGE_INTEGER PerfTime100nSec; + DWORD SystemNameLength; + DWORD SystemNameOffset; +} PERF_DATA_BLOCK, *PPERF_DATA_BLOCK, *LPPERF_DATA_BLOCK; + #endif /* _WINPERF_ */

1 0

Zebediah Figura : user32: Always send WM_CANCELMODE when disabling a window.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 0ac74d180a28e9071f6bd711ef53fa16b1140653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac74d180a28e9071f6bd711e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 27 14:01:41 2017 -0500 user32: Always send WM_CANCELMODE when disabling a window. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 21 ++++++++++++++++++++- dlls/user32/win.c | 24 ++++++++++++------------ 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 19a1f31..fbadf7d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1796,11 +1796,24 @@ static const struct message WmEnableWindowSeq_1[] = static const struct message WmEnableWindowSeq_2[] = { + { WM_CANCELMODE, sent|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { 0 } +}; + +static const struct message WmEnableWindowSeq_3[] = +{ { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_ENABLE, sent|wparam|lparam, TRUE, 0 }, { 0 } }; +static const struct message WmEnableWindowSeq_4[] = +{ + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { 0 } +}; + static const struct message WmGetScrollRangeSeq[] = { { SBM_GETRANGE, sent }, @@ -5484,8 +5497,14 @@ static void test_messages(void) EnableWindow(hparent, FALSE); ok_sequence(WmEnableWindowSeq_1, "EnableWindow(FALSE)", FALSE); + EnableWindow(hparent, FALSE); + ok_sequence(WmEnableWindowSeq_2, "EnableWindow(FALSE)", FALSE); + + EnableWindow(hparent, TRUE); + ok_sequence(WmEnableWindowSeq_3, "EnableWindow(TRUE)", FALSE); + EnableWindow(hparent, TRUE); - ok_sequence(WmEnableWindowSeq_2, "EnableWindow(TRUE)", FALSE); + ok_sequence(WmEnableWindowSeq_4, "EnableWindow(TRUE)", FALSE); flush_events(); flush_sequence(); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 38604b4..5c27a01 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2152,23 +2152,23 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) TRACE("( %p, %d )\n", hwnd, enable); - retvalue = !IsWindowEnabled( hwnd ); - - if (enable && retvalue) + if (enable) { - WIN_SetStyle( hwnd, 0, WS_DISABLED ); - SendMessageW( hwnd, WM_ENABLE, TRUE, 0 ); + retvalue = (WIN_SetStyle( hwnd, 0, WS_DISABLED ) & WS_DISABLED) != 0; + if (retvalue) SendMessageW( hwnd, WM_ENABLE, TRUE, 0 ); } - else if (!enable && !retvalue) + else { - SendMessageW( hwnd, WM_CANCELMODE, 0, 0); - - WIN_SetStyle( hwnd, WS_DISABLED, 0 ); + SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); - if (hwnd == GetFocus()) - SetFocus( 0 ); /* A disabled window can't have the focus */ + retvalue = (WIN_SetStyle( hwnd, WS_DISABLED, 0 ) & WS_DISABLED) != 0; + if (!retvalue) + { + if (hwnd == GetFocus()) + SetFocus( 0 ); /* A disabled window can't have the focus */ - SendMessageW( hwnd, WM_ENABLE, FALSE, 0 ); + SendMessageW( hwnd, WM_ENABLE, FALSE, 0 ); + } } return retvalue; }

1 0

Zebediah Figura : user32: Don't call ReleaseCapture() in EnableWindow().
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: b4fea4f2f0df40976f50d396e9e4046929697879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4fea4f2f0df40976f50d396e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 27 14:01:40 2017 -0500 user32: Don't call ReleaseCapture() in EnableWindow(). Killing the capture is already handled in DefWindowProc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 26 ++++++++++++++++++++++++++ dlls/user32/win.c | 6 ------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f0ea182..fef9cb0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6561,8 +6561,16 @@ static DWORD CALLBACK enablewindow_thread(LPVOID arg) return 0; } +static LRESULT CALLBACK enable_window_procA(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_CANCELMODE) + return 0; + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + static void test_EnableWindow(void) { + WNDCLASSA cls; HWND hwnd; HANDLE hthread; DWORD tid; @@ -6604,6 +6612,24 @@ static void test_EnableWindow(void) CloseHandle(hthread); DestroyWindow(hwnd); + + /* test preventing release of capture */ + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = enable_window_procA; + cls.hInstance = GetModuleHandleA(0); + cls.lpszClassName = "EnableWindowClass"; + ok(RegisterClassA(&cls), "RegisterClass failed\n"); + + hwnd = CreateWindowExA(0, "EnableWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, NULL); + assert(hwnd); + SetFocus(hwnd); + SetCapture(hwnd); + + EnableWindow(hwnd, FALSE); + check_wnd_state(hwnd, hwnd, 0, hwnd); + + DestroyWindow(hwnd); } static DWORD CALLBACK gettext_msg_thread( LPVOID arg ) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f3b4ef5..38604b4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2161,8 +2161,6 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) } else if (!enable && !retvalue) { - HWND capture_wnd; - SendMessageW( hwnd, WM_CANCELMODE, 0, 0); WIN_SetStyle( hwnd, WS_DISABLED, 0 ); @@ -2170,10 +2168,6 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) if (hwnd == GetFocus()) SetFocus( 0 ); /* A disabled window can't have the focus */ - capture_wnd = GetCapture(); - if (capture_wnd && (hwnd == capture_wnd || IsChild(hwnd, capture_wnd))) - ReleaseCapture(); /* A disabled window can't capture the mouse */ - SendMessageW( hwnd, WM_ENABLE, FALSE, 0 ); } return retvalue;

1 0

Hugh McMaster : regedit: Remove data types that cannot be imported and clean-up data_types array.
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 523a61da855d0aff094553f65e263467dcab92f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=523a61da855d0aff094553f65… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:31 2017 +0000 regedit: Remove data types that cannot be imported and clean-up data_types array. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 066fb2d..a54a96f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -205,21 +205,18 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) struct data_type { const WCHAR *tag; int len; int type; int parse_type; }; static const WCHAR quote[] = {'"'}; - static const WCHAR str[] = {'s','t','r',':','"'}; - static const WCHAR str2[] = {'s','t','r','(','2',')',':','"'}; static const WCHAR hex[] = {'h','e','x',':'}; static const WCHAR dword[] = {'d','w','o','r','d',':'}; static const WCHAR hexp[] = {'h','e','x','('}; - static const struct data_type data_types[] = { /* actual type */ /* type to assume for parsing */ - { quote, 1, REG_SZ, REG_SZ }, - { str, 5, REG_SZ, REG_SZ }, - { str2, 8, REG_EXPAND_SZ, REG_SZ }, - { hex, 4, REG_BINARY, REG_BINARY }, - { dword, 6, REG_DWORD, REG_DWORD }, - { hexp, 4, -1, REG_BINARY }, - { NULL, 0, 0, 0 } - }; + static const struct data_type data_types[] = { + /* tag len type parse type */ + { quote, 1, REG_SZ, REG_SZ }, + { hex, 4, REG_BINARY, REG_BINARY }, + { dword, 6, REG_DWORD, REG_DWORD }, + { hexp, 4, -1, REG_BINARY }, /* REG_NONE, REG_EXPAND_SZ, REG_MULTI_SZ */ + { NULL, 0, 0, 0 } + }; const struct data_type *ptr; int type;

1 0

Henri Verbeet : wined3d: Validate the rectangle in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard March 29, 2017

March 29, 2017

Module: wine Branch: master Commit: 01cea136d6405765fee21dbc2932b7bca5353294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01cea136d6405765fee21dbc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 28 23:37:39 2017 +0200 wined3d: Validate the rectangle in wined3d_device_clear_rendertarget_view(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 627a4a7..1e4011c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4173,6 +4173,16 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi SetRect(&r, 0, 0, view->width, view->height); rect = &r; } + else + { + struct wined3d_box b = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; + struct wined3d_texture *texture = texture_from_resource(view->resource); + HRESULT hr; + + if (FAILED(hr = wined3d_texture_check_box_dimensions(texture, + view->sub_resource_idx % texture->level_count, &b))) + return hr; + } if (flags & WINED3DCLEAR_TARGET) blit_op = WINED3D_BLIT_OP_COLOR_FILL;

1 0