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

Alex Henrie : ole32: Return IUnknown from GITCF_CreateInstance if requested.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 6187e8db0ba73b580c50c9068184d737ed6a1634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6187e8db0ba73b580c50c906… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jul 10 11:45:46 2018 +0200 ole32: Return IUnknown from GITCF_CreateInstance if requested. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/git.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f7a0460..8683f35 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -122,9 +122,14 @@ StdGlobalInterfaceTable_QueryInterface(IGlobalInterfaceTable* iface, /* Do we implement that interface? */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IGlobalInterfaceTable, riid)) + { *ppvObject = iface; + } else + { + FIXME("(%s), not supported.\n", debugstr_guid(riid)); return E_NOINTERFACE; + } /* Now inc the refcount */ IGlobalInterfaceTable_AddRef(iface); @@ -314,13 +319,10 @@ static HRESULT WINAPI GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { - IGlobalInterfaceTable *git = get_std_git(); - return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); - } - - FIXME("(%s), not supported.\n",debugstr_guid(riid)); - return E_NOINTERFACE; + IGlobalInterfaceTable *git = get_std_git(); + HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, ppv); + IGlobalInterfaceTable_Release(git); + return hr; } static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock)

1 0

Dmitry Timoshkov : winedump: Fix version printing.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 597b1804c1b2d8ec2d123a226776aa93309d2224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=597b1804c1b2d8ec2d123a22… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:44 2018 +0800 winedump: Fix version printing. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index bc19087..330fee8 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -321,10 +321,10 @@ static int dump_msft_varflags(void) static void dump_msft_version(void) { - int version; + unsigned version; print_offset(); version = tlb_read_int(); - printf("version = %d.%d\n", version & 0xff, version >> 16); + printf("version = %u.%u\n", version & 0xffff, version >> 16); } static void dump_msft_header(void)

1 0

Dmitry Timoshkov : winedump: Consistently print hex numbers with leading zeros and 'h' suffix.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: ed6e1dfc72a7fea14a322668ba7355ae6a9475a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed6e1dfc72a7fea14a322668… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:40 2018 +0800 winedump: Consistently print hex numbers with leading zeros and 'h' suffix. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 0d8f059..bc19087 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -204,7 +204,7 @@ static int print_hex(const char *name) { int ret; print_offset(); - printf("%s = %08x\n", name, ret=tlb_read_int()); + printf("%s = %08xh\n", name, ret=tlb_read_int()); return ret; } @@ -219,7 +219,7 @@ static int print_short_hex(const char *name) { int ret; print_offset(); - printf("%s = %xh\n", name, ret=tlb_read_short()); + printf("%s = %04xh\n", name, ret=tlb_read_short()); return ret; }

1 0

Dmitry Timoshkov : winedump: Stop prepending every line of information with an offset.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: a6d08adcdbf50b7c13692fb466840b51982f5c4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d08adcdbf50b7c13692fb4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:30 2018 +0800 winedump: Stop prepending every line of information with an offset. This makes typelib output consistent with other dumpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index e307615..0d8f059 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -173,9 +173,6 @@ static int tlb_read_byte(void) static void print_offset(void) { int i; - - printf("%04x: ", offset); - for(i=0; i<indent; i++) printf(" "); }

1 0

Dmitry Timoshkov : winedump: Avoid sign extension in tlb_read_short().
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 193d0921c9889ba909e3c8dc3ea760ac93f0f339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=193d0921c9889ba909e3c8dc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:22 2018 +0800 winedump: Avoid sign extension in tlb_read_short(). tlb_read_byte() already behaves this way. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/tlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 5c71036..e307615 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -160,7 +160,7 @@ static int tlb_read_int(void) static int tlb_read_short(void) { - const short *ret = tlb_read(sizeof(short)); + const unsigned short *ret = tlb_read(sizeof(short)); return ret ? *ret : -1; }

1 0

Michael Stefaniuc : comctl32: Remove redundant NULL checks before Free().
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: cf37c6c422222779f4423272edbbd49e25b444c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf37c6c422222779f4423272… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 10 12:36:09 2018 +0200 comctl32: Remove redundant NULL checks before Free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ee3b273..4631899 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -429,7 +429,7 @@ static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const W if (syslink) style |= WS_TABSTOP; textW = taskdialog_gettext(dialog_info, TRUE, text); hwnd = CreateWindowW(class, textW, style, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); - if (textW) Free(textW); + Free(textW); SendMessageW(hwnd, WM_SETFONT, (WPARAM)font, 0); return hwnd; @@ -825,9 +825,9 @@ static void taskdialog_destroy(struct taskdialog_info *dialog_info) if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); if (dialog_info->font) DeleteObject(dialog_info->font); if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font); - if (dialog_info->buttons) Free(dialog_info->buttons); - if (dialog_info->radio_buttons) Free(dialog_info->radio_buttons); - if (dialog_info->command_links) Free(dialog_info->command_links); + Free(dialog_info->buttons); + Free(dialog_info->radio_buttons); + Free(dialog_info->command_links); } static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

1 0

Michael Stefaniuc : jscript: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: ef64f2763200830a62e8334bf4c1948fd384336d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef64f2763200830a62e8334b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:12 2018 +0200 jscript: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 8 ++++---- dlls/jscript/bool.c | 2 +- dlls/jscript/date.c | 26 +++++++++++++------------- dlls/jscript/decode.c | 10 +++++----- dlls/jscript/dispex.c | 2 +- dlls/jscript/error.c | 6 +++--- dlls/jscript/function.c | 14 +++++++------- dlls/jscript/global.c | 2 +- dlls/jscript/json.c | 2 +- dlls/jscript/jsregexp.c | 10 +++++----- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 2 +- dlls/jscript/math.c | 4 ++-- dlls/jscript/number.c | 2 +- dlls/jscript/object.c | 4 ++-- dlls/jscript/string.c | 8 ++++---- dlls/jscript/vbarray.c | 2 +- 17 files changed, 55 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef64f2763200830a62e8…

1 0

Michael Stefaniuc : riched20: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: f002aec139f1cc8b36232806d7de195156fe53aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f002aec139f1cc8b36232806… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 10 08:31:50 2018 +0100 riched20: Avoid an ARRAY_SIZE-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/reader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 0310109..339ca04 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2175,14 +2175,13 @@ static RTFKey rtfKey[] = { 0, -1, NULL, 0 } }; -#define RTF_KEY_COUNT (sizeof(rtfKey) / sizeof(RTFKey)) typedef struct tagRTFHashTableEntry { int count; RTFKey **value; } RTFHashTableEntry; -static RTFHashTableEntry rtfHashTable[RTF_KEY_COUNT * 2]; +static RTFHashTableEntry rtfHashTable[ARRAY_SIZE(rtfKey) * 2]; /* @@ -2199,7 +2198,7 @@ void LookupInit(void) int index; rp->rtfKHash = Hash (rp->rtfKStr); - index = rp->rtfKHash % (RTF_KEY_COUNT * 2); + index = rp->rtfKHash % (ARRAY_SIZE(rtfKey) * 2); if (!rtfHashTable[index].count) rtfHashTable[index].value = heap_alloc(sizeof(RTFKey *)); else @@ -2212,7 +2211,7 @@ void LookupCleanup(void) { unsigned int i; - for (i=0; i<RTF_KEY_COUNT*2; i++) + for (i = 0; i < ARRAY_SIZE(rtfKey) * 2; i++) { heap_free( rtfHashTable[i].value ); rtfHashTable[i].value = NULL; @@ -2235,7 +2234,7 @@ static void Lookup(RTF_Info *info, char *s) ++s; /* skip over the leading \ character */ hash = Hash (s); - entry = &rtfHashTable[hash % (RTF_KEY_COUNT * 2)]; + entry = &rtfHashTable[hash % (ARRAY_SIZE(rtfKey) * 2)]; for (i = 0; i < entry->count; i++) { rp = entry->value[i];

1 0

Akihiro Sagawa : winmm: Don' t allow to set time division property while playing.
by Alexandre Julliard July 10, 2018

July 10, 2018

Module: wine Branch: master Commit: 2cb326260b68634fec7a3a402808710fea159d99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cb326260b68634fec7a3a40… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Jun 26 22:10:45 2018 +0900 winmm: Don't allow to set time division property while playing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 6 ++++++ dlls/winmm/winmm.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 3b8bd22..c46286b 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -885,6 +885,12 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); expected = ret; + /* shouldn't set time division property while playing */ + midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); + midiprop.tdiv.dwTimeDiv = 24; + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_SET | MIDIPROP_TIMEDIV); + ok(rc == MMSYSERR_INVALPARAM, "midiStreamProperty(SET|TIMEDIV, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + ret = WaitForSingleObject(records.done, INFINITE); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, got %d\n", ret); diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index ef7dcdf..4bba1a7 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1539,9 +1539,13 @@ MMRESULT WINAPI midiStreamProperty(HMIDISTRM hMidiStrm, LPBYTE lpPropData, DWORD ret = MMSYSERR_INVALPARAM; } else if (dwProperty & MIDIPROP_SET) { EnterCriticalSection(&lpMidiStrm->lock); - lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; + if (lpMidiStrm->status != MSM_STATUS_PLAYING) { + lpMidiStrm->dwTimeDiv = mptd->dwTimeDiv; + TRACE("Setting time div to %d\n", mptd->dwTimeDiv); + } + else + ret = MMSYSERR_INVALPARAM; LeaveCriticalSection(&lpMidiStrm->lock); - TRACE("Setting time div to %d\n", mptd->dwTimeDiv); } else if (dwProperty & MIDIPROP_GET) { mptd->dwTimeDiv = lpMidiStrm->dwTimeDiv; TRACE("Getting time div <= %d\n", mptd->dwTimeDiv);

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman July 10, 2018

July 10, 2018

Module: website Branch: master Commit: 48fb772078f075c0fbadae7612cddcf47e752822 URL: https://source.winehq.org/git/website.git/?a=commit;h=48fb772078f075c0fbada… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 10 13:38:39 2018 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0