February 2017 - Wine-Commits

Alistair Leslie-Hughes : dpnet: Handle unknown service GUID in enum_services_providers.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 83cce966f4cc4692035b18bf0766caa630702b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83cce966f4cc4692035b18bf0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 24 06:45:29 2017 +0000 dpnet: Handle unknown service GUID in enum_services_providers. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 4 ++-- dlls/dpnet/tests/client.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 91a7e3e..e8a60c3 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -147,10 +147,10 @@ HRESULT enum_services_providers(const GUID * const service, DPN_SERVICE_PROVIDER if(!returned || !buf_size) return E_POINTER; - *returned = 0; - if(!service) { + *returned = 0; + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, serviceproviders, 0, KEY_READ, &key); if(res == ERROR_FILE_NOT_FOUND) return DPNERR_DOESNOTEXIST; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index ee2722b..6503bc3 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -211,6 +211,12 @@ static void test_enum_service_providers(void) } ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Client_EnumServiceProviders(client, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); } static void test_enum_hosts(void) @@ -571,6 +577,12 @@ static void test_enum_service_providers_peer(void) serv_prov_info -= items; /* set pointer back */ ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Peer_EnumServiceProviders(peer, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); } static void test_enum_hosts_peer(void)

1 0

Zebediah Figura : storage.dll16: Fix get_nth_next_small_blocknr.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: e3781c84ab24772b84dc8e0f9e92581ba44c1daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3781c84ab24772b84dc8e0f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 23 13:34:07 2017 -0600 storage.dll16: Fix get_nth_next_small_blocknr. Dividing the initial value of -1 by 128 yields 0, causing the assertion to fail whenever the function is called with nr > 0 and blocknr < 128. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 5969333..865411f 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -600,7 +600,7 @@ STORAGE_get_next_small_blocknr(stream_access16 *str,int blocknr) { */ static int STORAGE_get_nth_next_small_blocknr(stream_access16*str,int blocknr,int nr) { - int lastblocknr=-1; + int lastblocknr=-129; BYTE block[BIGSIZE]; LPINT sbd = (LPINT)block; struct storage_header sth;

1 0

Henri Verbeet : wined3d: Support downloading depth textures in surface_load_sysmem().
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 5895f77474d39ab0506323bf038837b7d07b6c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5895f77474d39ab0506323bf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:29 2017 +0100 wined3d: Support downloading depth textures in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 399f436..8b5f5ce 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2475,13 +2475,6 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[sub_resource_idx]; - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - { - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) @@ -2498,7 +2491,8 @@ static BOOL surface_load_sysmem(struct wined3d_surface *surface, return TRUE; } - if (sub_resource->locations & WINED3D_LOCATION_DRAWABLE) + if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { read_from_framebuffer(surface, context, dst_location); return TRUE;

1 0

André Hentschel : hhcrtl.ocx: Fix some spec file entries.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: e5a12b773ce2122a77f7e9359a514078863cc678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a12b773ce2122a77f7e9359… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:17 2017 +0100 hhcrtl.ocx: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.ocx.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.ocx.spec b/dlls/hhctrl.ocx/hhctrl.ocx.spec index e9cd118..931f93a 100644 --- a/dlls/hhctrl.ocx/hhctrl.ocx.spec +++ b/dlls/hhctrl.ocx/hhctrl.ocx.spec @@ -1,6 +1,6 @@ 13 stdcall doWinMain(long ptr) -14 stdcall HtmlHelpA(ptr ptr long long) -15 stdcall HtmlHelpW(ptr ptr long long) +14 stdcall HtmlHelpA(ptr str long long) +15 stdcall HtmlHelpW(ptr wstr long long) @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Francois Gouget : xmllite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: d369857cb4dce467b27606cba5bde4c58b790e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d369857cb4dce467b27606cba… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:26:51 2017 +0100 xmllite: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their parameter names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/xmllite_private.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 3f03379..fa29265 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -22,14 +22,15 @@ #define __XMLLITE_PRIVATE__ /* memory allocation functions */ -static inline void *heap_alloc(size_t len) + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_realloc(void *mem, size_t len) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, mem, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

André Hentschel : propsys: Fix PSGetPropertyDescriptionListFromString spec file entry.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 8e273c8f8a6150c299b53f0ff036fd87f542aa5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e273c8f8a6150c299b53f0ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:11 2017 +0100 propsys: Fix PSGetPropertyDescriptionListFromString spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 674df2cb..582308f 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -81,7 +81,7 @@ @ stub PSGetNamedPropertyFromPropertyStorage @ stdcall PSGetPropertyDescription(ptr ptr ptr) @ stub PSGetPropertyDescriptionByName -@ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) +@ stdcall PSGetPropertyDescriptionListFromString(wstr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName @ stdcall PSGetPropertySystem(ptr ptr)

1 0

André Hentschel : xmllite: Fix CreateXmlReaderInputWithEncodingName spec file entry.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 05956e6d77bf64c62efd4315d83699b0f289afda URL: http://source.winehq.org/git/wine.git/?a=commit;h=05956e6d77bf64c62efd4315d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:07 2017 +0100 xmllite: Fix CreateXmlReaderInputWithEncodingName spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/xmllite.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/xmllite.spec b/dlls/xmllite/xmllite.spec index d6ee017..574ed98 100644 --- a/dlls/xmllite/xmllite.spec +++ b/dlls/xmllite/xmllite.spec @@ -1,6 +1,6 @@ @ stdcall CreateXmlReader(ptr ptr ptr) @ stub CreateXmlReaderInputWithEncodingCodePage -@ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr) +@ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr wstr long wstr ptr) @ stdcall CreateXmlWriter(ptr ptr ptr) @ stdcall CreateXmlWriterOutputWithEncodingCodePage(ptr ptr long ptr) @ stdcall CreateXmlWriterOutputWithEncodingName(ptr ptr wstr ptr)

1 0

André Hentschel : serialui: Fix some spec file entries.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: e4448f24e5f7a9073128c62e610484e6f5518a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4448f24e5f7a9073128c62e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:10 2017 +0100 serialui: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/serialui.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec index 7be42ae..b5e92bb 100644 --- a/dlls/serialui/serialui.spec +++ b/dlls/serialui/serialui.spec @@ -1,6 +1,6 @@ 1 stdcall EnumPropPages(ptr ptr long) -2 stdcall drvCommConfigDialogW(ptr long ptr) -3 stdcall drvCommConfigDialogA(ptr long ptr) +2 stdcall drvCommConfigDialogW(wstr long ptr) +3 stdcall drvCommConfigDialogA(str long ptr) 4 stdcall drvSetDefaultCommConfigW(wstr ptr long) 5 stdcall drvSetDefaultCommConfigA(str ptr long) 6 stdcall drvGetDefaultCommConfigW(wstr ptr ptr)

1 0

Henri Verbeet : wined3d: Support uploading depth textures in surface_load_texture().
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: cc65b9045112c19054a75f4d31cff77e5d5e4746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc65b9045112c19054a75f4d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:30 2017 +0100 wined3d: Support uploading depth textures in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8b5f5ce..1ac2e5f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2549,16 +2549,12 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, struct wined3d_format format; POINT dst_point = {0, 0}; RECT src_rect; + BOOL depth; + depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; sub_resource = surface_get_sub_resource(surface); - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - { - FIXME("Unimplemented copy from %s for depth/stencil buffers.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + if (!depth && wined3d_settings.offscreen_rendering_mode != ORM_FBO && wined3d_resource_is_offscreen(&texture->resource) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { @@ -2571,7 +2567,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, height = wined3d_texture_get_level_height(texture, surface->texture_level); SetRect(&src_rect, 0, 0, width, height); - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) + if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, texture->resource.usage, texture->resource.pool, texture->resource.format, @@ -2587,7 +2583,7 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, return TRUE; } - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) + if (!depth && sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED) && (!srgb || (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, texture->resource.usage, texture->resource.pool, texture->resource.format,

1 0

André Hentschel : odbccp32: Fix some spec file entries.
by Alexandre Julliard Feb. 24, 2017

Feb. 24, 2017

Module: wine Branch: master Commit: 093d8702b9682817d1ba72edcc546e7b54e19241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=093d8702b9682817d1ba72edc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 23:23:13 2017 +0100 odbccp32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/odbccp32.spec b/dlls/odbccp32/odbccp32.spec index c4be93f..2717d22 100644 --- a/dlls/odbccp32/odbccp32.spec +++ b/dlls/odbccp32/odbccp32.spec @@ -19,7 +19,7 @@ 20 stdcall SQLRemoveDriver(str long ptr) 21 stdcall SQLConfigDriver(ptr long str str ptr long ptr) 22 stdcall SQLInstallerError(long ptr ptr long ptr) -23 stdcall SQLPostInstallerError(long ptr) +23 stdcall SQLPostInstallerError(long str) 24 stdcall SQLReadFileDSN(str str str ptr long ptr) 25 stdcall SQLWriteFileDSN(str str str str) 26 stdcall SQLInstallDriverEx(str str str long ptr long ptr) @@ -47,7 +47,7 @@ 220 stdcall SQLRemoveDriverW(wstr long ptr) 221 stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) 222 stdcall SQLInstallerErrorW(long ptr ptr long ptr) -223 stdcall SQLPostInstallerErrorW(long ptr) +223 stdcall SQLPostInstallerErrorW(long wstr) 224 stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr) 225 stdcall SQLWriteFileDSNW(wstr wstr wstr wstr) 226 stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr)

1 0