March 2016 - Wine-Commits - list.winehq.org

Hugh McMaster : reg: Delete the default registry value instead of overwriting it.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 81a030b934f61620415d62a1cae83541dbee0dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a030b934f61620415d62a1c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 2 21:31:18 2016 +1100 reg: Delete the default registry value instead of overwriting it. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 8 ++------ programs/reg/tests/reg.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index bad9274..6ae4aa1 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -525,19 +525,15 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, /* FIXME delete failed */ } } - else if (value_name) + else if (value_name || value_empty) { - if (RegDeleteValueW(subkey,value_name) != ERROR_SUCCESS) + if (RegDeleteValueW(subkey, value_empty ? NULL : value_name) != ERROR_SUCCESS) { RegCloseKey(subkey); output_message(STRING_CANNOT_FIND); return 1; } } - else if (value_empty) - { - RegSetValueExW(subkey,NULL,0,REG_SZ,NULL,0); - } RegCloseKey(subkey); output_message(STRING_SUCCESS); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d03fb2c..93de7ec 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -441,7 +441,7 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hans Leidekker : webservices: Reject field mappings without name or namespace.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 0fd7bb53892d523e35b16051a6331c6b498fe52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd7bb53892d523e35b16051a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:28 2016 +0100 webservices: Reject field mappings without name or namespace. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 5 ++++- dlls/webservices/writer.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 446fa1d..e76eb1b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -787,9 +787,12 @@ static void test_WsWriteElement(void) f.mapping = WS_ATTRIBUTE_FIELD_MAPPING; /* requires localName and ns to be set */ - hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, NULL, 0, NULL ); + hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + f.localName = &localname; f.ns = &ns; hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f29b257..8dbe9c2 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1323,6 +1323,7 @@ static HRESULT write_type_struct_field( struct writer *writer, WS_TYPE_MAPPING m switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING: + if (!desc->localName || !desc->ns) return E_INVALIDARG; if ((hr = write_add_attribute( writer, NULL, desc->localName, desc->ns, FALSE )) != S_OK) return hr; break;

1 0

Michael Stefaniuc : winegstreamer: Avoid a FALSE: TRUE conditional expression.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 8cbb680b449763ac4962e479c975f5bee3f1b8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbb680b449763ac4962e479c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 2 11:17:14 2016 +0100 winegstreamer: Avoid a FALSE:TRUE conditional expression. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 72eeda2..2209c5e 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -844,8 +844,8 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P if (inisfloat) format = inwfe->wBitsPerSample == 64 ? GST_AUDIO_FORMAT_F64LE : GST_AUDIO_FORMAT_F32LE; else - format = gst_audio_format_build_integer(inwfe->wBitsPerSample == 8 ? FALSE : TRUE, - G_LITTLE_ENDIAN, inwfe->wBitsPerSample, indepth); + format = gst_audio_format_build_integer(inwfe->wBitsPerSample != 8, G_LITTLE_ENDIAN, + inwfe->wBitsPerSample, indepth); capsin = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING, gst_audio_format_to_string(format),

1 0

Sebastian Lackner : services: Consistently use InterlockedIncrement to increment refcount.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 20633b292b1af100562ecdd520f11bc169f2d106 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20633b292b1af100562ecdd52… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 2 07:18:30 2016 +0100 services: Consistently use InterlockedIncrement to increment refcount. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 2 +- programs/services/services.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index dd44965..0b194cf 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -114,7 +114,7 @@ static void run_after_timeout(void (*func)(struct service_entry*), struct servic return; } - service->ref_count++; + InterlockedIncrement(&service->ref_count); elem->func = func; elem->service_entry = service; diff --git a/programs/services/services.c b/programs/services/services.c index 53a3846..8489f17 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -299,7 +299,7 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) services_list = slist_new; } services_list[i] = service; - service->ref_count++; + InterlockedIncrement(&service->ref_count); i++; } }

1 0

Jens Reyer : winemaker: Fix macro-not-defined errors from man.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 93fc6826c210ebb3e8ee11207d39515b954858cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=93fc6826c210ebb3e8ee11207… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 1 19:49:42 2016 +0100 winemaker: Fix macro-not-defined errors from man. ' characters at the start of a line indicate a groff command. If used in error, the affected lines get ignored. Therefore add a zero-width space and reformat another paragraph to keep the literal meaning. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/winemaker/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in index 2446a4f..e4df360 100644 --- a/tools/winemaker/winemaker.de.UTF-8.man.in +++ b/tools/winemaker/winemaker.de.UTF-8.man.in @@ -58,7 +58,7 @@ im Includepfad suchen und die entsprechende Zeile, falls nötig, mit der korrekt Groß-/Kleinschreibweise austauschen. .PP - Winemaker wird ebenso andere, exotischere Probleme wie die Benutzung von -'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. +\&'#pragma pack', 'afxres.h' in nicht-MFC-Projekten und mehr untersuchen. Sollte etwas ungwöhnliches vorkommen, wird Winemaker Sie warnen. .PP - Winemaker kann eine ganze Verzeichnisstruktur auf einmal durchsuchen, @@ -198,9 +198,9 @@ $ winemaker --lower-uppercase -DSTRICT . Damit scannt Winemaker das aktuelle Verzeichnis und die Unterverzeichnisse nach Quellcodedateien. Jede Datei und jedes Verzeichnis, das ganz in Großbuchstaben geschrieben ist, wird in Kleinbuchstaben umbenannt. Danach werden alle Quellcodedateien -an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. -'-DSTRICT' gibt an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode -zu kompilieren. Letztendlich wird Winemaker die globale Makefile erzeugen. +an die Kompilierung mit Winelib angepasst und Makefiles erzeugt. '-DSTRICT' gibt +an, dass das STRICT-Makro gesetzt sein muss, um diesen Quellcode zu kompilieren. +Letztendlich wird Winemaker die globale Makefile erzeugen. .PP Der nächste Schritt wäre dann: .PP

1 0

Jens Reyer : loader: Fix macro-not-defined error from man.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 486194e41d23b9abaf30d322bf13cdc1bf72920d URL: http://source.winehq.org/git/wine.git/?a=commit;h=486194e41d23b9abaf30d322b… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Tue Mar 1 19:49:41 2016 +0100 loader: Fix macro-not-defined error from man. ' characters at the start of a line indicate a groff command. If used in error, the affected lines get ignored. Therefore reformat the paragraph to keep the literal meaning. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.pl.UTF-8.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 4aebf68..1718d65 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -263,8 +263,8 @@ symboliczene dowiązanie w formie $WINEPREFIX/dosdevices/com1 -> /dev/ttyS0. Napędy DOS również są określone przez dowiązania symboliczne; Dla przykładu jeżeli napęd D: odpowiadałby napędowi CDROM zamontowanemu w /mnt/cdrom, miałbyś dowiązanie symboliczne $WINEPREFIX/dosdevices/d: -> /mnt/cdrom. Urządzenia Uniksowe odpowiadające -napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast -':'. Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane +napędom DOS mogą być określone w ten sam sposób, z użyciem '::' zamiast ':'. +Tak więc dla poprzedniego przykładu, jeżeli urządzenie CDROM byłoby zamontowane z /dev/hdc, to odpowiadające dowiązanie symboliczne wyglądałoby następująco $WINEPREFIX/dosdevices/d:: -> /dev/hdc. .SH AUTORZY

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_2d_GetLevelDesc().
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 47c20218b7a57b65d0d2b6894a4c2d9d09f25e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c20218b7a57b65d0d2b6894… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:46 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_2d_GetLevelDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 9cf10ae..cdb7193 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -285,21 +285,16 @@ static void WINAPI d3d9_texture_2d_GenerateMipSubLevels(IDirect3DTexture9 *iface static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - struct wined3d_resource *sub_resource; - HRESULT hr = D3D_OK; + struct wined3d_sub_resource_desc wined3d_desc; + HRESULT hr; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) - hr = D3DERR_INVALIDCALL; - else + if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc))) { - struct wined3d_resource_desc wined3d_desc; - - wined3d_resource_get_desc(sub_resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_surface_GetDesc().
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 7fad350ccfb91bf7921895d6e4e80423171764a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fad350ccfb91bf7921895d6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:44 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_surface_GetDesc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index c3032dc..a0a1f27 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -207,18 +207,16 @@ static HRESULT WINAPI d3d9_surface_GetContainer(IDirect3DSurface9 *iface, REFIID static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_DESC *desc) { struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *sub_resource; + struct wined3d_sub_resource_desc wined3d_desc; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx); - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_SURFACE; desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; desc->Pool = wined3d_desc.pool; desc->MultiSampleType = wined3d_desc.multisample_type;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_ColorFill().
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: fc87c40c3ed3294b3e6efcd3a2f86603fcec6b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc87c40c3ed3294b3e6efcd3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 1 19:31:43 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_device_ColorFill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 718de91..918e1e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1416,20 +1416,19 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, }; struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *surface_impl = unsafe_impl_from_IDirect3DSurface9(surface); - struct wined3d_resource *wined3d_resource; - struct wined3d_resource_desc desc; + struct wined3d_sub_resource_desc desc; HRESULT hr; TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color); wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_texture_get_sub_resource(surface_impl->wined3d_texture, surface_impl->sub_resource_idx))) + if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture, + surface_impl->sub_resource_idx, &desc))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - wined3d_resource_get_desc(wined3d_resource, &desc); if (desc.pool != WINED3D_POOL_DEFAULT) {

1 0

Matteo Bruni : makedep: Use an unsigned constant in hash_filename.
by Alexandre Julliard March 2, 2016

March 2, 2016

Module: wine Branch: master Commit: 5cb8f0d0dd7684e67069013e57be4b9aa4b4c1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb8f0d0dd7684e67069013e5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:53:58 2016 +0100 makedep: Use an unsigned constant in hash_filename. This fixes a "warning: this decimal constant is unsigned only in ISO C90" with gcc 4.9.3. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 298ec04..8cbba1b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -729,7 +729,7 @@ static char *get_line( FILE *file ) static unsigned int hash_filename( const char *name ) { /* FNV-1 hash */ - unsigned int ret = 2166136261; + unsigned int ret = 2166136261u; while (*name) ret = (ret * 16777619) ^ *name++; return ret % HASH_SIZE; }

1 0