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

Andrey Gusev : api-ms-win-mm-misc-l1-1-1: Add dll.
by Alexandre Julliard 29 Mar '17

29 Mar '17

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

Andrey Gusev : api-ms-win-mm-mme-l1-1-0: Add dll.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 4bfa0d829fedb72ff9848fab14af891a4582b61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfa0d829fedb72ff9848fab1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Mar 29 17:28:38 2017 +0300 api-ms-win-mm-mme-l1-1-0: 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-mme-l1-1-0/Makefile.in | 1 + .../api-ms-win-mm-mme-l1-1-0.spec | 102 +++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 107 insertions(+) diff --git a/configure b/configure index c893d02..c4de73b 100755 --- a/configure +++ b/configure @@ -1019,6 +1019,7 @@ 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_mm_mme_l1_1_0 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 @@ -17758,6 +17759,7 @@ wine_fn_config_dll api-ms-win-eventing-controller-l1-1-0 enable_api_ms_win_event 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-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 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 f2d3b01..7e3f643 100644 --- a/configure.ac +++ b/configure.ac @@ -2807,6 +2807,7 @@ 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-mm-mme-l1-1-0) 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-mme-l1-1-0/Makefile.in b/dlls/api-ms-win-mm-mme-l1-1-0/Makefile.in new file mode 100644 index 0000000..a6d09ce --- /dev/null +++ b/dlls/api-ms-win-mm-mme-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-mm-mme-l1-1-0.dll diff --git a/dlls/api-ms-win-mm-mme-l1-1-0/api-ms-win-mm-mme-l1-1-0.spec b/dlls/api-ms-win-mm-mme-l1-1-0/api-ms-win-mm-mme-l1-1-0.spec new file mode 100644 index 0000000..8d6aa9f --- /dev/null +++ b/dlls/api-ms-win-mm-mme-l1-1-0/api-ms-win-mm-mme-l1-1-0.spec @@ -0,0 +1,102 @@ +@ stdcall auxGetDevCapsA(long ptr long) winmm.auxGetDevCapsA +@ stdcall auxGetDevCapsW(long ptr long) winmm.auxGetDevCapsW +@ stdcall auxGetNumDevs() winmm.auxGetNumDevs +@ stdcall auxGetVolume(long ptr) winmm.auxGetVolume +@ stdcall auxOutMessage(long long long long) winmm.auxOutMessage +@ stdcall auxSetVolume(long long) winmm.auxSetVolume +@ stdcall midiConnect(long long ptr) winmm.midiConnect +@ stdcall midiDisconnect(long long ptr) winmm.midiDisconnect +@ stdcall midiInAddBuffer(long ptr long) winmm.midiInAddBuffer +@ stdcall midiInClose(long) winmm.midiInClose +@ stdcall midiInGetDevCapsA(long ptr long) winmm.midiInGetDevCapsA +@ stdcall midiInGetDevCapsW(long ptr long) winmm.midiInGetDevCapsW +@ stdcall midiInGetErrorTextA(long ptr long) winmm.midiInGetErrorTextA +@ stdcall midiInGetErrorTextW(long ptr long) winmm.midiInGetErrorTextW +@ stdcall midiInGetID(long ptr) winmm.midiInGetID +@ stdcall midiInGetNumDevs() winmm.midiInGetNumDevs +@ stdcall midiInMessage(long long long long) winmm.midiInMessage +@ stdcall midiInOpen(ptr long long long long) winmm.midiInOpen +@ stdcall midiInPrepareHeader(long ptr long) winmm.midiInPrepareHeader +@ stdcall midiInReset(long) winmm.midiInReset +@ stdcall midiInStart(long) winmm.midiInStart +@ stdcall midiInStop(long) winmm.midiInStop +@ stdcall midiInUnprepareHeader(long ptr long) winmm.midiInUnprepareHeader +@ stdcall midiOutCacheDrumPatches(long long ptr long) winmm.midiOutCacheDrumPatches +@ stdcall midiOutCachePatches(long long ptr long) winmm.midiOutCachePatches +@ stdcall midiOutClose(long) winmm.midiOutClose +@ stdcall midiOutGetDevCapsA(long ptr long) winmm.midiOutGetDevCapsA +@ stdcall midiOutGetDevCapsW(long ptr long) winmm.midiOutGetDevCapsW +@ stdcall midiOutGetErrorTextA(long ptr long) winmm.midiOutGetErrorTextA +@ stdcall midiOutGetErrorTextW(long ptr long) winmm.midiOutGetErrorTextW +@ stdcall midiOutGetID(long ptr) winmm.midiOutGetID +@ stdcall midiOutGetNumDevs() winmm.midiOutGetNumDevs +@ stdcall midiOutGetVolume(long ptr) winmm.midiOutGetVolume +@ stdcall midiOutLongMsg(long ptr long) winmm.midiOutLongMsg +@ stdcall midiOutMessage(long long long long) winmm.midiOutMessage +@ stdcall midiOutOpen(ptr long long long long) winmm.midiOutOpen +@ stdcall midiOutPrepareHeader(long ptr long) winmm.midiOutPrepareHeader +@ stdcall midiOutReset(long) winmm.midiOutReset +@ stdcall midiOutSetVolume(long long) winmm.midiOutSetVolume +@ stdcall midiOutShortMsg(long long) winmm.midiOutShortMsg +@ stdcall midiOutUnprepareHeader(long ptr long) winmm.midiOutUnprepareHeader +@ stdcall midiStreamClose(long) winmm.midiStreamClose +@ stdcall midiStreamOpen(ptr ptr long long long long) winmm.midiStreamOpen +@ stdcall midiStreamOut(long ptr long) winmm.midiStreamOut +@ stdcall midiStreamPause(long) winmm.midiStreamPause +@ stdcall midiStreamPosition(long ptr long) winmm.midiStreamPosition +@ stdcall midiStreamProperty(long ptr long) winmm.midiStreamProperty +@ stdcall midiStreamRestart(long) winmm.midiStreamRestart +@ stdcall midiStreamStop(long) winmm.midiStreamStop +@ stdcall mixerClose(long) winmm.mixerClose +@ stdcall mixerGetControlDetailsA(long ptr long) winmm.mixerGetControlDetailsA +@ stdcall mixerGetControlDetailsW(long ptr long) winmm.mixerGetControlDetailsW +@ stdcall mixerGetDevCapsA(long ptr long) winmm.mixerGetDevCapsA +@ stdcall mixerGetDevCapsW(long ptr long) winmm.mixerGetDevCapsW +@ stdcall mixerGetID(long ptr long) winmm.mixerGetID +@ stdcall mixerGetLineControlsA(long ptr long) winmm.mixerGetLineControlsA +@ stdcall mixerGetLineControlsW(long ptr long) winmm.mixerGetLineControlsW +@ stdcall mixerGetLineInfoA(long ptr long) winmm.mixerGetLineInfoA +@ stdcall mixerGetLineInfoW(long ptr long) winmm.mixerGetLineInfoW +@ stdcall mixerGetNumDevs() winmm.mixerGetNumDevs +@ stdcall mixerMessage(long long long long) winmm.mixerMessage +@ stdcall mixerOpen(ptr long long long long) winmm.mixerOpen +@ stdcall mixerSetControlDetails(long ptr long) winmm.mixerSetControlDetails +@ stdcall waveInAddBuffer(long ptr long) winmm.waveInAddBuffer +@ stdcall waveInClose(long) winmm.waveInClose +@ stdcall waveInGetDevCapsA(long ptr long) winmm.waveInGetDevCapsA +@ stdcall waveInGetDevCapsW(long ptr long) winmm.waveInGetDevCapsW +@ stdcall waveInGetErrorTextA(long ptr long) winmm.waveInGetErrorTextA +@ stdcall waveInGetErrorTextW(long ptr long) winmm.waveInGetErrorTextW +@ stdcall waveInGetID(long ptr) winmm.waveInGetID +@ stdcall waveInGetNumDevs() winmm.waveInGetNumDevs +@ stdcall waveInGetPosition(long ptr long) winmm.waveInGetPosition +@ stdcall waveInMessage(long long long long) winmm.waveInMessage +@ stdcall waveInOpen(ptr long ptr long long long) winmm.waveInOpen +@ stdcall waveInPrepareHeader(long ptr long) winmm.waveInPrepareHeader +@ stdcall waveInReset(long) winmm.waveInReset +@ stdcall waveInStart(long) winmm.waveInStart +@ stdcall waveInStop(long) winmm.waveInStop +@ stdcall waveInUnprepareHeader(long ptr long) winmm.waveInUnprepareHeader +@ stdcall waveOutBreakLoop(long) winmm.waveOutBreakLoop +@ stdcall waveOutClose(long) winmm.waveOutClose +@ stdcall waveOutGetDevCapsA(long ptr long) winmm.waveOutGetDevCapsA +@ stdcall waveOutGetDevCapsW(long ptr long) winmm.waveOutGetDevCapsW +@ stdcall waveOutGetErrorTextA(long ptr long) winmm.waveOutGetErrorTextA +@ stdcall waveOutGetErrorTextW(long ptr long) winmm.waveOutGetErrorTextW +@ stdcall waveOutGetID(long ptr) winmm.waveOutGetID +@ stdcall waveOutGetNumDevs() winmm.waveOutGetNumDevs +@ stdcall waveOutGetPitch(long ptr) winmm.waveOutGetPitch +@ stdcall waveOutGetPlaybackRate(long ptr) winmm.waveOutGetPlaybackRate +@ stdcall waveOutGetPosition(long ptr long) winmm.waveOutGetPosition +@ stdcall waveOutGetVolume(long ptr) winmm.waveOutGetVolume +@ stdcall waveOutMessage(long long long long) winmm.waveOutMessage +@ stdcall waveOutOpen(ptr long ptr long long long) winmm.waveOutOpen +@ stdcall waveOutPause(long) winmm.waveOutPause +@ stdcall waveOutPrepareHeader(long ptr long) winmm.waveOutPrepareHeader +@ stdcall waveOutReset(long) winmm.waveOutReset +@ stdcall waveOutRestart(long) winmm.waveOutRestart +@ stdcall waveOutSetPitch(long long) winmm.waveOutSetPitch +@ stdcall waveOutSetPlaybackRate(long long) winmm.waveOutSetPlaybackRate +@ stdcall waveOutSetVolume(long long) winmm.waveOutSetVolume +@ stdcall waveOutUnprepareHeader(long ptr long) winmm.waveOutUnprepareHeader +@ stdcall waveOutWrite(long ptr long) winmm.waveOutWrite diff --git a/tools/make_specfiles b/tools/make_specfiles index 84c2d8d..b36664d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -313,6 +313,7 @@ my @dll_groups = [ "winmm", "api-ms-win-mm-misc-l1-1-1", + "api-ms-win-mm-mme-l1-1-0", ], [ "msvcrt",

1 0

Henri Verbeet : wined3d: Validate the rectangle in wined3d_device_clear_rendertarget_view().
by Alexandre Julliard 29 Mar '17

29 Mar '17

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

Hugh McMaster : regedit: Remove data types that cannot be imported and clean-up data_types array.
by Alexandre Julliard 29 Mar '17

29 Mar '17

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

Hugh McMaster : regedit: Do not use REG_NONE as the default data type on import error.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 6d89696121f738edba59246c02c40b86aa405c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d89696121f738edba59246c0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:43 2017 +0000 regedit: Do not use REG_NONE as the default data type on import error. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index a54a96f..751a3a5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -193,6 +193,8 @@ static BYTE* convertHexCSVToHex(WCHAR *str, DWORD *size) return data; } +#define REG_UNKNOWN_TYPE 99 + /****************************************************************************** * This function returns the HKEY associated with the data type encoded in the * value. It modifies the input parameter (key value) in order to skip this @@ -242,8 +244,8 @@ static DWORD getDataType(LPWSTR *lpValue, DWORD* parse_type) } return type; } - *parse_type=REG_NONE; - return REG_NONE; + *parse_type = REG_UNKNOWN_TYPE; + return REG_UNKNOWN_TYPE; } /****************************************************************************** @@ -343,6 +345,7 @@ static const WCHAR type_dword[] = {'R','E','G','_','D','W','O','R','D',0}; static const WCHAR type_dword_le[] = {'R','E','G','_','D','W','O','R','D','_','L','I','T','T','L','E','_','E','N','D','I','A','N',0}; static const WCHAR type_dword_be[] = {'R','E','G','_','D','W','O','R','D','_','B','I','G','_','E','N','D','I','A','N',0}; static const WCHAR type_multi_sz[] = {'R','E','G','_','M','U','L','T','I','_','S','Z',0}; +static const WCHAR unknown_type[] = {'U','n','k','n','o','w','n',' ','T','y','p','e',0}; static const struct { @@ -359,6 +362,7 @@ type_rels[] = {REG_DWORD_LITTLE_ENDIAN, type_dword_le}, {REG_DWORD_BIG_ENDIAN, type_dword_be}, {REG_MULTI_SZ, type_multi_sz}, + {REG_UNKNOWN_TYPE, unknown_type} }; static const WCHAR *reg_type_to_wchar(DWORD type)

1 0

Hugh McMaster : regedit: Do not select/ highlight a listview item on refresh.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 5aaa77c9bb70e2669e1f1b8282bec7c62b16326e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aaa77c9bb70e2669e1f1b828… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 29 05:25:56 2017 +0000 regedit: Do not select/highlight a listview item on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index b9366e5..fc234d4 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -138,7 +138,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; if (bHighlight) { - item.stateMask = item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = item.state = LVIS_FOCUSED; } switch (dwValType) {

1 0

Zebediah Figura : user32/tests: Add tests for EnableWindow().
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 3d133beccec552291303ac6d052dcc5289bd6316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d133beccec552291303ac6d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 27 14:01:39 2017 -0500 user32/tests: Add tests for EnableWindow(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 915012c..f0ea182 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6554,6 +6554,58 @@ static void test_ShowWindow(void) ok(!IsWindow(hwnd), "window should not exist\n"); } +static DWORD CALLBACK enablewindow_thread(LPVOID arg) +{ + HWND hwnd = arg; + EnableWindow(hwnd, FALSE); + return 0; +} + +static void test_EnableWindow(void) +{ + HWND hwnd; + HANDLE hthread; + DWORD tid; + MSG msg; + + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, NULL); + assert(hwnd); + ok(IsWindowEnabled(hwnd), "window should be enabled\n"); + SetFocus(hwnd); + SetCapture(hwnd); + + EnableWindow(hwnd, FALSE); + check_wnd_state(hwnd, hwnd, 0, 0); + ok(!IsWindowEnabled(hwnd), "window should not be enabled\n"); + + SetFocus(hwnd); + SetCapture(hwnd); + check_wnd_state(hwnd, hwnd, 0, hwnd); + + EnableWindow(hwnd, TRUE); + SetFocus(hwnd); + check_wnd_state(hwnd, hwnd, hwnd, hwnd); + ok(IsWindowEnabled(hwnd), "window should be enabled\n"); + + /* test disabling from thread */ + hthread = CreateThread(NULL, 0, enablewindow_thread, hwnd, 0, &tid); + + while (MsgWaitForMultipleObjects(1, &hthread, FALSE, INFINITE, QS_SENDMESSAGE) != WAIT_OBJECT_0) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE)) + DispatchMessageA(&msg); + } + + ok(!IsWindowEnabled(hwnd), "window should not be enabled\n"); + todo_wine + check_active_state(hwnd, hwnd, hwnd); + ok(0 == GetCapture(), "GetCapture() = %p\n", GetCapture()); + + CloseHandle(hthread); + DestroyWindow(hwnd); +} + static DWORD CALLBACK gettext_msg_thread( LPVOID arg ) { HWND hwnd = arg; @@ -9778,6 +9830,7 @@ START_TEST(win) test_SetWindowLong(); test_set_window_style(); test_ShowWindow(); + test_EnableWindow(); test_gettext(); test_GetUpdateRect(); test_Expose();

1 0

Zebediah Figura : user32: Don't call ReleaseCapture() in EnableWindow().
by Alexandre Julliard 29 Mar '17

29 Mar '17

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

Zebediah Figura : user32: Always send WM_CANCELMODE when disabling a window.
by Alexandre Julliard 29 Mar '17

29 Mar '17

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

Andrey Gusev : kernelbase: Add QuirkIsEnabled3 stub.
by Alexandre Julliard 29 Mar '17

29 Mar '17

Module: wine Branch: master Commit: 7584e082bf6669923d9c16ca6d617b767179d410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7584e082bf6669923d9c16ca6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 28 17:16:01 2017 +0300 kernelbase: Add QuirkIsEnabled3 stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-quirks-l1-1-0.spec | 2 +- dlls/kernelbase/Makefile.in | 3 +++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 30 ++++++++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec index 761120f..e8f77c7 100644 --- a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec +++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec @@ -2,7 +2,7 @@ @ stub QuirkGetData2 @ stub QuirkIsEnabled @ stub QuirkIsEnabled2 -@ stub QuirkIsEnabled3 +@ stdcall QuirkIsEnabled3(ptr ptr) kernelbase.QuirkIsEnabled3 @ stub QuirkIsEnabledForPackage @ stub QuirkIsEnabledForPackage2 @ stub QuirkIsEnabledForProcess diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index b9caed0..74df98c 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1 +1,4 @@ MODULE = kernelbase.dll + +C_SRCS = \ + main.c diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ff0e75f..e8cf502 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1225,7 +1225,7 @@ # @ stub QuirkGetData2 # @ stub QuirkIsEnabled # @ stub QuirkIsEnabled2 -# @ stub QuirkIsEnabled3 +@ stdcall QuirkIsEnabled3(ptr ptr) # @ stub QuirkIsEnabledForPackage # @ stub QuirkIsEnabledForPackage2 # @ stub QuirkIsEnabledForPackage3 diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c new file mode 100644 index 0000000..30cba3f --- /dev/null +++ b/dlls/kernelbase/main.c @@ -0,0 +1,30 @@ +/* + * Copyright 2017 Andrey Gusev + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(kernelbase); + +/*********************************************************************** + * QuirkIsEnabled3 (KERNELBASE.@) + */ +BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2) +{ + FIXME("(%p, %p) stub!\n", unk1, unk2); + return FALSE; +}

1 0