July 2012 - Wine-commits - list.winehq.org

Jacek Caban : vbscript: Fixed locale-related test failures.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: 2be12eacaf616907a79354265bbb0f51d974e70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be12eacaf616907a79354265… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 18 13:36:58 2012 +0200 vbscript: Fixed locale-related test failures. --- dlls/vbscript/tests/api.vbs | 8 ++++---- dlls/vbscript/tests/run.c | 28 +++++++++++++++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 4914e7a..fd339dd 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -154,8 +154,8 @@ TestUCase "test", "TEST" TestUCase "123aBC?", "123ABC?" TestUCase "", "" TestUCase 1, "1" -TestUCase true, "TRUE" -TestUCase 0.123, "0.123" +if isEnglishLang then TestUCase true, "TRUE" +TestUCase 0.123, doubleAsString(0.123) TestUCase Empty, "" Call ok(getVT(UCase(Null)) = "VT_NULL", "getVT(UCase(Null)) = " & getVT(UCase(Null))) @@ -168,8 +168,8 @@ TestLCase "test", "test" TestLCase "123aBC?", "123abc?" TestLCase "", "" TestLCase 1, "1" -TestLCase true, "true" -TestLCase 0.123, "0.123" +if isEnglishLang then TestLCase true, "true" +TestLCase 0.123, doubleAsString(0.123) TestLCase Empty, "" Call ok(getVT(LCase(Null)) = "VT_NULL", "getVT(LCase(Null)) = " & getVT(LCase(Null))) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 91c45e6..8569d71 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -82,6 +82,7 @@ DEFINE_EXPECT(Next); #define DISPID_GLOBAL_PROPARGPUT 1011 #define DISPID_GLOBAL_PROPARGPUT1 1012 #define DISPID_GLOBAL_COLLOBJ 1013 +#define DISPID_GLOBAL_DOUBLEASSTRING 1014 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -90,7 +91,7 @@ DEFINE_EXPECT(Next); static const WCHAR testW[] = {'t','e','s','t',0}; -static BOOL strict_dispid_check; +static BOOL strict_dispid_check, is_english; static const char *test_name = "(null)"; static int test_counter; @@ -815,6 +816,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_COUNTER; return S_OK; } + if(!strcmp_wa(bstrName, "doubleAsString")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_DOUBLEASSTRING; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -905,12 +911,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(pei != NULL, "pei == NULL\n"); V_VT(pvarRes) = VT_BOOL; - if(is_lang_english()) { - V_BOOL(pvarRes) = VARIANT_TRUE; - }else { - skip("Skipping some tests in non-English UIs\n"); - V_BOOL(pvarRes) = VARIANT_FALSE; - } + V_BOOL(pvarRes) = is_english ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; case DISPID_GLOBAL_VBVAR: @@ -1069,6 +1070,15 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_I2; V_I2(pvarRes) = test_counter++; return S_OK; + + case DISPID_GLOBAL_DOUBLEASSTRING: + ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(V_VT(pdp->rgvarg) == VT_R8, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + + V_VT(pvarRes) = VT_BSTR; + return VarBstrFromR8(V_R8(pdp->rgvarg), 0, 0, &V_BSTR(pvarRes)); } ok(0, "unexpected call %d\n", id); @@ -1590,6 +1600,10 @@ START_TEST(run) int argc; char **argv; + is_english = is_lang_english(); + if(!is_english) + skip("Skipping some tests in non-English UIs\n"); + argc = winetest_get_mainargs(&argv); CoInitialize(NULL);

1 0

Jacek Caban : vbscript: Use current locale in to_string.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: 6bef4da592c8be4857dc0fa179a3139835266d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bef4da592c8be4857dc0fa17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 18 13:37:07 2012 +0200 vbscript: Use current locale in to_string. --- dlls/vbscript/global.c | 28 +++++++++------------------- 1 files changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index c3b650f..55c1acc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -124,26 +124,16 @@ static HRESULT to_int(VARIANT *v, int *ret) static HRESULT to_string(VARIANT *v, BSTR *ret) { - static const WCHAR trueW[] = {'T','r','u','e',0}; - static const WCHAR falseW[] = {'F','a','l','s','e',0}; + VARIANT dst; + HRESULT hres; - switch(V_VT(v)) { - case VT_BOOL: - *ret = SysAllocString(V_BOOL(v) ? trueW : falseW); - return *ret ? S_OK : E_OUTOFMEMORY; - default: { - VARIANT dst; - HRESULT hres; - - V_VT(&dst) = VT_EMPTY; - hres = VariantChangeTypeEx(&dst, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); - if(FAILED(hres)) - return hres; + V_VT(&dst) = VT_EMPTY; + hres = VariantChangeType(&dst, v, VARIANT_LOCALBOOL, VT_BSTR); + if(FAILED(hres)) + return hres; - *ret = V_BSTR(&dst); - return S_OK; - } - } + *ret = V_BSTR(&dst); + return S_OK; } static IUnknown *create_object(script_ctx_t *ctx, const WCHAR *progid)

1 0

Henri Verbeet : include: Add some more SP_PROT_* flags.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: dde180fee38b3f3c33bd535e57497c4fdfd50a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde180fee38b3f3c33bd535e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 15:52:29 2012 +0200 include: Add some more SP_PROT_* flags. --- include/schannel.h | 58 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 12 deletions(-) diff --git a/include/schannel.h b/include/schannel.h index d522edf..2e1a9f6 100644 --- a/include/schannel.h +++ b/include/schannel.h @@ -104,19 +104,53 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; #define SCHANNEL_ALERT 2 #define SCHANNEL_SESSION 3 -#define SP_PROT_TLS1_CLIENT 128 -#define SP_PROT_TLS1_SERVER 64 -#define SP_PROT_SSL3_CLIENT 32 -#define SP_PROT_SSL3_SERVER 16 -#define SP_PROT_SSL2_CLIENT 8 -#define SP_PROT_SSL2_SERVER 4 -#define SP_PROT_PCT1_CLIENT 2 -#define SP_PROT_PCT1_SERVER 1 - -#define SP_PROT_TLS1 (SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_SERVER) -#define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT | SP_PROT_SSL3_SERVER) -#define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT | SP_PROT_SSL2_SERVER) -#define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT | SP_PROT_PCT1_SERVER) +#define SP_PROT_ALL 0xffffffff +#define SP_PROT_UNI_CLIENT 0x80000000 +#define SP_PROT_UNI_SERVER 0x40000000 +#define SP_PROT_TLS1_2_CLIENT 0x00000800 +#define SP_PROT_TLS1_2_SERVER 0x00000400 +#define SP_PROT_TLS1_1_CLIENT 0x00000200 +#define SP_PROT_TLS1_1_SERVER 0x00000100 +#define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT +#define SP_PROT_TLS1_0_SERVER SP_PROT_TLS1_SERVER +#define SP_PROT_TLS1_CLIENT 0x00000080 +#define SP_PROT_TLS1_SERVER 0x00000040 +#define SP_PROT_SSL3_CLIENT 0x00000020 +#define SP_PROT_SSL3_SERVER 0x00000010 +#define SP_PROT_SSL2_CLIENT 0x00000008 +#define SP_PROT_SSL2_SERVER 0x00000004 +#define SP_PROT_PCT1_CLIENT 0x00000002 +#define SP_PROT_PCT1_SERVER 0x00000001 +#define SP_PROT_NONE 0x00000000 + +#define SP_PROT_UNI (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER) +#define SP_PROT_TLS1_2 (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_TLS1_1 (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER) +#define SP_PROT_TLS1_0 (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_0_SERVER) +#define SP_PROT_TLS1 (SP_PROT_TLS1_CLIENT | SP_PROT_TLS1_SERVER) +#define SP_PROT_SSL3 (SP_PROT_SSL3_CLIENT | SP_PROT_SSL3_SERVER) +#define SP_PROT_SSL2 (SP_PROT_SSL2_CLIENT | SP_PROT_SSL2_SERVER) +#define SP_PROT_PCT1 (SP_PROT_PCT1_CLIENT | SP_PROT_PCT1_SERVER) + +#define SP_PROT_SSL3TLS1_CLIENTS (SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_CLIENT) +#define SP_PROT_SSL3TLS1_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_SERVER) +#define SP_PROT_SSL3TLS1_X_CLIENTS (SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_X_CLIENT) +#define SP_PROT_SSL3TLS1_X_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_X_SERVER) +#define SP_PROT_TLS1_X_CLIENT (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) +#define SP_PROT_TLS1_X_SERVER (SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_TLS1_1PLUS_CLIENT (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT) +#define SP_PROT_TLS1_1PLUS_SERVER (SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER) +#define SP_PROT_CLIENTS (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \ + | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT) +#define SP_PROT_SERVERS (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \ + | SP_PROT_TLS1_SERVER | SP_PROT_UNI_SERVER) +#define SP_PROT_X_CLIENTS (SP_PROT_CLIENTS | SP_PROT_TLS1_X_CLIENT) +#define SP_PROT_X_SERVERS (SP_PROT_SERVERS | SP_PROT_TLS1_X_SERVER) + +#define SP_PROT_SSL3TLS1 (SP_PROT_SSL3 | SP_PROT_TLS1) +#define SP_PROT_SSL3TLS1_X (SP_PROT_SSL3 | SP_PROT_TLS1_X) +#define SP_PROT_TLS1_X (SP_PROT_TLS1_X_CLIENT | SP_PROT_TLS1_X_SERVER) +#define SP_PROT_TLS1_1PLUS (SP_PROT_TLS1_1PLUS_CLIENT | SP_PROT_TLS1_1PLUS_SERVER) #define SCH_CRED_NO_SYSTEM_MAPPER 2 #define SCH_CRED_NO_SERVERNAME_CHECK 4

1 0

Henri Verbeet : secur32: Recognize some more TLS versions.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: 8abcfeddd859a0ef30f803d3b32afdecba61a44f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abcfeddd859a0ef30f803d3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 15:52:30 2012 +0200 secur32: Recognize some more TLS versions. --- dlls/secur32/schannel_gnutls.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 96fb471..16ce0de 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -228,7 +228,9 @@ static DWORD schannel_get_protocol(gnutls_protocol_t proto) switch (proto) { case GNUTLS_SSL3: return SP_PROT_SSL3_CLIENT; - case GNUTLS_TLS1_0: return SP_PROT_TLS1_CLIENT; + case GNUTLS_TLS1_0: return SP_PROT_TLS1_0_CLIENT; + case GNUTLS_TLS1_1: return SP_PROT_TLS1_1_CLIENT; + case GNUTLS_TLS1_2: return SP_PROT_TLS1_2_CLIENT; default: FIXME("unknown protocol %d\n", proto); return 0;

1 0

Henri Verbeet : d3d10: Add support for parsing blend factors to parse_fx10_object().
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: d53ad3acb0665248500edcc4d9302d5fd0830740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53ad3acb0665248500edcc4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 18 15:52:31 2012 +0200 d3d10: Add support for parsing blend factors to parse_fx10_object(). --- dlls/d3d10/d3d10_private.h | 9 ++++-- dlls/d3d10/effect.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 13eae62..be1a87d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -49,9 +49,10 @@ void d3d10_rb_free(void *ptr) DECLSPEC_HIDDEN; enum d3d10_effect_object_type { - D3D10_EOT_VERTEXSHADER = 6, - D3D10_EOT_PIXELSHADER = 7, - D3D10_EOT_GEOMETRYSHADER = 8, + D3D10_EOT_VERTEXSHADER = 0x6, + D3D10_EOT_PIXELSHADER = 0x7, + D3D10_EOT_GEOMETRYSHADER = 0x8, + D3D10_EOT_BLEND_FACTOR = 0xa, }; enum d3d10_effect_object_operation @@ -156,6 +157,8 @@ struct d3d10_effect_pass DWORD annotation_count; struct d3d10_effect_object *objects; struct d3d10_effect_variable *annotations; + + float blend_factor[4]; }; /* ID3D10EffectTechnique */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b5cf791..2c22520 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -865,6 +865,10 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ shader = "geometryshader"; t->basetype = D3D10_SVT_GEOMETRYSHADER; break; + + default: + FIXME("Unhandled object type %#x.\n", otype); + return E_FAIL; } if (!copy_name(shader, &t->name)) @@ -899,6 +903,56 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ return S_OK; } +static BOOL read_float_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, float *out_data, UINT idx) +{ + switch (in_type) + { + case D3D10_SVT_FLOAT: + out_data[idx] = *(float *)&value; + return TRUE; + + default: + FIXME("Unhandled in_type %#x.\n", in_type); + return FALSE; + } +} + +static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, + UINT out_size, void *out_data) +{ + D3D_SHADER_VARIABLE_TYPE in_type; + DWORD t, value; + DWORD count, i; + + read_dword(&ptr, &count); + if (count != out_size) + return FALSE; + + TRACE("%u values:\n", count); + for (i = 0; i < count; ++i) + { + read_dword(&ptr, &t); + read_dword(&ptr, &value); + + in_type = d3d10_variable_type(t, FALSE); + TRACE("\t%s: %#x.\n", debug_d3d10_shader_variable_type(in_type), value); + + switch (out_type) + { + case D3D10_SVT_FLOAT: + if (!read_float_value(value, in_type, out_data, i)) + return FALSE; + break; + + default: + FIXME("Unhandled out_type %#x.\n", out_type); + return FALSE; + } + } + + return TRUE; +} + static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr, const char *data) { const char *data_ptr = NULL; @@ -945,6 +999,16 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr hr = S_OK; break; + case D3D10_EOT_BLEND_FACTOR: + if (!read_value_list(data + offset, D3D10_SVT_FLOAT, 4, &o->pass->blend_factor[0])) + { + FIXME("Failed to read blend factor.\n"); + return E_FAIL; + } + + hr = S_OK; + break; + default: FIXME("Unhandled object type %#x\n", o->type); hr = E_FAIL; @@ -2483,6 +2547,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa } } + memcpy(desc->BlendFactor, This->blend_factor, 4 * sizeof(float)); + return S_OK; }

1 0

Nikolay Sivov : ole32: Fix QueryInterface for file-based ILockBytes.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: 382acd526fd6e226eb2f6afd085454f7f7ae7099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382acd526fd6e226eb2f6afd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 18 10:05:26 2012 +0400 ole32: Fix QueryInterface for file-based ILockBytes. --- dlls/ole32/filelockbytes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index ac0263c..ce74566 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -141,7 +141,7 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN static HRESULT WINAPI FileLockBytesImpl_QueryInterface(ILockBytes *iface, REFIID riid, void **ppvObject) { - if (IsEqualIID(riid, &IID_ILockBytes) || IsEqualIID(riid, &IID_ILockBytes)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ILockBytes)) *ppvObject = iface; else {

1 0

Nikolay Sivov : ole32: Remove unsupported interface REFIID from storage stream QueryInterface.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: e45202fdae61e45d3b67542b55ac7ff3c16967e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45202fdae61e45d3b67542b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 18 10:18:24 2012 +0400 ole32: Remove unsupported interface REFIID from storage stream QueryInterface. --- dlls/ole32/stg_stream.c | 2 -- dlls/ole32/tests/storage32.c | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 1471162..e9fc0c0 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -94,8 +94,6 @@ static HRESULT WINAPI StgStreamImpl_QueryInterface( *ppvObject = 0; if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream, riid) || IsEqualIID(&IID_ISequentialStream, riid) || IsEqualIID(&IID_IStream, riid)) { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index c79b5d1..ac3fc3f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -315,6 +315,7 @@ static void test_storage_stream(void) LARGE_INTEGER pos; ULARGE_INTEGER p; unsigned char buffer[0x100]; + IUnknown *unk; DeleteFileA(filenameA); @@ -347,6 +348,13 @@ static void test_storage_stream(void) /* now really create a stream and delete it */ r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); + + /* test for support interfaces */ + r = IStream_QueryInterface(stm, &IID_IPersist, (void**)&unk); + ok(r==E_NOINTERFACE, "got 0x%08x\n", r); + r = IStream_QueryInterface(stm, &IID_IPersistStream, (void**)&unk); + ok(r==E_NOINTERFACE, "got 0x%08x\n", r); + r = IStream_Release(stm); ok(r == 0, "wrong ref count\n"); r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm );

1 0

Nikolay Sivov : ole32: Give names to 1Ole stream header fields.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: 53dd90aeb3babba5cfe008ea856288902db0919d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dd90aeb3babba5cfe008ea8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 18 10:53:02 2012 +0400 ole32: Give names to 1Ole stream header fields. --- dlls/ole32/storage32.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f4f2d88..70494a1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8552,13 +8552,17 @@ HRESULT STORAGE_CreateOleStream(IStorage *storage, DWORD flags) struct empty_1ole_stream { DWORD version_magic; DWORD flags; - BYTE padding[12]; + DWORD update_options; + DWORD reserved; + DWORD mon_stream_size; }; struct empty_1ole_stream stream_data; stream_data.version_magic = version_magic; stream_data.flags = flags; - memset(stream_data.padding, 0, sizeof(stream_data.padding)); + stream_data.update_options = 0; + stream_data.reserved = 0; + stream_data.mon_stream_size = 0; hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); IStream_Release(stream);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: c556328e819d4441c4726637cc01d5899f79bd23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c556328e819d4441c4726637c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jul 17 20:10:19 2012 +0300 po: Update Lithuanian translation. --- po/lt.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 54aaef3..0b8d9c3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-29 19:51+0300\n" +"PO-Revision-Date: 2012-07-17 20:09+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3463,16 +3463,16 @@ msgid "Test Force Feedback" msgstr "Testuoti „Force Feedback“" #: joy.rc:63 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Galimi formatai" +msgstr "Prieinami efektai" #: joy.rc:65 msgid "" "Press any button in the controller to activate the chosen effect. The effect " "direction can be changed with the controller axis." msgstr "" +"Spauskite bet kurį valdiklio mygtuką pasirinktam efektui aktyvuoti. Efekto " +"kryptis gali būti pakeista valdiklio ašimi." #: joy.rc:28 msgid "Game Controllers"

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 18 Jul '12

18 Jul '12

Module: wine Branch: master Commit: 8b2aee1892cf272f8412bc013147c11e3cf1bfbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b2aee1892cf272f8412bc013… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:38:53 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 776 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 388 insertions(+), 388 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b2aee1892cf272f8412b…

1 0