June 2018 - Wine-Devel - list.winehq.org

Re: [PATCH 3/5] comctl32/taskdialog: Add support for loading standard icons.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

June 14, 2018

Re: [PATCH 2/5] comctl32/taskdialog: Add support for main icon.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

June 14, 2018

Re: [PATCH 1/5] comctl32/taskdialog: Add support for TDM_ENABLE_BUTTON.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

June 14, 2018

Re: [PATCH 5/5] comctl32/taskdialog: Add support for progress bar.

by Nikolay Sivov

On 06/14/2018 11:02 AM, Zhiyi Zhang wrote: > Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> > --- > dlls/comctl32/taskdialog.c | 45 ++++++++++++++++++++++ > dlls/comctl32/tests/taskdialog.c | 65 ++++++++++++++++++++++++++++++++ > 2 files changed, 110 insertions(+) > > diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c > index 91c8af019b..3c198df6d1 100644 > --- a/dlls/comctl32/taskdialog.c > +++ b/dlls/comctl32/taskdialog.c > @@ -57,6 +57,7 @@ struct taskdialog_info > HWND main_icon; > HWND main_instruction; > HWND content; > + HWND progress_bar; > HWND *buttons; > INT button_count; > HWND default_button; > @@ -351,6 +352,17 @@ static void taskdialog_add_content(struct taskdialog_info *dialog_info) > taskdialog_hyperlink_enabled(dialog_info)); > } > > +static void taskdialog_add_progress_bar(struct taskdialog_info *dialog_info) > +{ > + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; > + DWORD style = PBS_SMOOTH | PBS_SMOOTHREVERSE | WS_CHILD | WS_VISIBLE; > + > + if (!(taskconfig->dwFlags & (TDF_SHOW_PROGRESS_BAR | TDF_SHOW_MARQUEE_PROGRESS_BAR))) return; > + if (taskconfig->dwFlags & TDF_SHOW_MARQUEE_PROGRESS_BAR) style |= PBS_MARQUEE; > + dialog_info->progress_bar = > + CreateWindowW(PROGRESS_CLASSW, NULL, style, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); > +} > + > static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT id, const WCHAR *text, > BOOL custom_button) > { > @@ -464,6 +476,17 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) > /* Content */ > taskdialog_label_layout(dialog_info, dialog_info->content, main_icon_right, dialog_width, &dialog_height, syslink); > > + /* Progress bar */ > + if (dialog_info->progress_bar) > + { > + x = main_icon_right + h_spacing; > + y = dialog_height + v_spacing; > + size.cx = dialog_width - x - h_spacing; > + size.cy = GetSystemMetrics(SM_CYVSCROLL); > + SetWindowPos(dialog_info->progress_bar, 0, x, y, size.cx, size.cy, SWP_NOZORDER); > + dialog_height = y + size.cy; > + } > + > dialog_height = max(dialog_height, main_icon_bottom); > > /* Common and custom buttons */ > @@ -598,6 +621,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) > taskdialog_add_main_icon(dialog_info); > taskdialog_add_main_instruction(dialog_info); > taskdialog_add_content(dialog_info); > + taskdialog_add_progress_bar(dialog_info); > taskdialog_add_buttons(dialog_info); > > /* Set default button */ > @@ -621,6 +645,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR > { > static const WCHAR taskdialog_info_propnameW[] = {'T','a','s','k','D','i','a','l','o','g','I','n','f','o',0}; > struct taskdialog_info *dialog_info; > + LRESULT result; > > TRACE("hwnd=%p msg=0x%04x wparam=%lx lparam=%lx\n", hwnd, msg, wParam, lParam); > > @@ -635,6 +660,26 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR > case TDM_ENABLE_BUTTON: > taskdialog_enable_button(dialog_info, wParam, lParam); > break; > + case TDM_SET_MARQUEE_PROGRESS_BAR: > + SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, 0); > + break; This appears to be wrong, it shouldn't just start/stop animation, but switch from marquee to regular mode and back, in our case flipping styles. > > + case TDM_SET_PROGRESS_BAR_POS: > + result = 0; > + if (!(dialog_info->taskconfig->dwFlags & TDF_SHOW_MARQUEE_PROGRESS_BAR)) > + result = SendMessageW(dialog_info->progress_bar, PBM_SETPOS, wParam, 0); > + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, result); > + break; Did you verify that Progress control handles this correctly, maybe flags check is not necessary? > + case TDM_SET_PROGRESS_BAR_MARQUEE: > + SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, lParam); > + break; > case WM_INITDIALOG: > dialog_info = (struct taskdialog_info *)lParam; > > diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c > index cca700cd18..10cd3da794 100644 > --- a/dlls/comctl32/tests/taskdialog.c > +++ b/dlls/comctl32/tests/taskdialog.c > @@ -373,6 +373,70 @@ static void test_timer(void) > pTaskDialogIndirect(&info, NULL, NULL, NULL); > } > > +static HRESULT CALLBACK taskdialog_callback_proc_progress_bar(HWND hwnd, UINT notification, WPARAM wParam, > + LPARAM lParam, LONG_PTR ref_data) > +{ > + unsigned long ret; > + DWORD *flags = (DWORD *)ref_data; You can pass flags by value.

June 14, 2018

Re: [PATCH 2/2] dsound/tests: Use the available ARRAY_SIZE() macro

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Jun 13, 2018 at 08:30:24PM +0200, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/dsound/tests/ds3d.c | 2 +- > dlls/dsound/tests/dsound.c | 15 ++++++--------- > 2 files changed, 7 insertions(+), 10 deletions(-) > > diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c > index d4356c2b6c..1b44afff8d 100644 > --- a/dlls/dsound/tests/ds3d.c > +++ b/dlls/dsound/tests/ds3d.c > @@ -139,7 +139,7 @@ const char * getDSBCAPS(DWORD xmask) { > > buffer[0] = 0; > > - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) { > + for (i = 0; i < ARRAY_SIZE(flags); i++) { > if ((flags[i].mask & xmask) == flags[i].mask) { > if (first) > first = FALSE; > diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c > index 375abc8761..0807d43788 100644 > --- a/dlls/dsound/tests/dsound.c > +++ b/dlls/dsound/tests/dsound.c > @@ -1004,8 +1004,8 @@ static HRESULT test_frequency(LPGUID lpGuid) > if (rc!=DS_OK) > goto EXIT1; > > - for (f=0;f<sizeof(fmts)/sizeof(fmts[0]);f++) { > - for (r=0;r<sizeof(rates)/sizeof(rates[0]);r++) { > + for (f = 0; f < ARRAY_SIZE(fmts); f++) { > + for (r = 0; r < ARRAY_SIZE(rates); r++) { > init_format(&wfx,WAVE_FORMAT_PCM,11025,fmts[f].bits, > fmts[f].channels); > secondary=NULL; > @@ -1135,7 +1135,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) > int i; > > /* Prepare notify events */ > - for (i=0;i<sizeof(event)/sizeof(event[0]);i++) { > + for (i = 0; i < ARRAY_SIZE(event); i++) { > event[i] = CreateEventW(NULL, FALSE, FALSE, NULL); > } > > @@ -1174,8 +1174,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) > "IDirectSound_DuplicateSoundBuffer failed %08x\n",rc); > > trace("testing duplicated buffer without notifications.\n"); > - test_notify(duplicated,sizeof(event)/sizeof(event[0]), > - event,WAIT_TIMEOUT); > + test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_TIMEOUT); > > rc=IDirectSoundBuffer_QueryInterface(duplicated, > &IID_IDirectSoundNotify, > @@ -1192,8 +1191,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) > "failed %08x\n",rc); > > trace("testing duplicated buffer with a notification.\n"); > - test_notify(duplicated,sizeof(event)/sizeof(event[0]), > - event,WAIT_OBJECT_0+1); > + test_notify(duplicated, ARRAY_SIZE(event), event, WAIT_OBJECT_0 + 1); > > ref=IDirectSoundNotify_Release(dup_notify); > ok(ref==0,"IDirectSoundNotify_Release() has %d references, " > @@ -1204,8 +1202,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) > "should have 0\n",ref); > > trace("testing original buffer with a notification.\n"); > - test_notify(original,sizeof(event)/sizeof(event[0]), > - event,WAIT_OBJECT_0); > + test_notify(original, ARRAY_SIZE(event), event, WAIT_OBJECT_0); > > ref=IDirectSoundBuffer_Release(duplicated); > ok(ref==0,"IDirectSoundBuffer_Release() has %d references, " > -- > 2.14.4 > > >

June 14, 2018

Re: [PATCH 1/2] dsound/tests: Avoid ARRAY_SIZE-like macros

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Jun 13, 2018 at 08:30:23PM +0200, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/dsound/tests/capture.c | 2 +- > dlls/dsound/tests/dsound.c | 8 ++++---- > dlls/dsound/tests/dsound8.c | 8 ++++---- > dlls/dsound/tests/dsound_test.h | 2 -- > 4 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c > index a23d1eb6f6..dada067956 100644 > --- a/dlls/dsound/tests/capture.c > +++ b/dlls/dsound/tests/capture.c > @@ -549,7 +549,7 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, > "should have 0\n",ref); > } > > - for (f=0;f<NB_FORMATS;f++) { > + for (f = 0; f < ARRAY_SIZE(formats); f++) { > dscbo=NULL; > init_format(&wfx,WAVE_FORMAT_PCM,formats[f][0],formats[f][1], > formats[f][2]); > diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c > index 07c8908add..375abc8761 100644 > --- a/dlls/dsound/tests/dsound.c > +++ b/dlls/dsound/tests/dsound.c > @@ -571,8 +571,8 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) > "IDirectSound_CreateSoundBuffer() failed to create a primary buffer %08x\n",rc); > > if (rc==DS_OK && primary!=NULL) { > - for (f=0;f<NB_FORMATS;f++) { > - for (tag=0;tag<NB_TAGS;tag++) { > + for (f = 0; f < ARRAY_SIZE(formats); f++) { > + for (tag = 0; tag < ARRAY_SIZE(format_tags); tag++) { > /* if float, we only want to test 32-bit */ > if ((format_tags[tag] == WAVE_FORMAT_IEEE_FLOAT) && (formats[f][1] != 32)) > continue; > @@ -718,8 +718,8 @@ static HRESULT test_secondary(LPGUID lpGuid) > if (rc!=DS_OK) > goto EXIT1; > > - for (f=0;f<NB_FORMATS;f++) { > - for (tag=0;tag<NB_TAGS;tag++) { > + for (f = 0; f < ARRAY_SIZE(formats); f++) { > + for (tag = 0; tag < ARRAY_SIZE(format_tags); tag++) { > WAVEFORMATEXTENSIBLE wfxe; > > /* if float, we only want to test 32-bit */ > diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c > index a6e3f12ae3..fabd8a037e 100644 > --- a/dlls/dsound/tests/dsound8.c > +++ b/dlls/dsound/tests/dsound8.c > @@ -581,8 +581,8 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) > "%08x\n",rc); > > if (rc==DS_OK && primary!=NULL) { > - for (f=0;f<NB_FORMATS;f++) { > - for (tag=0;tag<NB_TAGS;tag++) { > + for (f = 0; f < ARRAY_SIZE(formats); f++) { > + for (tag = 0; tag < ARRAY_SIZE(format_tags); tag++) { > /* if float, we only want to test 32-bit */ > if ((format_tags[tag] == WAVE_FORMAT_IEEE_FLOAT) && (formats[f][1] != 32)) > continue; > @@ -727,8 +727,8 @@ static HRESULT test_secondary8(LPGUID lpGuid) > if (rc!=DS_OK) > goto EXIT1; > > - for (f=0;f<NB_FORMATS;f++) { > - for (tag=0;tag<NB_TAGS;tag++) { > + for (f = 0; f < ARRAY_SIZE(formats); f++) { > + for (tag = 0; tag < ARRAY_SIZE(format_tags); tag++) { > WAVEFORMATEXTENSIBLE wfxe; > > /* if float, we only want to test 32-bit */ > diff --git a/dlls/dsound/tests/dsound_test.h b/dlls/dsound/tests/dsound_test.h > index 8a8f2498d0..04f995e359 100644 > --- a/dlls/dsound/tests/dsound_test.h > +++ b/dlls/dsound/tests/dsound_test.h > @@ -71,10 +71,8 @@ static const unsigned int formats[][4]={ > {96000, 32, 1, 0 }, > {96000, 32, 2, 0 } > }; > -#define NB_FORMATS (sizeof(formats)/sizeof(*formats)) > > static const unsigned int format_tags[] = {WAVE_FORMAT_PCM, WAVE_FORMAT_IEEE_FLOAT}; > -#define NB_TAGS (sizeof(format_tags)/sizeof(*format_tags)) > > /* The time slice determines how often we will service the buffer */ > #define TIME_SLICE 31 > -- > 2.14.4 > > >

June 14, 2018

Re: [PATCH 2/2] winmm/tests: Use the available ARRAY_SIZE() macro

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Jun 13, 2018 at 08:30:27PM +0200, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/winmm/tests/joystick.c | 4 ++-- > dlls/winmm/tests/midi.c | 2 +- > dlls/winmm/tests/mmio.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c > index 5714001315..7531bd6481 100644 > --- a/dlls/winmm/tests/joystick.c > +++ b/dlls/winmm/tests/joystick.c > @@ -139,7 +139,7 @@ static void test_api(void) > /* Try some unusual period values for joySetCapture and unusual threshold values for joySetThreshold. > * Windows XP allows almost all test values, Windows 8 will return error on most test values, Windows > * 98 allows anything but cuts the values to their maximum supported values internally. */ > - for (i = 0; i < sizeof(period) / sizeof(period[0]); i++) > + for (i = 0; i < ARRAY_SIZE(period); i++) > { > ret = joySetCapture(window, joyid, period[i], FALSE); > if (win8 && ((1 << i) & period_win8_error)) > @@ -190,7 +190,7 @@ static void test_api(void) > ok(ret == JOYERR_NOERROR, "Expected %d, got %d\n", JOYERR_NOERROR, ret); > > infoex.ex.dwSize = sizeof(infoex.ex); > - for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) > + for (i = 0; i < ARRAY_SIZE(flags); i++) > { > infoex.ex.dwFlags = flags[i]; > ret = joyGetPosEx(joyid, &infoex.ex); > diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c > index fe3cc5c876..3b8bd2287d 100644 > --- a/dlls/winmm/tests/midi.c > +++ b/dlls/winmm/tests/midi.c > @@ -549,7 +549,7 @@ static void CALLBACK time_stamp_callback(HMIDIOUT hmo, UINT msg, DWORD_PTR insta > struct time_stamp_records *records = (struct time_stamp_records *)instance; > switch (msg) { > case MM_MOM_POSITIONCB: > - if (records->count < sizeof(records->time_stamp)/sizeof(records->time_stamp[0])) > + if (records->count < ARRAY_SIZE(records->time_stamp)) > records->time_stamp[records->count] = GetTickCount(); > records->count++; > break; > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index 48367ee6d9..5501c319c5 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -606,7 +606,7 @@ static LRESULT CALLBACK mmio_test_IOProc(LPSTR lpMMIOInfo, UINT uMessage, LPARAM > case MMIOM_OPEN: > if (lpInfo->fccIOProc == FOURCC_DOS) > lpInfo->fccIOProc = mmioFOURCC('F', 'A', 'I', 'L'); > - for (i = 0; i < sizeof(lpInfo->adwInfo) / sizeof(*lpInfo->adwInfo); i++) > + for (i = 0; i < ARRAY_SIZE(lpInfo->adwInfo); i++) > ok(lpInfo->adwInfo[i] == 0, "[%d] Expected 0, got %u\n", i, lpInfo->adwInfo[i]); > return MMSYSERR_NOERROR; > case MMIOM_CLOSE: > -- > 2.14.4 > > >

June 14, 2018

Re: [PATCH 1/2] winmm/tests: Avoid and ARRAY_SIZE-like macro

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Wed, Jun 13, 2018 at 08:30:26PM +0200, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > --- > dlls/winmm/tests/capture.c | 2 +- > dlls/winmm/tests/wave.c | 2 +- > dlls/winmm/tests/winmm_test.h | 1 - > 3 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c > index fd4005cdab..ba71f9ca80 100644 > --- a/dlls/winmm/tests/capture.c > +++ b/dlls/winmm/tests/capture.c > @@ -398,7 +398,7 @@ static void wave_in_test_device(UINT_PTR device) > > HeapFree(GetProcessHeap(), 0, nameA); > > - for (f=0;f<NB_WIN_FORMATS;f++) { > + for (f = 0; f < ARRAY_SIZE(win_formats); f++) { > format.wFormatTag=WAVE_FORMAT_PCM; > format.nChannels=win_formats[f][3]; > format.wBitsPerSample=win_formats[f][2]; > diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c > index 8d7dfd6b68..b402e21917 100644 > --- a/dlls/winmm/tests/wave.c > +++ b/dlls/winmm/tests/wave.c > @@ -1041,7 +1041,7 @@ static void wave_out_test_device(UINT_PTR device) > CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE); > } > > - for (f=0;f<NB_WIN_FORMATS;f++) { > + for (f = 0; f < ARRAY_SIZE(win_formats); f++) { > format.wFormatTag=WAVE_FORMAT_PCM; > format.nChannels=win_formats[f][3]; > format.wBitsPerSample=win_formats[f][2]; > diff --git a/dlls/winmm/tests/winmm_test.h b/dlls/winmm/tests/winmm_test.h > index 177dc2e837..d5fb70afbd 100644 > --- a/dlls/winmm/tests/winmm_test.h > +++ b/dlls/winmm/tests/winmm_test.h > @@ -68,7 +68,6 @@ static const unsigned int win_formats[][4] = { > {WAVE_FORMAT_96M16, 96000, 16, 1}, > {WAVE_FORMAT_96S16, 96000, 16, 2} > }; > -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats)) > > extern const char* dev_name(int); > extern const char* wave_open_flags(DWORD); > -- > 2.14.4 > > >

June 14, 2018

Re: ODBC Databases: Jet/Access success

by liz lock

I just wanted to thank Barry Bird so, so much for this very old post. I have struggled with this issue getting some massively complicated Word macros that interact with Access databases to work under Wine (and Crossover Linux) and his solution just ... worked. Brilliant! (Mrs) Elizabeth Lock Oxford

June 14, 2018

[PATCH 2/2] msvcp120: Add alloc/free count validation tests in _Concurrent_vector_base_v4

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 5 +++++ 1 file changed, 5 insertions(+)

June 14, 2018