September 2017 - Wine-Devel

Re: [PATCH 2/5] shell32: Use shellfolder API to construct FolderItems

by Alexandre Julliard

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/shell32/shelldispatch.c | 195 ++++++++++++++++++++++--------------- > dlls/shell32/tests/shelldispatch.c | 3 + > 2 files changed, 118 insertions(+), 80 deletions(-) This breaks the tests here: ../../../tools/runtest -q -P wine -T ../../.. -M shell32.dll -p shell32_test.exe.so shelldispatch && touch shelldispatch.ok shelldispatch.c:615: Test failed: file_defs[0]: expected L"C:\\users\\julliard\\Temp\\winetest\\00-Myfolder", got L"C:\\users\\julliard\\Temp\\winetest\\01-empty.bin" shelldispatch.c:681: Test failed: file_defs[0]: expected L"C:\\users\\julliard\\Temp\\winetest\\00-Myfolder", got L"C:\\users\\julliard\\Temp\\winetest\\01-empty.bin" shelldispatch.c:615: Test failed: file_defs[1]: expected L"C:\\users\\julliard\\Temp\\winetest\\01-empty.bin", got L"C:\\users\\julliard\\Temp\\winetest\\00-Myfolder" shelldispatch.c:681: Test failed: file_defs[1]: expected L"C:\\users\\julliard\\Temp\\winetest\\01-empty.bin", got L"C:\\users\\julliard\\Temp\\winetest\\00-Myfolder" Makefile:515: recipe for target 'shelldispatch.ok' failed make: *** [shelldispatch.ok] Error 4 -- Alexandre Julliard julliard(a)winehq.org

Sept. 25, 2017

[PATCH] dwmapi: Update spec file.

by Andrey Gusev

> Why are you removing these? I guess it's not so important to leave these.

Sept. 25, 2017

Re: [PATCH 2/2] shell32/tests: Check IDispatch for NULL before using its functions

by Fabian Maurer

On Montag, 25. September 2017 20:44:26 CEST Nikolay Sivov wrote: > So what happens exactly that makes get_Parent() and get_Application() > fail? I don't think workarounds like that are useful without > understanding the problem. I don't know, I just figured it'll make sense for the tests not to crash regardless. Regards, Fabian Maurer

Sept. 25, 2017

Re: [PATCH 2/2] shell32/tests: Check IDispatch for NULL before using its functions

by Nikolay Sivov

On 25.09.2017 21:34, Fabian Maurer wrote: > Fixes Bug 43749 > > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/shell32/tests/shelldispatch.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c > index 7b5afa0c94..b31497b557 100644 > --- a/dlls/shell32/tests/shelldispatch.c > +++ b/dlls/shell32/tests/shelldispatch.c > @@ -134,13 +134,15 @@ static void test_namespace(void) > r = IShellDispatch_get_Application(sd, &disp); > ok(r == S_OK, "Failed to get application pointer, hr %#x.\n", r); > ok(disp == (IDispatch *)sd, "Unexpected application pointer %p.\n", disp); > - IDispatch_Release(disp); > + if(disp) > + IDispatch_Release(disp); > > disp = NULL; > r = IShellDispatch_get_Parent(sd, &disp); > ok(r == S_OK, "Failed to get Shell object parent, hr %#x.\n", r); > ok(disp == (IDispatch *)sd, "Unexpected parent pointer %p.\n", disp); > - IDispatch_Release(disp); > + if(disp) > + IDispatch_Release(disp); > > VariantInit(&var); > folder = (void*)0xdeadbeef; > @@ -502,7 +504,8 @@ static void test_items(void) > r = FolderItem_get_Parent(item, &disp); > ok(r == S_OK, "Failed to get parent pointer, hr %#x.\n", r); > ok(disp == (IDispatch *)folder, "Unexpected parent pointer %p.\n", disp); > - IDispatch_Release(disp); > + if(disp) > + IDispatch_Release(disp); > > if (item) FolderItem_Release(item); > VariantClear(&var); > @@ -1036,6 +1039,10 @@ todo_wine { > ok(disp == NULL, "got %p\n", disp); > ok(ret == 0, "got %d\n", ret); > } > + else if (disp == NULL) { > + ok(FALSE, "disp is NULL\n"); > + skip("disp is NULL\n"); > + } > else { > static const IID *browser_riids[] = { > &IID_IWebBrowser2, > @@ -1055,7 +1062,6 @@ todo_wine { > IShellView *sv; > IUnknown *unk; > > - ok(disp != NULL, "got %p\n", disp); > ok(ret != HandleToUlong(hwnd), "got %d\n", ret); > > /* IDispatch-related tests */ > So what happens exactly that makes get_Parent() and get_Application() fail? I don't think workarounds like that are useful without understanding the problem.

Sept. 25, 2017

Re: [PATCH] dwmapi: Update spec file.

by Alexandre Julliard

Andrey Gusev <andrey.goosev(a)gmail.com> writes: > @@ -1,29 +1,10 @@ > -100 stub @ > -101 stub @ > -102 stdcall DwmEnableComposition (long) > -103 stub @ > -104 stub @ > -105 stub @ > -106 stub @ > -107 stub @ > -108 stub @ > -109 stub @ > -110 stub @ > -111 stub @ > -112 stub @ > -113 stub @ > - > -115 stub @ > -116 stub @ > -117 stub @ > -118 stub @ > -119 stub @ > -120 stub @ Why are you removing these? Also in general new stubs should be commented out. -- Alexandre Julliard julliard(a)winehq.org

Sept. 25, 2017

Re: Please change WINE logo

by Jeremy Newman

This is the scalable shaded version of our logo: http://dl.winehq.org/wine/logos/wine_logo.svg The current logo. Your suggested logo would never work, as it uses a copyrighted image. When it comes to logo design you need to design a logo that works in black and white, flat color, and shaded color. A 3D rendered wine glass would not work in all those cases. FYI: Calling the current logo ugly is not the best way to start a dialog about changing it. -N On 9/24/2017 7:43 AM, Farhad Mohammadi Majd wrote: > Hello, the current WINE logo is really ugly in highest level! and has > no concept, please change it with better one, I have a good sample: > > https://commons.wikimedia.org/wiki/File:Wine_bw.png > > It is really beautiful and Window$ logo shows its relationship with M$ > Windows, I hope this logo is legal. > > . > >

Sept. 25, 2017

Re: Please change WINE logo

by Austin English

On Mon, Sep 25, 2017 at 7:16 AM, Rosanne DiMesio <dimesio(a)earthlink.net> wrote: > On Mon, 25 Sep 2017 11:16:02 +0330 > Farhad Mohammadi Majd <farhadbenyamin(a)yahoo.com> wrote: >> >> I think something like that is better than current logo, an ugly white- >> colour glass of wine; anyway WINE has relationship with MS and Windows. >> > > The design of that logo implies that the Wine Project is either a subsidiary of Microsoft or officially endorsed by Microsoft, neither of which is true. The design notably leaves out the logos of the operating systems that Wine actually runs on. Using it would look like a deliberate attempt to mislead consumers, which is what I imagine Microsoft's lawyers would be arguing in their trademark infringement lawsuit. > > Rosanne DiMesio > dimesio(a)earthlink.net While I can't speak for AJ, I can say from the viewpoint of the Wine committee that there's a 0% change we'd use a logo that contains the Microsoft logo. A larger version of the current one, however, should be feasible. -- -Austin GPG: 14FB D7EA A041 937B

Sept. 25, 2017

Re: [PATCH] gdi32: Pick first charmap if none was selected using preferred encoding

by Huw Davies

On Mon, Sep 25, 2017 at 02:21:02PM +0300, Nikolay Sivov wrote: > FreeType 2.8.1 has similar logic removed from WinFNT module, > that always pre-selected first charmap. > > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > > For https://bugs.winehq.org/show_bug.cgi?id=43715 > > dlls/gdi32/freetype.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index 13edef6601..bf566f382c 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -5150,6 +5150,10 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) > if (select_charmap( face, *encs )) break; > encs++; > } > + > + if (!face->charmap && face->num_charmaps) > + face->charmap = face->charmaps[0]; > + Manipulating face->charmap directly doesn't look right, you probably want to use FT_Set_Charmap(). Huw.

Sept. 25, 2017

Re: Please change WINE logo

by Rosanne DiMesio

On Mon, 25 Sep 2017 11:16:02 +0330 Farhad Mohammadi Majd <farhadbenyamin(a)yahoo.com> wrote: > > I think something like that is better than current logo, an ugly white- > colour glass of wine; anyway WINE has relationship with MS and Windows. > The design of that logo implies that the Wine Project is either a subsidiary of Microsoft or officially endorsed by Microsoft, neither of which is true. The design notably leaves out the logos of the operating systems that Wine actually runs on. Using it would look like a deliberate attempt to mislead consumers, which is what I imagine Microsoft's lawyers would be arguing in their trademark infringement lawsuit. Rosanne DiMesio dimesio(a)earthlink.net

Sept. 25, 2017

Re: [PATCH 1/2] msvcrt: Introduce vfprintf helper function.

by Piotr Caban

Hi, On 09/25/17 01:24, Gijs Vermeulen wrote: > -int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) > +static int vfprintf_helper(MSVCRT_FILE* file, const char *format, __ms_va_list valist, > + MSVCRT__locale_t locale, BOOL secure) > { > BOOL tmp_buf; > int ret; > > + if(secure) > + if(!MSVCRT_CHECK_PMT(file != NULL)) return -1; > + > MSVCRT__lock_file(file); > tmp_buf = add_std_buffer(file); > - ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, 0, arg_clbk_valist, NULL, &valist); > + > + if(!secure) > + ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, 0, arg_clbk_valist, NULL, &valist); > + else > + { > + if(!locale) > + ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, > + MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, arg_clbk_valist, NULL, &valist); > + else > + ret = pf_printf_a(puts_clbk_file_a, file, format, locale, 0, arg_clbk_valist, NULL, &valist); > + } > + > if(tmp_buf) remove_std_buffer(file); > MSVCRT__unlock_file(file); > > return ret; > } This helper changes current functions behavior. Thanks, Piotr

Sept. 25, 2017