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

Michael Stefaniuc : jscript: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 10 Jul '18

10 Jul '18

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

Alex Henrie : ole32: Return IUnknown from GITCF_CreateInstance if requested.
by Alexandre Julliard 10 Jul '18

10 Jul '18

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

Michael Stefaniuc : comctl32: Remove redundant NULL checks before Free().
by Alexandre Julliard 10 Jul '18

10 Jul '18

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

Dmitry Timoshkov : winedump: Correctly declare the array of segments.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: wine Branch: master Commit: 3e6b1296c1b599c8a0b494eba1d7c94675b78c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6b1296c1b599c8a0b494eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:13 2018 +0800 winedump: Correctly declare the array of segments. 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 df1ea4b..5c71036 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -109,7 +109,7 @@ typedef struct seg_t { int offset; int length; } seg_t; -static seg_t segdir[]; +static seg_t segdir[15]; enum SEGDIRTYPE { SEGDIR_TYPEINFO,

1 0

Dmitry Timoshkov : winedump: Avoid sign extension in tlb_read_short().
by Alexandre Julliard 10 Jul '18

10 Jul '18

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

Dmitry Timoshkov : winedump: Stop prepending every line of information with an offset.
by Alexandre Julliard 10 Jul '18

10 Jul '18

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: Consistently print hex numbers with leading zeros and 'h' suffix.
by Alexandre Julliard 10 Jul '18

10 Jul '18

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: Fix version printing.
by Alexandre Julliard 10 Jul '18

10 Jul '18

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: Add print_string() helper.
by Alexandre Julliard 10 Jul '18

10 Jul '18

Module: wine Branch: master Commit: 9723142c2ad0f5b68156461a8df8015422dd6c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9723142c2ad0f5b68156461a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 10 11:41:49 2018 +0800 winedump: Add print_string() helper. 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 330fee8..d288359 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -517,11 +517,17 @@ static BOOL dump_msft_namehashtab(seg_t *seg) return TRUE; } -static void dump_string(int len, int align_off) +static void print_string(int len) { printf("\""); fwrite(tlb_read(len), len, 1, stdout); - printf("\" "); + printf("\""); +} + +static void dump_string(int len, int align_off) +{ + print_string(len); + printf(" "); while((len++ + align_off) & 3) printf("\\%2.2x", tlb_read_byte()); }

1 0

Julian Rüger : German translation for release 3.12
by Jeremy Newman 10 Jul '18

10 Jul '18

Module: website Branch: master Commit: c775bd64d93fedc6a1770cc6f15f359c98fb5961 URL: https://source.winehq.org/git/website.git/?a=commit;h=c775bd64d93fedc6a1770… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jul 10 14:46:47 2018 +0200 German translation for release 3.12 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2018070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2018070901.xml b/news/de/2018070901.xml new file mode 100644 index 0000000..241a643 --- /dev/null +++ b/news/de/2018070901.xml @@ -0,0 +1,16 @@ +<news> +<date>9. Juli 2018</date> +<title>Wine 3.12 freigegeben</title> +<body> + Die Entwicklungsversion 3.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/3.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unicode-Daten auf Unicode 11.0.0 aktualisiert.</li> + <li>Proxykonfigurations-Dialog in der Systemsteuerung unter Internet.</li> + <li>Syntaxkorrekturen im Befehlsinterpreter cmd.exe.</li> + <li>Zusätzliche Glyphen in der Schriftart Wingdings.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0