August 2018 - Wine-Commits - list.winehq.org

Zebediah Figura : ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U().
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 8c7e141bb187e0a3477977dfa665ef87739908de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7e141bb187e0a3477977df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:06 2018 -0500 ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 139 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 123 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c7e141bb187e0a34779…

1 0

Zebediah Figura : ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U().
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: ee5c46a55c6f982fe60a95dff4fe9fbcee1f0028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5c46a55c6f982fe60a95df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:04 2018 -0500 ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 8 ++++---- dlls/ntdll/tests/path.c | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..8fe61da 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -244,10 +244,10 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) if (IS_SEPARATOR(path[0])) { if (!IS_SEPARATOR(path[1])) return ABSOLUTE_PATH; /* "/foo" */ - if (path[2] != '.') return UNC_PATH; /* "//foo" */ - if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" */ - if (path[3]) return UNC_PATH; /* "//.foo" */ - return UNC_DOT_PATH; /* "//." */ + if (path[2] != '.' && path[2] != '?') return UNC_PATH; /* "//foo" */ + if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" or "//?/foo" */ + if (path[3]) return UNC_PATH; /* "//.foo" or "//?foo" */ + return UNC_DOT_PATH; /* "//." or "//?" */ } else { diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9369e1c..94b76c1 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -68,6 +68,13 @@ static void test_RtlDetermineDosPathNameType_U(void) { "//.foo", 1 }, { "\\\\.", 7 }, { "//.", 7 }, + { "\\\\?\\foo", 6 }, + { "//?/foo", 6 }, + { "/\\?/foo", 6 }, + { "\\\\?foo", 1 }, + { "//?foo", 1 }, + { "\\\\?", 7 }, + { "//?", 7 }, { NULL, 0 } };

1 0

Francois Gouget : dmusic: Make midi_port_create() static.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 737440d24bc0582efc048c8218e563a0b4a4b0bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=737440d24bc0582efc048c82… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 24 00:17:58 2018 +0200 dmusic: Make midi_port_create() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 1fa9469..91913a7 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1174,8 +1174,8 @@ static const IDirectMusicThruVtbl midi_thru_vtbl = { midi_IDirectMusicThru_ThruChannel, }; -HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, - IDirectMusicPort **port) +static HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) { struct midi_port *obj; HRESULT hr;

1 0

Alistair Leslie-Hughes : include: Add IWbemUnsecuredApartment interfaces.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 8d834ca945fa7f1b82c562cd2e14a2e9fd7acd43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d834ca945fa7f1b82c562cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 24 04:10:59 2018 +0000 include: Add IWbemUnsecuredApartment interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wbemcli.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a0f4e2..54cdb88 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -660,3 +660,46 @@ interface IWbemQualifierSet : IUnknown HRESULT EndEnumeration(); } + + +typedef [v1_enum] enum tag_WBEM_UNSECAPP_FLAG_TYPE +{ + WBEM_FLAG_UNSECAPP_DEFAULT_CHECK_ACCESS, + WBEM_FLAG_UNSECAPP_CHECK_ACCESS, + WBEM_FLAG_UNSECAPP_DONT_CHECK_ACCESS +} WBEM_UNSECAPP_FLAG_TYPE; + +[ + object, + restricted, + uuid(1cfaba8c-1523-11d1-ad79-00c04fd8fdff) +] +interface IUnsecuredApartment : IUnknown +{ + HRESULT CreateObjectStub( + [in] IUnknown *object, + [out] IUnknown **stub); +}; + +[ + object, + restricted, + uuid(31739d04-3471-4cf4-9a7c-57a44ae71956) +] +interface IWbemUnsecuredApartment : IUnsecuredApartment +{ + HRESULT CreateSinkStub( + [in] IWbemObjectSink *sink, + [in] DWORD flags, + [in,unique] const WCHAR *reserved, + [out] IWbemObjectSink **stub); +}; + +[ + uuid(49bd2028-1523-11d1-ad79-00c04fd8fdff) +] +coclass UnsecuredApartment +{ + interface IUnsecuredApartment; + interface IWbemUnsecuredApartment; +};

1 0

Zebediah Figura : quartz/tests: Add some tests for interfaces delegated by the filter graph.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 0649ba662980187660d18d4d0b0f442379ca092b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0649ba662980187660d18d4d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 12:43:13 2018 -0500 quartz/tests: Add some tests for interfaces delegated by the filter graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 115 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 85079d9..de7b904 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2287,6 +2287,119 @@ static void test_aggregate_filter_graph(void) IUnknown_Release(pgraph); } +/* Test how methods from "control" interfaces (IBasicAudio, IBasicVideo, + * IVideoWindow) are delegated to filters exposing those interfaces. */ +static void test_control_delegation(void) +{ + IFilterGraph2 *graph = create_graph(); + IBasicAudio *audio, *filter_audio; + IBaseFilter *renderer; + IVideoWindow *window; + IBasicVideo *video; + HRESULT hr; + LONG val; + + /* IBasicAudio */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicAudio, (void **)&audio); + ok(hr == S_OK, "got %#x\n", hr); + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + hr = CoCreateInstance(&CLSID_DSoundRender, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + if (hr != VFW_E_NO_AUDIO_HARDWARE) + { + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == S_OK, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got %d\n", val); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == S_OK || hr == VFW_E_MONO_AUDIO_HW, "got %#x\n", hr); + if (hr == S_OK) + ok(val == 10, "got balance %d\n", val); + + hr = IBaseFilter_QueryInterface(renderer, &IID_IBasicAudio, (void **)&filter_audio); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicAudio_get_Volume(filter_audio, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == -10, "got volume %d\n", val); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicAudio_Release(filter_audio); + } + +todo_wine { + hr = IBasicAudio_put_Volume(audio, -10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Volume(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_put_Balance(audio, 10); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + hr = IBasicAudio_get_Balance(audio, &val); + ok(hr == E_NOTIMPL, "got %#x\n", hr); +} + + IBasicAudio_Release(audio); + + /* IBasicVideo and IVideoWindow */ + + hr = IFilterGraph2_QueryInterface(graph, &IID_IBasicVideo, (void **)&video); + ok(hr == S_OK, "got %#x\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IVideoWindow, (void **)&window); + ok(hr == S_OK, "got %#x\n", hr); + + /* Unlike IBasicAudio, these return E_NOINTERFACE. */ + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IFilterGraph2_AddFilter(graph, renderer, NULL); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == VFW_E_NOT_CONNECTED, "got %#x\n", hr); + + hr = IFilterGraph2_RemoveFilter(graph, renderer); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IBasicVideo_get_BitRate(video, &val); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + hr = IVideoWindow_SetWindowForeground(window, OAFALSE); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); + + IBaseFilter_Release(renderer); + IBasicVideo_Release(video); + IVideoWindow_Release(window); + IFilterGraph2_Release(graph); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -2296,6 +2409,8 @@ START_TEST(filtergraph) test_graph_builder(); test_render_filter_priority(); test_aggregate_filter_graph(); + test_control_delegation(); + CoUninitialize(); test_render_with_multithread(); }

1 0

Francois Gouget : testbot/WineRunBuild: Use the new Build.pl parameters and paths.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: tools Branch: master Commit: 56b8799f7b0bae53091e9cff04a5b1aaa831a8e2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=56b8799f7b0bae53091e9cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 22:58:12 2018 +0200 testbot/WineRunBuild: Use the new Build.pl parameters and paths. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cca96b9..117b065 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -339,14 +339,14 @@ if ($Step->FileType ne "patch") # Figure out what to build # -my (%Bitnesses, %TestExes); +my (%Builds, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe([0-9]+)$/) + $TestStep->FileType =~ /^exe/) { - $Bitnesses{$1} = 1; - $TestExes{$TestStep->FileName} = 1; + $Builds{$TestStep->FileType} = 1; + $TestExes{$TestStep->FileName} = $TestStep->FileType; } } @@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -455,9 +455,10 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) my $Local = "$TestInfo->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); - my $Remote = "build-mingw". ($Bits || "32") ."/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; Debug(Elapsed($Start), " Retrieving '$Local'\n"); - if ($TA->GetFile($Remote, "$StepDir/$Local")) + my $BuildDir = "wine-$TestExes{$Local}"; + if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; }

1 0

Francois Gouget : testbot: Let LogUtils detect and return the list of errors.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: tools Branch: master Commit: 2cc1d985807e1b2a748cff9510b0db6cf743be05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2cc1d985807e1b2a748cff9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 22:58:21 2018 +0200 testbot: Let LogUtils detect and return the list of errors. LogUtils now exports GetLogErrors() which analyzes the specified log and associated extra errors file and returns per-module lists of errors. For test reports modules correspond to dlls or programs and for other types of log there is a single module called "". Errors from the extra errors file go to an extra module. JobDetails now uses that to offload most of the work of identifying errors. It now can also show errors from more than one report / log when in summary mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 140 ++++++++++++++++++++- testbot/web/JobDetails.pl | 237 +++++++++++++++++------------------- 2 files changed, 247 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=2cc1d985807e1b2a748…

1 0

Józef Kucia : wined3d: Get rid of unused gl_info parameters.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 4df05c37db3885b124e4eeeea30efd1b9c25ba22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df05c37db3885b124e4eeee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 14:34:02 2018 +0200 wined3d: Get rid of unused gl_info parameters. 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/directx.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index de1f9d9..3e898c0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1227,8 +1227,8 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U return WINED3D_OK; } -static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) +static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) { /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) @@ -1247,8 +1247,8 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in return TRUE; } -static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_pixel_format *cfg, + const struct wined3d_format *format) { BOOL lockable = FALSE; @@ -1315,8 +1315,8 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, cfg_count = adapter->cfg_count; for (i = 0; i < cfg_count; ++i) { - if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) + if (wined3d_check_pixel_format_color(&cfgs[i], rt_format) + && wined3d_check_pixel_format_depth(&cfgs[i], ds_format)) { TRACE("Formats match.\n"); return WINED3D_OK; @@ -1381,7 +1381,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, enum wined3d_gl_resource_type gl_type) { /* Only allow depth/stencil formats */ - if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; + if (!(ds_format->depth_size || ds_format->stencil_size)) + return FALSE; /* Blacklist formats not supported on Windows */ switch (ds_format->id) @@ -1409,8 +1410,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; - if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) + if (wined3d_check_pixel_format_color(cfg, display_format) + && wined3d_check_pixel_format_depth(cfg, ds_format)) return TRUE; } } @@ -1449,7 +1450,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, for (i = 0; i < adapter->cfg_count; ++i) { if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], check_format)) + && wined3d_check_pixel_format_color(&cfgs[i], check_format)) { TRACE("Pixel format %d is compatible with format %s.\n", cfgs[i].iPixelFormat, debug_d3dformat(check_format->id));

1 0

Gabriel Ivăncescu : user32/edit: Move common calls outside the blocks.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 3b9e22fafd051d1ab5e39beaa7800838422322b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b9e22fafd051d1ab5e39bea… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Aug 23 13:55:04 2018 +0300 user32/edit: Move common calls outside the blocks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 96ecbec..48c65ea 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3474,22 +3474,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { - if (shift) { + EDIT_EM_SetSel(es, ~0u, 0, FALSE); + if (shift) /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); - EDIT_WM_Clear(es); - } else if (control) { + else if (control) /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); - EDIT_WM_Clear(es); - } else { + else /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); - EDIT_WM_Clear(es); - } + EDIT_WM_Clear(es); } } break;

1 0

Francois Gouget : msvfw32/tests: Make gdf_driver_proc() static.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 6480387cc6ee699c1bf9ca44e193127e9507e128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6480387cc6ee699c1bf9ca44… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 23 16:42:35 2018 +0200 msvfw32/tests: Make gdf_driver_proc() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 406a35b..7555015 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -331,7 +331,7 @@ static const RGBQUAD color_yellow = {0x00, 0xff, 0xff, 0x00}; static BITMAPINFOHEADER gdf_in, *gdf_out; -LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, +static LRESULT CALLBACK gdf_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { LRESULT ret = 0;

1 0