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

Zebediah Figura : msdmo: Link to dmoguids.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: cf9c6fc0e3bd3ee3f271ad7e1079ffe51851f697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf9c6fc0e3bd3ee3f271ad7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 7 21:17:43 2018 -0500 msdmo: Link to dmoguids. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/Makefile.in | 2 +- dlls/msdmo/dmoreg.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in index f359eef..566461e 100644 --- a/dlls/msdmo/Makefile.in +++ b/dlls/msdmo/Makefile.in @@ -1,6 +1,6 @@ MODULE = msdmo.dll IMPORTLIB = msdmo -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = dmoguids uuid ole32 user32 advapi32 C_SRCS = \ dmoreg.c \ diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 67ba498..ead8864 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -29,7 +29,6 @@ #include "objbase.h" #include "wine/unicode.h" #include "wine/debug.h" -#include "initguid.h" #include "dmo.h" WINE_DEFAULT_DEBUG_CHANNEL(msdmo);

1 0

Zebediah Figura : dmoguids: Add library.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 1fc00f17696ca361447ed71979c12f75279abcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc00f17696ca361447ed719… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 7 21:17:42 2018 -0500 dmoguids: Add library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/dmoguids/Makefile.in | 4 ++++ dlls/dmoguids/dmoguids.c | 27 +++++++++++++++++++++++++++ 4 files changed, 34 insertions(+) diff --git a/configure b/configure index a2adb44..50badb7 100755 --- a/configure +++ b/configure @@ -1213,6 +1213,7 @@ enable_dmband enable_dmcompos enable_dmime enable_dmloader +enable_dmoguids enable_dmscript enable_dmstyle enable_dmsynth @@ -18573,6 +18574,7 @@ wine_fn_config_makefile dlls/dmime enable_dmime wine_fn_config_makefile dlls/dmime/tests enable_tests wine_fn_config_makefile dlls/dmloader enable_dmloader wine_fn_config_makefile dlls/dmloader/tests enable_tests +wine_fn_config_makefile dlls/dmoguids enable_dmoguids wine_fn_config_makefile dlls/dmscript enable_dmscript wine_fn_config_makefile dlls/dmscript/tests enable_tests wine_fn_config_makefile dlls/dmstyle enable_dmstyle diff --git a/configure.ac b/configure.ac index 6064081..c5e222d 100644 --- a/configure.ac +++ b/configure.ac @@ -3194,6 +3194,7 @@ WINE_CONFIG_MAKEFILE(dlls/dmime) WINE_CONFIG_MAKEFILE(dlls/dmime/tests) WINE_CONFIG_MAKEFILE(dlls/dmloader) WINE_CONFIG_MAKEFILE(dlls/dmloader/tests) +WINE_CONFIG_MAKEFILE(dlls/dmoguids) WINE_CONFIG_MAKEFILE(dlls/dmscript) WINE_CONFIG_MAKEFILE(dlls/dmscript/tests) WINE_CONFIG_MAKEFILE(dlls/dmstyle) diff --git a/dlls/dmoguids/Makefile.in b/dlls/dmoguids/Makefile.in new file mode 100644 index 0000000..db38e57 --- /dev/null +++ b/dlls/dmoguids/Makefile.in @@ -0,0 +1,4 @@ +MODULE = libdmoguids.a + +C_SRCS = \ + dmoguids.c diff --git a/dlls/dmoguids/dmoguids.c b/dlls/dmoguids/dmoguids.c new file mode 100644 index 0000000..b764c1f --- /dev/null +++ b/dlls/dmoguids/dmoguids.c @@ -0,0 +1,27 @@ +/* + * GUID definitions + * + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +/* Don't define those GUIDs here */ +#include "strmif.h" + +#include "initguid.h" + +#include "mediaobj.h" +#include "dmoreg.h"

1 0

Hugh McMaster : reg: Stop exporting REG_SZ data at the first NUL character.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 0aead094a5f7b772439ea5f125308155997864c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aead094a5f7b772439ea5f1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 7 23:50:45 2018 +0000 reg: Stop exporting REG_SZ data at the first NUL character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 11 ++++++----- programs/reg/tests/reg.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 622e7ca..8b08da1 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -39,7 +39,10 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) for (i = 0, escape_count = 0; i < str_len; i++) { WCHAR c = str[i]; - if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + + if (!c) break; + + if (c == '\r' || c == '\n' || c == '\\' || c == '"') escape_count++; } @@ -49,6 +52,8 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) { WCHAR c = str[i]; + if (!c) break; + switch (c) { case '\r': @@ -67,10 +72,6 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) buf[pos++] = '\\'; buf[pos] = '"'; break; - case '\0': - buf[pos++] = '\\'; - buf[pos] = '0'; - break; default: buf[pos] = c; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index aba71b7..ea4e128 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4679,7 +4679,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Nikolay Sivov : comctl32/trackbar: Fix reseting to default page size.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 38e715387da75458874a22efb34419cc469f9624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38e715387da75458874a22ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 8 01:30:52 2018 +0300 comctl32/trackbar: Fix reseting to default page size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 11 +++++++++++ dlls/comctl32/trackbar.c | 31 +++++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7d66df7..7f17e9e4b 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -613,6 +613,17 @@ static void test_page_size(void) r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); ok(r == 10, "Unexpected page size %d.\n", r); + r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, -1); + ok(r == 10, "Unexpected page size %d.\n", r); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 7, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 100); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 19, "Unexpected page size %d.\n", r); + DestroyWindow(hWndTrackbar); hWndTrackbar = create_trackbar(defaultstyle, hWndParent); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 762d2e1..d774823 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1196,18 +1196,30 @@ TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize) return lTemp; } +static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->flags & TB_USER_PAGE) + return; + + infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; + if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; +} static inline LONG TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) { LONG lTemp = infoPtr->lPageSize; - if (lPageSize != -1) - infoPtr->lPageSize = lPageSize; + if (lPageSize == -1) + { + infoPtr->flags &= ~TB_USER_PAGE; + TRACKBAR_UpdatePageSize(infoPtr); + } else - infoPtr->lPageSize = TB_DEFAULTPAGESIZE; - - infoPtr->flags |= TB_USER_PAGE; + { + infoPtr->flags |= TB_USER_PAGE; + infoPtr->lPageSize = lPageSize; + } return lTemp; } @@ -1234,15 +1246,6 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) return 0; } -static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) -{ - if (infoPtr->flags & TB_USER_PAGE) - return; - - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; -} - static inline LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) {

1 0

Hugh McMaster : regedit: Stop exporting REG_SZ data at the first NUL character.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: wine Branch: master Commit: 62027322b05d3e0d72b2905a171e21becaf355d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62027322b05d3e0d72b2905a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 7 23:50:42 2018 +0000 regedit: Stop exporting REG_SZ data at the first NUL character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 11 ++++++----- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 84a16f9..65087c9 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1171,7 +1171,10 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len for (i = 0, escape_count = 0; i < str_len; i++) { WCHAR c = str[i]; - if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + + if (!c) break; + + if (c == '\r' || c == '\n' || c == '\\' || c == '"') escape_count++; } @@ -1181,6 +1184,8 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len { WCHAR c = str[i]; + if (!c) break; + switch (c) { case '\r': @@ -1199,10 +1204,6 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len buf[pos++] = '\\'; buf[pos] = '"'; break; - case '\0': - buf[pos++] = '\\'; - buf[pos] = '0'; - break; default: buf[pos] = c; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 845ab00..66b9562 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3688,7 +3688,7 @@ static void test_export(void) RegCloseKey(hkey); run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); - ok(compare_export("file.reg", embedded_null_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Francois Gouget : testbot: Standardize logging in the job scheduler.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: tools Branch: master Commit: 82c686c9b37270aae4d384896629dc198b2796ba URL: https://source.winehq.org/git/tools.git/?a=commit;h=82c686c9b37270aae4d3848… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 8 13:04:16 2018 +0200 testbot: Standardize logging in the job scheduler. Generic WineTestBot modules such as Jobs are supposed to let higher level layers handle the logging or errors. But since the job scheduler is part of the Engine it can log errors itself. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index fbe1604..4eef3c9 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -32,6 +32,7 @@ our @EXPORT = qw(ScheduleJobs CheckJobs); use WineTestBot::Config; use WineTestBot::Jobs; +use WineTestBot::Log; use WineTestBot::RecordGroups; use WineTestBot::VMs; @@ -306,8 +307,7 @@ sub _CheckAndClassifyVMs() } else { - require WineTestBot::Log; - WineTestBot::Log::LogMsg("Unexpected $VMKey status ". $VM->Status ."\n"); + LogMsg "Unexpected $VMKey status ". $VM->Status ."\n"; $FoundVMErrors = 1; # Don't interfere with this VM $Sched->{busyvms}->{$VMKey} = 1; @@ -352,8 +352,7 @@ sub _CheckAndClassifyVMs() } elsif ($VM->Status ne "off") { - require WineTestBot::Log; - WineTestBot::Log::LogMsg("Unexpected $VMKey status ". $VM->Status ."\n"); + LogMsg "Unexpected $VMKey status ". $VM->Status ."\n"; $FoundVMErrors = 1; # Don't interfere with this VM $Sched->{busyvms}->{$VMKey} = 1; @@ -738,8 +737,7 @@ sub _DumpHostCounters($$) my $HostKey = $VM->GetHost(); my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || $HostKey; - require WineTestBot::Log; - WineTestBot::Log::LogMsg("$PrettyHost:$Counters\n") if ($Counters); + LogMsg "$PrettyHost:$Counters\n" if ($Counters); $Host->{dumpedcounters} = 1; } @@ -778,8 +776,7 @@ sub _DumpHostVMs($$$$) } my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || $HostKey; - require WineTestBot::Log; - WineTestBot::Log::LogMsg("$PrettyHost: @VMInfo\n"); + LogMsg "$PrettyHost: @VMInfo\n"; $Host->{dumpedvms} = 1; }

1 0

Francois Gouget : testbot: Move the job scheduler to WineTestBot::Engine:: Scheduler.
by Alexandre Julliard May 8, 2018

May 8, 2018

Module: tools Branch: master Commit: 91152c30e149c9cc43f0dba1525219418003f2b6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=91152c30e149c9cc43f0dba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 8 13:04:03 2018 +0200 testbot: Move the job scheduler to WineTestBot::Engine::Scheduler. The job scheduler is specific to the TestBot engine so ScheduleJobs() should not be in the Jobs package which is meant to be used by any process that deals with jobs. The scheduler could even be part of Engine.pl but since it's pretty self-contained it makes more sense to put it in its own package, hence WineTestBot::Engine:Scheduler. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 1 + testbot/lib/WineTestBot/Engine/Scheduler.pm | 978 ++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Jobs.pm | 943 +-------------------------- 3 files changed, 980 insertions(+), 942 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=91152c30e149c9cc43f…

1 0

Nikolay Sivov : comctl32/trackbar: Don' t update page size if it was explicitly set.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 6dc3c6ba879b79fac7e4c9c0693539a614229978 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dc3c6ba879b79fac7e4c9c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 5 19:18:58 2018 +0300 comctl32/trackbar: Don't update page size if it was explicitly set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7b601b8..7d66df7 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -577,6 +577,47 @@ static void test_page_size(void) hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 20, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGE, 0, MAKELPARAM(0, 65)); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 13, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, 0, 10); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 11, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 50); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 8, "Unexpected page size %d.\n", r); + + r = SendMessageA(hWndTrackbar, TBM_SETPAGESIZE, 0, 10); + ok(r == 8, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGE, 0, MAKELPARAM(0, 30)); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, 0, 5); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, 0, 40); + + r = SendMessageA(hWndTrackbar, TBM_GETPAGESIZE, 0, 0); + ok(r == 10, "Unexpected page size %d.\n", r); + + DestroyWindow(hWndTrackbar); + + hWndTrackbar = create_trackbar(defaultstyle, hWndParent); + ok(hWndTrackbar != NULL, "Failed to create trackbar window.\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCE); /* test TBM_SETPAGESIZE */ diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 92c8d9e..28ceb69 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -59,7 +59,7 @@ typedef struct HWND hwndBuddyLA; HWND hwndBuddyRB; INT fLocation; - INT flags; + DWORD flags; BOOL bUnicode; BOOL bFocussed; RECT rcChannel; @@ -78,15 +78,18 @@ typedef struct /* Used by TRACKBAR_Refresh to find out which parts of the control need to be recalculated */ -#define TB_THUMBPOSCHANGED 1 -#define TB_THUMBSIZECHANGED 2 -#define TB_THUMBCHANGED (TB_THUMBPOSCHANGED | TB_THUMBSIZECHANGED) -#define TB_SELECTIONCHANGED 4 -#define TB_DRAG_MODE 8 /* we're dragging the slider */ -#define TB_AUTO_PAGE_LEFT 16 -#define TB_AUTO_PAGE_RIGHT 32 -#define TB_AUTO_PAGE (TB_AUTO_PAGE_LEFT | TB_AUTO_PAGE_RIGHT) -#define TB_THUMB_HOT 64 /* mouse hovers above thumb */ +#define TB_THUMBPOSCHANGED 0x00000001 +#define TB_THUMBSIZECHANGED 0x00000002 +#define TB_THUMBCHANGED (TB_THUMBPOSCHANGED | TB_THUMBSIZECHANGED) +#define TB_SELECTIONCHANGED 0x00000004 +#define TB_DRAG_MODE 0x00000008 /* we're dragging the slider */ +#define TB_AUTO_PAGE_LEFT 0x00000010 +#define TB_AUTO_PAGE_RIGHT 0x00000020 +#define TB_AUTO_PAGE (TB_AUTO_PAGE_LEFT | TB_AUTO_PAGE_RIGHT) +#define TB_THUMB_HOT 0x00000040 /* mouse hovers above thumb */ + +/* Page was set with TBM_SETPAGESIZE */ +#define TB_USER_PAGE 0x00000080 /* helper defines for TRACKBAR_DrawTic */ #define TIC_EDGE 0x20 @@ -1204,6 +1207,8 @@ TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize) else infoPtr->lPageSize = TB_DEFAULTPAGESIZE; + infoPtr->flags |= TB_USER_PAGE; + return lTemp; } @@ -1229,6 +1234,14 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) return 0; } +static void TRACKBAR_UpdatePageSize(TRACKBAR_INFO *infoPtr) +{ + if (infoPtr->flags & TB_USER_PAGE) + return; + + infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; + if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; +} static inline LRESULT TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) @@ -1246,8 +1259,7 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed) { if (infoPtr->dwStyle & TBS_AUTOTICKS) @@ -1273,8 +1285,7 @@ TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) infoPtr->flags |= TB_THUMBPOSCHANGED; } - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) TRACKBAR_RecalculateTics (infoPtr); @@ -1296,8 +1307,7 @@ TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMin) infoPtr->flags |= TB_THUMBPOSCHANGED; } - infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; - if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; + TRACKBAR_UpdatePageSize(infoPtr); if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) TRACKBAR_RecalculateTics (infoPtr);

1 0

Zebediah Figura : rpcrt4: RpcServerUnregisterIf() with NULL ifspec shouldn 't unregister auto-listen interfaces.
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 950b349885c99ed51a40dd36282fc3cdb5c16e80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=950b349885c99ed51a40dd36… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat May 5 14:07:48 2018 -0500 rpcrt4: RpcServerUnregisterIf() with NULL ifspec shouldn't unregister auto-listen interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 3 ++- dlls/rpcrt4/tests/server.c | 11 +++++++++++ dlls/rpcrt4/tests/server.idl | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index d1b5d64..91de3b9 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1220,7 +1220,8 @@ RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cif, &server_interfaces, RpcServerInterface, entry) { - if ((!IfSpec || !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER))) && + if (((!IfSpec && !(cif->Flags & RPC_IF_AUTOLISTEN)) || + (IfSpec && !memcmp(&If->InterfaceId, &cif->If->InterfaceId, sizeof(RPC_SYNTAX_IDENTIFIER)))) && UuidEqual(MgrTypeUuid, &cif->MgrTypeUuid, &status)) { list_remove(&cif->entry); TRACE("unregistering cif %p\n", cif); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5a61181..dfad1ed 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -844,6 +844,14 @@ void __cdecl s_stop(void) } } +void __cdecl s_stop_autolisten(void) +{ + RPC_STATUS status; + status = RpcServerUnregisterIf(NULL, NULL, FALSE); +todo_wine + ok(status == RPC_S_UNKNOWN_MGR_TYPE, "got %u\n", status); +} + void __cdecl s_ip_test(ipu_t *a) { STATSTG st; @@ -1690,6 +1698,9 @@ client(const char *test) todo_wine test_is_server_listening(IServer_IfHandle, RPC_S_NOT_LISTENING); + stop_autolisten(); + ok(int_return() == INT_CODE, "RPC int_return\n"); + ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); ok(RPC_S_OK == RpcBindingFree(&IServer_IfHandle), "RpcBindingFree\n"); } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 75d78f7..6aa7382 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -385,6 +385,7 @@ cpp_quote("#endif") void authinfo_test(unsigned int protseq, int secure); void stop(void); + void stop_autolisten(void); typedef union ipu switch(int t) {

1 0

Guillaume Gill : shell32: Fake success in propertystore_[SetValue|Commit].
by Alexandre Julliard May 7, 2018

May 7, 2018

Module: wine Branch: master Commit: 794d30dca65843baee7e0cd5f054e1b1fbe96a95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=794d30dca65843baee7e0cd5… Author: Guillaume Gill <gillg02(a)petitchinois.net> Date: Fri May 4 14:53:45 2018 +0200 shell32: Fake success in propertystore_[SetValue|Commit]. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 6dca9ac..07c83d1 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2664,14 +2664,14 @@ static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYK { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p)->(%p %p): stub\n", This, key, value); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); FIXME("(%p): stub\n", This); - return E_NOTIMPL; + return S_OK; } static const IPropertyStoreVtbl propertystorevtbl = {

1 0