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

Matteo Bruni : wined3d: Fix a typo in a trace in context_create().
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: f298d30b39c78d4b7463a766d4336c92c1d18615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f298d30b39c78d4b7463a766d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 10 19:29:40 2015 +0100 wined3d: Fix a typo in a trace in context_create(). --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fa8d768..af29e69 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1465,7 +1465,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!(hdc = GetDC(swapchain->win_handle))) { - WARN("Failed to retireve device context, trying swapchain backup.\n"); + WARN("Failed to retrieve device context, trying swapchain backup.\n"); if ((hdc = swapchain_get_backup_dc(swapchain))) hdc_is_private = TRUE;

1 0

Austin English : include: Add ASN1*string* definitions/functions.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: cdea6c8c64a353d0d4cd4372b7eea170a13a93a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdea6c8c64a353d0d4cd4372b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 10 23:24:52 2015 -0500 include: Add ASN1*string* definitions/functions. --- include/msasn1.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/msasn1.h b/include/msasn1.h index 6b7bdfb..757236d 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -64,6 +64,30 @@ typedef struct tagASN1BerFunArr_t { const ASN1BerDecFun_t *apfnDecoder; } ASN1BerFunArr_t; +typedef struct tagASN1bitstring_t +{ + ASN1uint32_t length; + ASN1octet_t *value; +} ASN1bitstring_t; + +typedef struct tagASN1charstring_t +{ + ASN1uint32_t length; + ASN1char_t *value; +} ASN1charstring_t; + +typedef struct tagASN1char16string_t +{ + ASN1uint32_t length; + ASN1char16_t *value; +} ASN1char16string_t; + +typedef struct tagASN1char32string_t +{ + ASN1uint32_t length; + ASN1char32_t *value; +} ASN1char32string_t; + typedef enum { ASN1_PER_RULE_ALIGNED = 0x0001,ASN1_PER_RULE_UNALIGNED = 0x0002,ASN1_PER_RULE = ASN1_PER_RULE_ALIGNED | ASN1_PER_RULE_UNALIGNED, ASN1_BER_RULE_BER = 0x0100,ASN1_BER_RULE_CER = 0x0200,ASN1_BER_RULE_DER = 0x0400, @@ -106,6 +130,12 @@ typedef struct tagASN1module_t { }; } *ASN1module_t; +typedef struct tagASN1octetstring_t +{ + ASN1uint32_t length; + ASN1octet_t *value; +} ASN1octetstring_t; + typedef enum tagASN1option_e { ASN1OPT_CHANGE_RULE = 0x101, @@ -131,6 +161,12 @@ typedef struct tagASN1optionparam_t { }; } ASN1optionparam_t, ASN1optionparam_s; +typedef struct tagASN1wstring_t +{ + ASN1uint32_t length; + WCHAR *value; +} ASN1wstring_t; + void WINAPI ASN1_CloseDecoder(ASN1decoding_t); void WINAPI ASN1_CloseEncoder(ASN1encoding_t); void WINAPI ASN1_CloseEncoder2(ASN1encoding_t); @@ -146,6 +182,22 @@ ASN1error_e WINAPI ASN1_GetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); ASN1error_e WINAPI ASN1_GetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); ASN1error_e WINAPI ASN1_SetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); ASN1error_e WINAPI ASN1_SetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); +int WINAPI ASN1bitstring_cmp(ASN1bitstring_t*,ASN1bitstring_t*); +void WINAPI ASN1bitstring_free(ASN1bitstring_t*); +int WINAPI ASN1char16string_cmp(ASN1char16string_t*,ASN1char16string_t*); +void WINAPI ASN1char16string_free(ASN1char16string_t*); +int WINAPI ASN1char32string_cmp(ASN1char32string_t*,ASN1char32string_t*); +void WINAPI ASN1char32string_free(ASN1char32string_t*); +int WINAPI ASN1charstring_cmp(ASN1charstring_t*,ASN1charstring_t*); +void WINAPI ASN1charstring_free(ASN1charstring_t*); +int WINAPI ASN1octetstring_cmp(ASN1octetstring_t*,ASN1octetstring_t*); +void WINAPI ASN1octetstring_free(ASN1octetstring_t*); +void WINAPI ASN1utf8string_free(ASN1wstring_t*); +int WINAPI ASN1ztchar16string_cmp(ASN1ztchar16string_t*,ASN1ztchar16string_t*); +void WINAPI ASN1ztchar16string_free(ASN1ztchar16string_t*); +void WINAPI ASN1ztchar32string_free(ASN1ztchar32string_t*); +int WINAPI ASN1ztcharstring_cmp(ASN1ztcharstring_t*,ASN1ztcharstring_t*); +void WINAPI ASN1ztcharstring_free(ASN1charstring_t*); #ifdef __cplusplus }

1 0

Stefan Dösinger : ddraw: Set DDPF_BUMPLUMINANCE for V5U5L6 and X8L8V8U8.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: b07b350286ab489c0026163aa92964420cebb994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07b350286ab489c0026163aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:44 2015 +0100 ddraw: Set DDPF_BUMPLUMINANCE for V5U5L6 and X8L8V8U8. --- dlls/ddraw/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index ad271bc..f22db3e 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -310,7 +310,7 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_f break; case WINED3DFMT_R5G5_SNORM_L6_UNORM: - DDPixelFormat->dwFlags = DDPF_BUMPDUDV; + DDPixelFormat->dwFlags = DDPF_BUMPDUDV | DDPF_BUMPLUMINANCE; DDPixelFormat->dwFourCC = 0; DDPixelFormat->u1.dwBumpBitCount = 16; DDPixelFormat->u2.dwBumpDuBitMask = 0x0000001f; @@ -320,7 +320,7 @@ void ddrawformat_from_wined3dformat(DDPIXELFORMAT *DDPixelFormat, enum wined3d_f break; case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - DDPixelFormat->dwFlags = DDPF_BUMPDUDV; + DDPixelFormat->dwFlags = DDPF_BUMPDUDV | DDPF_BUMPLUMINANCE; DDPixelFormat->dwFourCC = 0; DDPixelFormat->u1.dwBumpBitCount = 32; DDPixelFormat->u2.dwBumpDuBitMask = 0x000000ff;

1 0

Michael Stefaniuc : mshtml/tests: '%' doesn' t needs escaping in a C string (sparse).
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: b211f9123bc0e062ea52f87f7df19bd513ca5e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b211f9123bc0e062ea52f87f7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 11 11:00:10 2015 +0100 mshtml/tests: '%' doesn't needs escaping in a C string (sparse). --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f083bae..fca96a0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7764,8 +7764,8 @@ static void test_elems(IHTMLDocument2 *doc) test_anchor_put_search((IUnknown*)elem, "?????word???press"); test_anchor_search((IUnknown*)elem, "?????word???press", FALSE); - test_anchor_put_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD"); /* encoded cjk characters */ - test_anchor_search((IUnknown*)elem, "?q=\%E4\%BD\%A0\%E5\%A5\%BD", FALSE); + test_anchor_put_search((IUnknown*)elem, "?q=%E4%BD%A0%E5%A5%BD"); /* encoded cjk characters */ + test_anchor_search((IUnknown*)elem, "?q=%E4%BD%A0%E5%A5%BD", FALSE); test_anchor_put_search((IUnknown*)elem, "?how?old=are"); test_anchor_search((IUnknown*)elem, "?how?old=are", FALSE);

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture3d_SetPrivateData().
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 721d399038eeb99aaff7f1e84967ae736ca7931e URL: http://source.winehq.org/git/wine.git/?a=commit;h=721d399038eeb99aaff7f1e84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:51 2015 +0100 d3d10core: Implement d3d10_texture3d_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/texture.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 51d021b..266e1bd 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -107,6 +107,7 @@ struct d3d10_texture3d ID3D10Texture3D ID3D10Texture3D_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE3D_DESC desc; ID3D10Device1 *device; diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 4b32f3d..0ddba7f 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -404,6 +404,9 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface) static void STDMETHODCALLTYPE d3d10_texture3d_wined3d_object_released(void *parent) { + struct d3d10_texture3d *texture = parent; + + wined3d_private_store_cleanup(&texture->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -449,10 +452,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateDataInterface(ID3D10Texture3D *iface, @@ -567,6 +572,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; + wined3d_private_store_init(&texture->private_store); texture->desc = *desc; wined3d_desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; @@ -587,6 +593,7 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_devic &d3d10_texture3d_wined3d_parent_ops, &texture->wined3d_texture))) { WARN("Failed to create wined3d texture, hr %#x.\n", hr); + wined3d_private_store_cleanup(&texture->private_store); return hr; } texture->desc.MipLevels = levels;

1 0

Henri Verbeet : d3d10core: Implement d3d10_texture3d_GetPrivateData().
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: c840645bc22e2c818751ff250a310edd85c31850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c840645bc22e2c818751ff250… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 11 11:13:53 2015 +0100 d3d10core: Implement d3d10_texture3d_GetPrivateData(). --- dlls/d3d10core/texture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 67ccbb5..46a3af8 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -443,10 +443,12 @@ static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_texture3d_SetPrivateData(ID3D10Texture3D *iface,

1 0

Francois Gouget : dsound: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 359fbe829a6ffa7c3d13df306cfac35dd8f8c472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359fbe829a6ffa7c3d13df306… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:30:29 2015 +0100 dsound: Remove unneeded NONAMELESSXXX directives. --- dlls/dsound/buffer.c | 2 -- dlls/dsound/capture.c | 3 +-- dlls/dsound/dsound.c | 3 +-- dlls/dsound/dsound_convert.c | 2 -- dlls/dsound/dsound_main.c | 2 +- dlls/dsound/duplex.c | 2 -- dlls/dsound/mixer.c | 3 +-- dlls/dsound/primary.c | 2 +- dlls/dsound/propset.c | 4 ++-- dlls/dsound/sound3d.c | 2 -- 10 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index e581c5a..4e84d17 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -23,8 +23,6 @@ #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 17b1a04..0764261 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -28,8 +28,7 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7e53f91..824f581 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -26,8 +26,7 @@ #include <math.h> #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 5ac7a10..5accba6 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -39,8 +39,6 @@ #include <stdarg.h> #include <math.h> -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index d6be926..cb46301 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -35,8 +35,8 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index a2bc726..b18972e 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -22,8 +22,6 @@ #include <stdarg.h> -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS #include "windef.h" #include "winbase.h" diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index db1152c..8dbd15a 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -27,8 +27,7 @@ #include <math.h> /* Insomnia - pow() function */ #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "mmsystem.h" diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 52d00f9..3f8a478 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -26,8 +26,8 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 6c0b9f4..b89c45a 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION -#include <stdarg.h> #include "windef.h" #include "winbase.h" diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 439cfac..9a0226a 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -40,8 +40,6 @@ #include <stdarg.h> #include <math.h> /* Insomnia - pow() function */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winuser.h"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 3535f6f4a74639c3dbed5922f77adf390d877c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3535f6f4a74639c3dbed5922f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 11 11:31:54 2015 +0100 po: Update French translation. --- po/fr.po | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9826d64..d0bdf3e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3160,10 +3160,8 @@ msgid "&View Source" msgstr "Afficher la &source" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Propriétés" +msgstr "Proprié&tés" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -11649,10 +11647,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Erreur : paramètre de ligne de commande invalide\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Erreur : impossible d'ajouter des clés à une machine distante\n" +msgstr "Erreur : impossible d'accéder à une machine distante\n" #: reg.rc:38 msgid "" @@ -11662,10 +11658,8 @@ msgstr "" "spécifiée\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Type non pris en charge.\n" +msgstr "Erreur : type non pris en charge\n" #: regedit.rc:34 msgid "&Registry"

1 0

Francois Gouget : dmloader: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: 41768edec4069d454beff9ddb0dfb88b40f43e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41768edec4069d454beff9ddb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 11 11:29:46 2015 +0100 dmloader: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/dmloader/loaderstream.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index cd57c97..855203e 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -45,7 +45,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "dmloader_private.h"

1 0

Stefan Dösinger : d3d8/tests: Add a test for signed formats.
by Alexandre Julliard March 11, 2015

March 11, 2015

Module: wine Branch: master Commit: a46cad41b3be30b6ffd30038a4782b18812c62ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46cad41b3be30b6ffd30038a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 11 10:33:42 2015 +0100 d3d8/tests: Add a test for signed formats. --- dlls/d3d8/tests/visual.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 291 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a46cad41b3be30b6ffd30…

1 0