September 2019 - Wine-Devel

[PATCH 2/5] adsiid: Define NONAMELESSUNION where necessary.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/adsiid/adsiid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/adsiid/adsiid.c b/dlls/adsiid/adsiid.c index fc0b8b1bf4e..69aeb6a9a32 100644 --- a/dlls/adsiid/adsiid.c +++ b/dlls/adsiid/adsiid.c @@ -20,6 +20,7 @@ #include <stdarg.h> +#define NONAMELESSUNION #include "windef.h" #include "objbase.h" #include "initguid.h" -- 2.22.0

Sept. 1, 2019

[PATCH 1/5] avicap32: Define NONAMELESSUNION where necessary.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/avicap32/avicap32_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 9e2a99d4c7c..0178dc87edb 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -43,6 +43,7 @@ # include <unistd.h> #endif +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wingdi.h" -- 2.22.0

Sept. 1, 2019

Re: [PATCH] widl: Always generate a name for anonymous UDTs.

by Zebediah Figura

On 9/1/19 11:52 AM, Jacek Caban wrote: > Hi Zebediah, > > > On 01/09/2019 18:48, Zebediah Figura wrote: >> On 9/1/19 11:41 AM, Zebediah Figura wrote: >>> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 >>> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >>> --- >>> tools/widl/parser.y | 2 +- >>> tools/widl/typetree.c | 32 ++++++++------------------------ >>> 2 files changed, 9 insertions(+), 25 deletions(-) >>> >> >> Sorry, please ignore this patch. On further testing it appears this is >> not in fact correct. > > > FWIW, the problematic union is not nameless in PSDK and it's called > _STGMEDIUM_UNION. > Yes, I noticed that too. Unfortunately, it's nontrivial to add this, because if the union is nameless it violates the C11 spec and causes gcc to emit warnings. So we need to define NONAMELESSUNION everywhere that includes objidl.idl first. > > Cheers, > > Jacek > > >

Sept. 1, 2019

Re: [PATCH] widl: Always generate a name for anonymous UDTs.

by Jacek Caban

Hi Zebediah, On 01/09/2019 18:48, Zebediah Figura wrote: > On 9/1/19 11:41 AM, Zebediah Figura wrote: >> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 >> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >> --- >> tools/widl/parser.y | 2 +- >> tools/widl/typetree.c | 32 ++++++++------------------------ >> 2 files changed, 9 insertions(+), 25 deletions(-) >> > > Sorry, please ignore this patch. On further testing it appears this is > not in fact correct. FWIW, the problematic union is not nameless in PSDK and it's called _STGMEDIUM_UNION. Cheers, Jacek

Sept. 1, 2019

Re: [PATCH] widl: Always generate a name for anonymous UDTs.

by Zebediah Figura

On 9/1/19 11:41 AM, Zebediah Figura wrote: > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > tools/widl/parser.y | 2 +- > tools/widl/typetree.c | 32 ++++++++------------------------ > 2 files changed, 9 insertions(+), 25 deletions(-) > Sorry, please ignore this patch. On further testing it appears this is not in fact correct.

Sept. 1, 2019

[PATCH] widl: Always generate a name for anonymous UDTs.

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/parser.y | 2 +- tools/widl/typetree.c | 32 ++++++++------------------------ 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 59875a5b160..64293fbee75 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -779,7 +779,7 @@ m_ident: { $$ = NULL; } | ident ; -t_ident: { $$ = NULL; } +t_ident: { $$ = gen_name(); } | aIDENTIFIER { $$ = $1; } | aKNOWNTYPE { $$ = $1; } ; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e9afc6fdd28..2d110e757ba 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -265,18 +265,14 @@ type_t *type_new_void(void) type_t *type_new_enum(const char *name, struct namespace *namespace, int defined, var_list_t *enums) { - type_t *t = NULL; - - if (name) - t = find_type(name, namespace,tsENUM); + type_t *t = find_type(name, namespace,tsENUM); if (!t) { t = make_type(TYPE_ENUM); t->name = name; t->namespace = namespace; - if (name) - reg_type(t, name, namespace, tsENUM); + reg_type(t, name, namespace, tsENUM); } if (!t->defined && defined) @@ -293,18 +289,14 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { - type_t *t = NULL; - - if (name) - t = find_type(name, namespace, tsSTRUCT); + type_t *t = find_type(name, namespace, tsSTRUCT); if (!t) { t = make_type(TYPE_STRUCT); t->name = name; t->namespace = namespace; - if (name) - reg_type(t, name, namespace, tsSTRUCT); + reg_type(t, name, namespace, tsSTRUCT); } if (!t->defined && defined) @@ -321,17 +313,13 @@ type_t *type_new_struct(char *name, struct namespace *namespace, int defined, va type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields) { - type_t *t = NULL; - - if (name) - t = find_type(name, NULL, tsUNION); + type_t *t = find_type(name, NULL, tsUNION); if (!t) { t = make_type(TYPE_UNION); t->name = name; - if (name) - reg_type(t, name, NULL, tsUNION); + reg_type(t, name, NULL, tsUNION); } if (!t->defined && defined) @@ -348,17 +336,13 @@ type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases) { - type_t *t = NULL; - - if (name) - t = find_type(name, NULL, tsUNION); + type_t *t = find_type(name, NULL, tsUNION); if (!t) { t = make_type(TYPE_ENCAPSULATED_UNION); t->name = name; - if (name) - reg_type(t, name, NULL, tsUNION); + reg_type(t, name, NULL, tsUNION); } t->type_type = TYPE_ENCAPSULATED_UNION; -- 2.22.0

Sept. 1, 2019

[PATCH] winemac.drv: Fix 32bit build with older SDKs.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- I am very sorry for the trouble. I added that TRACE during a later review, forgetting it was in an objective-c file. dlls/winemac.drv/cocoa_display.m | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 3863557d96..335b3bb06f 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -337,7 +337,6 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) { - TRACE("Metal support not compiled in\n"); return -1; } -- 2.15.2 (Apple Git-101.1)

Sept. 1, 2019

[PATCH] comctl32/syslink: Properly handle '\r'

by Fabian Maurer

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46421 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/syslink.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7b9cccfc98..60bcc23187 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -565,12 +565,12 @@ static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int x, int *LineLen, { int i; - for (i = 0; i < nFit; i++) if (Text[i] == '\n') break; + for (i = 0; i < nFit; i++) if (Text[i] == '\r' || Text[i] == '\n') break; if (i == *LineLen) return FALSE; /* check if we're in the middle of a word */ - if (Text[i] != '\n' && Text[i] != BreakChar) + if (Text[i] != '\r' && Text[i] != '\n' && Text[i] != BreakChar) { /* search for the beginning of the word */ while (i && Text[i - 1] != BreakChar) i--; @@ -653,6 +653,12 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) /* skip break characters unless they're the first of the doc item */ if(tx != Current->Text || x == SL_LEFTMARGIN) { + if (n && *tx == '\r') + { + tx++; + SkipChars++; + n--; + } if (n && *tx == '\n') { tx++; -- 2.23.0

Sept. 1, 2019

Re: [PATCH] ntdll: Fix compiler warnings on x86_64.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=56078 Your paranoid android. === debian10 (build log) === error: patch failed: dlls/ntdll/nt.c:2314 Task: Patch failed to apply === debian10 (build log) === error: patch failed: dlls/ntdll/nt.c:2314 Task: Patch failed to apply

Sept. 1, 2019

[PATCH] ntdll: Fix compiler warnings on x86_64.

by Masanori Kakura

This commit fixes a regression introduced by 95f94568158caaf4fefe2e14f21bb3f0701577c9. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47706 Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 12f1ab58ab..5169f89a75 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2314,7 +2314,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( if ((fp = fopen("/proc/meminfo", "r"))) { - ULONG64 totalram, freeram, totalswap, freeswap; + unsigned long long totalram, freeram, totalswap, freeswap; char line[64]; while (fgets(line, sizeof(line), fp)) { -- 2.20.1

Sept. 1, 2019