September 2019 - Wine-Commits

Francois Gouget : testbot/CheckForWinetestUpdate: Clean up handling of the 'other' VMs.
by Alexandre Julliard Sept. 17, 2019

Sept. 17, 2019

Module: tools Branch: master Commit: 73912a3cd7a214f89230ddfeb7ee9640edee15b9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=73912a3cd7a214f89230ddf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 17 12:33:37 2019 +0200 testbot/CheckForWinetestUpdate: Clean up handling of the 'other' VMs. The job is called 'WineTest: other VMs' so calling the corresponding option 'other32' is clearer. Also, setting $BaseJob to 'other' when appropriate simplifies building the job description. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index 590226c..b4672a7 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -67,7 +67,7 @@ my %WineTestUrls = ( my %TaskTypes = (build => "Update and rebuild Wine on the build VMs.", base32 => "Run WineTest on the 32 bit Windows VMs with the 'base' role.", - winetest32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", + other32 => "Run WineTest on the 32 bit Windows VMs with the 'winetest' role.", all64 => "Run WineTest on the all the 64 bit Windows VMs.", wine => "Update, rebuild and run WineTest on the Wine VMs."); @@ -171,7 +171,7 @@ sub AddJob($$$) { my ($BaseJob, $LatestBaseName, $Build) = @_; - my $Remarks = ($Build eq "exe64" ? "64-bit" : $BaseJob ? "base" : "other"); + my $Remarks = $Build eq "exe64" ? "64-bit" : $BaseJob; $Remarks = "WineTest: $Remarks VMs"; Debug("Creating the '$Remarks' job\n"); @@ -181,7 +181,7 @@ sub AddJob($$$) $VMs->AddFilter("Type", ["win64"]); $VMs->AddFilter("Role", ["base", "winetest"]); } - elsif ($BaseJob) + elsif ($BaseJob eq "base") { $VMs->AddFilter("Type", ["win32", "win64"]); $VMs->AddFilter("Role", ["base"]); @@ -202,7 +202,7 @@ sub AddJob($$$) my $Jobs = CreateJobs(); my $NewJob = $Jobs->Add(); $NewJob->User(GetBatchUser()); - $NewJob->Priority($BaseJob && $Build eq "exe32" ? 8 : 9); + $NewJob->Priority($BaseJob eq "base" and $Build eq "exe32" ? 8 : 9); $NewJob->Remarks($Remarks); # Add a task for each VM @@ -458,7 +458,7 @@ if (defined $Usage) # my $Rc = 0; -if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or +if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{other32} or $OptTypes{wine}) { my ($Create, $LatestBaseName) = UpdateWineTest($OptCreate, "exe32"); @@ -473,7 +473,7 @@ if ($OptTypes{build} or $OptTypes{base32} or $OptTypes{winetest32} or # arbitrarily do it only for 32-bit executables to avoid redundant updates. $Rc = 1 if ($OptTypes{build} and !AddReconfigJob("build")); $Rc = 1 if ($OptTypes{base32} and !AddJob("base", $LatestBaseName, "exe32")); - $Rc = 1 if ($OptTypes{winetest32} and !AddJob("", $LatestBaseName, "exe32")); + $Rc = 1 if ($OptTypes{other32} and !AddJob("other", $LatestBaseName, "exe32")); $Rc = 1 if ($OptTypes{wine} and !AddReconfigJob("wine")); }

1 0

Alex Henrie : crypt32: Factor out sprintf calls in trust_status_to_str (scan-build).
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: 9b87b610ebb0820c9ffa7034efafa208769533e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b87b610ebb0820c9ffa7034… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:41:05 2019 -0600 crypt32: Factor out sprintf calls in trust_status_to_str (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/rootstore.c | 82 ++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 48 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index e7ed4e9bea..706ec75285 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -156,55 +156,41 @@ static BOOL import_base64_certs_from_fp(FILE *fp, HCERTSTORE store) static const char *trust_status_to_str(DWORD status) { + static const struct + { + DWORD flag; + char text[32]; + } + messages[] = + { + { CERT_TRUST_IS_NOT_TIME_VALID, "expired" }, + { CERT_TRUST_IS_NOT_TIME_NESTED, "bad time nesting" }, + { CERT_TRUST_IS_REVOKED, "revoked" }, + { CERT_TRUST_IS_NOT_SIGNATURE_VALID, "bad signature" }, + { CERT_TRUST_IS_NOT_VALID_FOR_USAGE, "bad usage" }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, "untrusted root" }, + { CERT_TRUST_REVOCATION_STATUS_UNKNOWN, "unknown revocation status" }, + { CERT_TRUST_IS_CYCLIC, "cyclic chain" }, + { CERT_TRUST_INVALID_EXTENSION, "unsupported critical extension" }, + { CERT_TRUST_INVALID_POLICY_CONSTRAINTS, "bad policy" }, + { CERT_TRUST_INVALID_BASIC_CONSTRAINTS, "bad basic constraints" }, + { CERT_TRUST_INVALID_NAME_CONSTRAINTS, "bad name constraints" }, + { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT, "unsupported name constraint" }, + { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, "undefined name constraint" }, + { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, "disallowed name constraint" }, + { CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT, "excluded name constraint" }, + { CERT_TRUST_IS_OFFLINE_REVOCATION, "revocation server offline" }, + { CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY, "no issuance policy" }, + }; static char buf[1024]; - int pos = 0; - - if (status & CERT_TRUST_IS_NOT_TIME_VALID) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\texpired"); - if (status & CERT_TRUST_IS_NOT_TIME_NESTED) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad time nesting"); - if (status & CERT_TRUST_IS_REVOKED) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\trevoked"); - if (status & CERT_TRUST_IS_NOT_SIGNATURE_VALID) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad signature"); - if (status & CERT_TRUST_IS_NOT_VALID_FOR_USAGE) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad usage"); - if (status & CERT_TRUST_IS_UNTRUSTED_ROOT) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tuntrusted root"); - if (status & CERT_TRUST_REVOCATION_STATUS_UNKNOWN) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunknown revocation status"); - if (status & CERT_TRUST_IS_CYCLIC) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tcyclic chain"); - if (status & CERT_TRUST_INVALID_EXTENSION) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunsupported critical extension"); - if (status & CERT_TRUST_INVALID_POLICY_CONSTRAINTS) - pos += snprintf(buf + pos, sizeof(buf) - pos, "\n\tbad policy"); - if (status & CERT_TRUST_INVALID_BASIC_CONSTRAINTS) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tbad basic constraints"); - if (status & CERT_TRUST_INVALID_NAME_CONSTRAINTS) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tbad name constraints"); - if (status & CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tunsupported name constraint"); - if (status & CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tundefined name constraint"); - if (status & CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tdisallowed name constraint"); - if (status & CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\texcluded name constraint"); - if (status & CERT_TRUST_IS_OFFLINE_REVOCATION) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\trevocation server offline"); - if (status & CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY) - pos += snprintf(buf + pos, sizeof(buf) - pos, - "\n\tno issuance policy"); + int i, pos = 0; + + for (i = 0; i < ARRAY_SIZE(messages); i++) + { + if (status & messages[i].flag) + pos += sprintf(buf + pos, "\n\t%s", messages[i].text); + } + return buf; }

1 0

Alex Henrie : dbghelp: Avoid dead assignment (scan-build).
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: ae6e4017548fc30bf5220bebc674230dc4ccfe06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6e4017548fc30bf5220beb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:12 2019 -0600 dbghelp: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3689500fa0..69d8b38b71 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1967,7 +1967,6 @@ static BOOL re_match_multi(const WCHAR** pstring, const WCHAR** pre, BOOL _case) if (!(next = re_match_one(string_end, re_beg, _case))) return FALSE; string_end = next; } - re_beg = re_end; } if (*re_end || *string_end) return FALSE;

1 0

Zebediah Figura : winegstreamer: Factor out amt_from_gst_caps().
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: c9a94b4de1be1ebc595ae382af372fdd44a2bb79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9a94b4de1be1ebc595ae382… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:43:28 2019 -0500 winegstreamer: Factor out amt_from_gst_caps(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 69 +++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 42 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c733b6e7e6..397af6ef55 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -121,7 +121,7 @@ BOOL is_wine_thread(void) return pthread_getspecific(wine_gst_key) != NULL; } -static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_caps_audio(const GstCaps *caps, AM_MEDIA_TYPE *amt) { WAVEFORMATEXTENSIBLE *wfe; WAVEFORMATEX *wfx; @@ -182,7 +182,7 @@ static gboolean amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) return TRUE; } -static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) +static gboolean amt_from_gst_caps_video(const GstCaps *caps, AM_MEDIA_TYPE *amt) { VIDEOINFOHEADER *vih; BITMAPINFOHEADER *bih; @@ -271,36 +271,34 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) return TRUE; } +static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) +{ + const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + + if (!strcmp(type, "audio/x-raw")) + return amt_from_gst_caps_audio(caps, mt); + else if (!strcmp(type, "video/x-raw")) + return amt_from_gst_caps_video(caps, mt); + else + { + FIXME("Unhandled type %s.\n", debugstr_a(type)); + return FALSE; + } +} + static gboolean accept_caps_sink(GstPad *pad, GstCaps *caps) { struct gstdemux_source *pin = gst_pad_get_element_private(pad); gchar *caps_str = gst_caps_to_string(caps); - AM_MEDIA_TYPE amt; - GstStructure *arg; - const char *typename; + AM_MEDIA_TYPE mt; gboolean ret; TRACE("pin %p, caps %s.\n", pin, debugstr_a(caps_str)); g_free(caps_str); - arg = gst_caps_get_structure(caps, 0); - typename = gst_structure_get_name(arg); - if (!strcmp(typename, "audio/x-raw")) { - ret = amt_from_gst_caps_audio(caps, &amt); - if (ret) - FreeMediaType(&amt); - TRACE("+%i\n", ret); - return ret; - } else if (!strcmp(typename, "video/x-raw")) { - ret = amt_from_gst_caps_video(caps, &amt); - if (ret) - FreeMediaType(&amt); - TRACE("-%i\n", ret); - return ret; - } else { - FIXME("Unhandled type \"%s\"\n", typename); - return FALSE; - } + if ((ret = amt_from_gst_caps(caps, &mt))) + FreeMediaType(&mt); + return ret; } static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) @@ -308,33 +306,20 @@ static gboolean setcaps_sink(GstPad *pad, GstCaps *caps) struct gstdemux_source *pin = gst_pad_get_element_private(pad); struct gstdemux *filter = impl_from_strmbase_filter(pin->pin.pin.filter); gchar *caps_str = gst_caps_to_string(caps); - GstStructure *arg; - const char *typename; - gboolean ret; TRACE("filter %p, caps %s.\n", filter, debugstr_a(caps_str)); g_free(caps_str); FreeMediaType(&pin->mt); - arg = gst_caps_get_structure(caps, 0); - typename = gst_structure_get_name(arg); - if (!strcmp(typename, "audio/x-raw")) { - ret = amt_from_gst_caps_audio(caps, &pin->mt); - } else if (!strcmp(typename, "video/x-raw")) { - ret = amt_from_gst_caps_video(caps, &pin->mt); - if (ret) - { - VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; - filter->props.cbBuffer = max(filter->props.cbBuffer, vih->bmiHeader.biSizeImage); - } - } else { - FIXME("Unhandled type \"%s\"\n", typename); + if (!amt_from_gst_caps(caps, &pin->mt)) return FALSE; + + if (IsEqualGUID(&pin->mt.formattype, &FORMAT_VideoInfo)) + { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)pin->mt.pbFormat; + filter->props.cbBuffer = max(filter->props.cbBuffer, vih->bmiHeader.biSizeImage); } - TRACE("Linking returned %i for %s\n", ret, typename); - if (!ret) - return FALSE; SetEvent(pin->caps_event); return TRUE; }

1 0

Zebediah Figura : winegstreamer: Use the "format" field to determine the subtype and bit depth.
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: 450d443b89d963774b9d662ce520210d7fa3738d URL: https://source.winehq.org/git/wine.git/?a=commit;h=450d443b89d963774b9d662c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Sep 14 12:43:27 2019 -0500 winegstreamer: Use the "format" field to determine the subtype and bit depth. The "bits" field does not directly describe the total bit depth. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e76ceda0fe..c733b6e7e6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -207,16 +207,35 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) amt->pUnk = NULL; ZeroMemory(vih, sizeof(*vih)); amt->majortype = MEDIATYPE_Video; - if (GST_VIDEO_INFO_IS_RGB(&vinfo)) { - bih->biBitCount = GST_VIDEO_FORMAT_INFO_BITS(vinfo.finfo); - switch (bih->biBitCount) { - case 16: amt->subtype = MEDIASUBTYPE_RGB555; break; - case 24: amt->subtype = MEDIASUBTYPE_RGB24; break; - case 32: amt->subtype = MEDIASUBTYPE_RGB32; break; - default: - FIXME("Unknown bpp %u\n", bih->biBitCount); - heap_free(vih); - return FALSE; + + if (GST_VIDEO_INFO_IS_RGB(&vinfo)) + { + switch (vinfo.finfo->format) + { + case GST_VIDEO_FORMAT_BGRA: + amt->subtype = MEDIASUBTYPE_ARGB32; + bih->biBitCount = 32; + break; + case GST_VIDEO_FORMAT_BGRx: + amt->subtype = MEDIASUBTYPE_RGB32; + bih->biBitCount = 32; + break; + case GST_VIDEO_FORMAT_BGR: + amt->subtype = MEDIASUBTYPE_RGB24; + bih->biBitCount = 24; + break; + case GST_VIDEO_FORMAT_BGR16: + amt->subtype = MEDIASUBTYPE_RGB565; + bih->biBitCount = 16; + break; + case GST_VIDEO_FORMAT_BGR15: + amt->subtype = MEDIASUBTYPE_RGB555; + bih->biBitCount = 16; + break; + default: + FIXME("Unhandled type %s.\n", vinfo.finfo->name); + heap_free(vih); + return FALSE; } bih->biCompression = BI_RGB; } else {

1 0

Alex Henrie : user32: Avoid dead initialization (scan-build).
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: 5644a10e9d27547ab4cbfaa54d50a55a4614457a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5644a10e9d27547ab4cbfaa5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:39:59 2019 -0600 user32: Avoid dead initialization (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 830097570a..31a6168108 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -248,7 +248,7 @@ static void dpiaware_init(void) static const WCHAR permonv2W[] = {'p','e','r','m','o','n','i','t','o','r','v','2',0}; static const WCHAR spacesW[] = {' ','\t','\r','\n',0}; static const WCHAR * const types[] = { unawareW, systemW, permonW, permonv2W }; - WCHAR *p, *start = buffer, *end; + WCHAR *p, *start, *end; ULONG_PTR i; TRACE( "got dpiAwareness=%s\n", debugstr_w(buffer) );

1 0

Alex Henrie : glu32: Avoid dead assignment (scan-build).
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: 533e90ba9bef2ca8c807111c003d048b5c954d44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533e90ba9bef2ca8c807111c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:40:21 2019 -0600 glu32: Avoid dead assignment (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/mesh.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/glu32/mesh.c b/dlls/glu32/mesh.c index 895e9bb743..f545e870be 100644 --- a/dlls/glu32/mesh.c +++ b/dlls/glu32/mesh.c @@ -743,7 +743,6 @@ void __gl_meshCheckMesh( GLUmesh *mesh ) GLUvertex *v, *vPrev; GLUhalfEdge *e, *ePrev; - fPrev = fHead; for( fPrev = fHead ; (f = fPrev->next) != fHead; fPrev = f) { assert( f->prev == fPrev ); e = f->anEdge; @@ -758,7 +757,6 @@ void __gl_meshCheckMesh( GLUmesh *mesh ) } assert( f->prev == fPrev && f->anEdge == NULL && f->data == NULL ); - vPrev = vHead; for( vPrev = vHead ; (v = vPrev->next) != vHead; vPrev = v) { assert( v->prev == vPrev ); e = v->anEdge; @@ -773,7 +771,6 @@ void __gl_meshCheckMesh( GLUmesh *mesh ) } assert( v->prev == vPrev && v->anEdge == NULL && v->data == NULL ); - ePrev = eHead; for( ePrev = eHead ; (e = ePrev->next) != eHead; ePrev = e) { assert( e->Sym->next == ePrev->Sym ); assert( e->Sym != e );

1 0

Zhiyi Zhang : user32: Don't report mirrored slave monitors in EnumDisplayMonitors.
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: ca39b1c22dfa2dd79cde700163c6b04c1caf8146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca39b1c22dfa2dd79cde7001… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 12 21:39:24 2019 +0800 user32: Don't report mirrored slave monitors in EnumDisplayMonitors. Mirrored slave monitors don't get enumerated by EnumDisplayMonitors. For example, if two monitors are in mirrored mode, only one of them is reported by EnumDisplayMonitors. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 09cebc2f62..b407b51811 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3750,7 +3750,8 @@ static BOOL update_monitor_cache(void) HANDLE mutex = NULL; DWORD state_flags; BOOL ret = FALSE; - DWORD i = 0; + BOOL mirrored_slave; + DWORD i = 0, j; DWORD type; /* Update monitor cache from SetupAPI if it's outdated */ @@ -3794,6 +3795,20 @@ static BOOL update_monitor_cache(void) if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) goto fail; + + /* Mirrored slave monitors also don't get enumerated */ + mirrored_slave = FALSE; + for (j = 0; j < monitor_count; j++) + { + if (EqualRect(&monitors[j].rcMonitor, &monitors[monitor_count].rcMonitor)) + { + mirrored_slave = TRUE; + break; + } + } + if (mirrored_slave) + continue; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) goto fail;

1 0

Francois Gouget : glu32: Fix the spelling of some comments.
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: bcd111dd5f91931d56077fb15398dfcd491a280d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcd111dd5f91931d56077fb1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 16 15:59:06 2019 +0200 glu32: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/sweep.c | 4 ++-- dlls/glu32/tess.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/glu32/sweep.c b/dlls/glu32/sweep.c index a909e2be33..0bfc9335cb 100644 --- a/dlls/glu32/sweep.c +++ b/dlls/glu32/sweep.c @@ -542,7 +542,7 @@ static void CallCombine( GLUtesselator *tess, GLUvertex *isect, static void SpliceMergeVertices( GLUtesselator *tess, GLUhalfEdge *e1, GLUhalfEdge *e2 ) /* - * Two vertices with idential coordinates are combined into one. + * Two vertices with identical coordinates are combined into one. * e1->Org is kept, while e2->Org is discarded. */ { @@ -1045,7 +1045,7 @@ static void ConnectRightVertex( GLUtesselator *tess, ActiveRegion *regUp, static void ConnectLeftDegenerate( GLUtesselator *tess, ActiveRegion *regUp, GLUvertex *vEvent ) /* - * The event vertex lies exacty on an already-processed edge or vertex. + * The event vertex lies exactly on an already-processed edge or vertex. * Adding the new vertex involves splicing it into the already-processed * part of the mesh. */ diff --git a/dlls/glu32/tess.c b/dlls/glu32/tess.c index a1bca2e158..6e72d1e3ef 100644 --- a/dlls/glu32/tess.c +++ b/dlls/glu32/tess.c @@ -192,7 +192,7 @@ static void CheckOrientation( GLUtesselator *tess ) /* The "feature merging" is not intended to be complete. There are * special cases where edges are nearly parallel to the sweep line * which are not implemented. The algorithm should still behave - * robustly (ie. produce a reasonable tesselation) in the presence + * robustly (ie. produce a reasonable tessellation) in the presence * of such edges, however it may miss features which could have been * merged. We could minimize this effect by choosing the sweep line * direction to be something unusual (ie. not parallel to one of the

1 0

Alex Henrie : ntdll: Avoid dead initialization (scan-build).
by Alexandre Julliard Sept. 16, 2019

Sept. 16, 2019

Module: wine Branch: master Commit: 6ea282c7e1abd7ab09a5f0a18a437e63f909da96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea282c7e1abd7ab09a5f0a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 15 23:39:43 2019 -0600 ntdll: Avoid dead initialization (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 106fea80a3..d5f2f70273 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -5569,7 +5569,7 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL const WCHAR *settings, WCHAR *buffer, SIZE_T size, SIZE_T *written ) { - ACTIVATION_CONTEXT *actctx = check_actctx( handle ); + ACTIVATION_CONTEXT *actctx; const WCHAR *res; if (flags)

1 0