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

Henri Verbeet : secur32: Recognize some more TLS versions.
by Alexandre Julliard July 18, 2012

July 18, 2012

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

Alexandre Julliard : opengl32: Generate a function table with null OpenGL entry points and store it in the TEB .
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: edb0044e502d494615f85129207c31da93f14ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb0044e502d494615f851292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 23:34:45 2012 +0200 opengl32: Generate a function table with null OpenGL entry points and store it in the TEB. --- dlls/opengl32/make_opengl | 43 ++++++ dlls/opengl32/opengl_norm.c | 344 +++++++++++++++++++++++++++++++++++++++++++ dlls/opengl32/wgl.c | 9 + 3 files changed, 396 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edb0044e502d494615f85…

1 0

André Hentschel : msvcrt: Add tmpfile_s implementation .
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: f09a40a215ef6994734aa0c66c9cb10969000df5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09a40a215ef6994734aa0c66… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 17 21:49:09 2012 +0200 msvcrt: Add tmpfile_s implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 15 +++++++++++++++ dlls/msvcrt/file.c | 12 ++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 6 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 70bcbd0..090e82c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1609,7 +1609,7 @@ @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh @ cdecl tmpfile() msvcrt.tmpfile -@ stub tmpfile_s +@ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam @ stub tmpnam_s @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d758176..3644345 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1463,7 +1463,7 @@ @ cdecl tan(double) msvcrt.tan @ cdecl tanh(double) msvcrt.tanh @ cdecl tmpfile() msvcrt.tmpfile -@ stub tmpfile_s +@ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam @ stub tmpnam_s @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5c27fca..d10c78e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1474,7 +1474,7 @@ @ cdecl tanh(double) msvcrt.tanh @ cdecl -arch=x86_64 tanhf(float) msvcrt.tanhf @ cdecl tmpfile() msvcrt.tmpfile -@ stub tmpfile_s +@ cdecl tmpfile_s(ptr) msvcrt.tmpfile_s @ cdecl tmpnam(ptr) msvcrt.tmpnam @ stub tmpnam_s @ cdecl tolower(long) msvcrt.tolower diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 92945ae..c746400 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -75,6 +75,7 @@ static void (__cdecl *p_qsort_s)(void *, size_t, size_t, int (__cdecl *)(void *, static void* (__cdecl *p_bsearch_s)(const void *, const void *, size_t, size_t, int (__cdecl *compare)(void *, const void *, const void *), void *); static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); +static int (__cdecl *p_tmpfile_s)(FILE**); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); @@ -255,6 +256,7 @@ static BOOL init(void) SET(p_qsort_s, "qsort_s"); SET(p_bsearch_s, "bsearch_s"); SET(p_controlfp_s, "_controlfp_s"); + SET(p_tmpfile_s, "tmpfile_s"); SET(p_atoflt, "_atoflt"); SET(p_set_abort_behavior, "_set_abort_behavior"); SET(p_sopen_s, "_sopen_s"); @@ -833,6 +835,18 @@ static void test_controlfp_s(void) ok( cur != 0xdeadbeef, "value not set\n" ); } +static void test_tmpfile_s( void ) +{ + int ret; + + errno = 0xdeadbeef; + SET_EXPECT(invalid_parameter_handler); + ret = p_tmpfile_s(NULL); + ok(ret == EINVAL, "Expected tmpfile_s to return EINVAL, got %i\n", ret); + CHECK_CALLED(invalid_parameter_handler); + ok(errno == 0xdeadbeef, "errno = %x\n", errno); +} + typedef struct { const char *str; @@ -1211,6 +1225,7 @@ START_TEST(msvcr90) test_qsort_s(); test_bsearch_s(); test_controlfp_s(); + test_tmpfile_s(); test__atoflt(); test__set_abort_behavior(); test__sopen_s(); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index df2c7cd..fe8f8b6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3792,6 +3792,18 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) return file; } +/********************************************************************* + * tmpfile_s (MSVCRT.@) + */ +int CDECL MSVCRT_tmpfile_s(MSVCRT_FILE** file) +{ + if (!MSVCRT_CHECK_PMT(file != NULL)) + return MSVCRT_EINVAL; + + *file = MSVCRT_tmpfile(); + return 0; +} + static int puts_clbk_file_a(void *file, int len, const char *str) { return MSVCRT_fwrite(str, sizeof(char), len, file); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 934c247..c84ecba 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1422,7 +1422,7 @@ @ cdecl -arch=x86_64 tanhf(float) MSVCRT_tanhf @ cdecl time(ptr) MSVCRT_time @ cdecl tmpfile() MSVCRT_tmpfile -# stub tmpfile_s(ptr) +@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s @ cdecl tmpnam(ptr) MSVCRT_tmpnam # stub tmpnam_s(ptr long) @ cdecl tolower(long) MSVCRT_tolower

1 0

Henri Verbeet : d3d10: Add support for parsing blend factors to parse_fx10_object().
by Alexandre Julliard July 18, 2012

July 18, 2012

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

Jacek Caban : vbscript: Use current locale in to_string.
by Alexandre Julliard July 18, 2012

July 18, 2012

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

Nikolay Sivov : ole32: Remove unsupported interface REFIID from storage stream QueryInterface.
by Alexandre Julliard July 18, 2012

July 18, 2012

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 18, 2012

July 18, 2012

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 July 18, 2012

July 18, 2012

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

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard July 18, 2012

July 18, 2012

Module: wine Branch: master Commit: 736efb6a268ab9cdda38cef209ecde2f122b146b URL: http://source.winehq.org/git/wine.git/?a=commit;h=736efb6a268ab9cdda38cef20… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:50:27 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 183 ++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 107 insertions(+), 76 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index c934aec..cbe2092 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6638,11 +6638,11 @@ msgstr "HTML 檔案" #: mshtml.rc:26 msgid "Downloading from %s..." -msgstr "從 %s 下載中..." +msgstr "從 %s 下載中…" #: mshtml.rc:25 msgid "Done" -msgstr "" +msgstr "已完成" #: msi.rc:27 msgid "" @@ -6690,6 +6690,35 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" +"Windows 安裝程式 %s\n" +"\n" +"用法：\n" +"msiexec 命令 {必要參數} [可選參數]\n" +"\n" +"安裝產品：\n" +"\t/i {套件|產品編號} [內容]\n" +"\t/package {套件|產品編號} [內容]\n" +"\t/a 套件 [內容]\n" +"修復安裝：\n" +"\t/f[p|o|e|d|c|a|u|m|s|v] {套件|產品編號}\n" +"解除安裝產品：\n" +"\t/uninstall {套件|產品編號} [內容]\n" +"\t/x {套件|產品編號} [內容]\n" +"通告產品：\n" +"\t/j[u|m] 套件 [/t 變換] [/g 語言識別號]\n" +"套用修補程式：\n" +"\t/p 修補套件 [內容]\n" +"\t/p 修補套件/a 套件 [內容]\n" +"用於以上命令的記錄檔和 UI 修飾鍵：\n" +"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] 日誌檔案\n" +"\t/q{|n|b|r|f|n+|b+|b-}\n" +"註冊 MSI 服務：\n" +"\t/y\n" +"移除註冊 MSI 服務：\n" +"\t/z\n" +"顯示這份說明：\n" +"\t/help\n" +"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6713,13 +6742,15 @@ msgstr "選擇包含 %s 的檔案夾" #: msrle32.rc:28 msgid "Wine MS-RLE video codec" -msgstr "" +msgstr "Wine MS-RLE 視訊編碼解碼器" #: msrle32.rc:29 msgid "" "Wine MS-RLE video codec\n" "Copyright 2002 by Michael Guennewig" msgstr "" +"Wine MS-RLE 視訊編碼解碼器\n" +"著作權 2002 Michael Guennewig" #: msvfw32.rc:30 msgid "Video Compression" @@ -6731,7 +6762,7 @@ msgstr "壓縮器(&C)：" #: msvfw32.rc:39 msgid "Con&figure..." -msgstr "組態(&F)..." +msgstr "組態(&F)…" #: msvfw32.rc:40 msgid "&About" @@ -6751,7 +6782,7 @@ msgstr "資料速率(&D)" #: msvfw32.rc:52 msgid "kB/s" -msgstr "" +msgstr "kB/s" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -6759,11 +6790,11 @@ msgstr "全畫格(未壓縮)" #: msvidc32.rc:26 msgid "Wine Video 1 video codec" -msgstr "" +msgstr "Wine 視訊 1 視訊編碼解碼器" #: oleacc.rc:27 msgid "unknown object" -msgstr "" +msgstr "不明物件" #: oleacc.rc:28 msgid "title bar" @@ -6779,7 +6810,7 @@ msgstr "捲軸" #: oleacc.rc:31 msgid "grip" -msgstr "" +msgstr "握把" #: oleacc.rc:32 msgid "sound" @@ -6791,11 +6822,11 @@ msgstr "游標" #: oleacc.rc:34 msgid "caret" -msgstr "" +msgstr "插字符號" #: oleacc.rc:35 msgid "alert" -msgstr "" +msgstr "警示" #: oleacc.rc:36 msgid "window" @@ -6803,7 +6834,7 @@ msgstr "視窗" #: oleacc.rc:37 msgid "client" -msgstr "" +msgstr "客戶端" #: oleacc.rc:38 msgid "popup menu" @@ -6811,7 +6842,7 @@ msgstr "彈出式選單" #: oleacc.rc:39 msgid "menu item" -msgstr "" +msgstr "功能表項目" #: oleacc.rc:40 msgid "tool tip" @@ -6827,23 +6858,23 @@ msgstr "文件" #: oleacc.rc:43 msgid "pane" -msgstr "" +msgstr "窗格" #: oleacc.rc:44 msgid "chart" -msgstr "" +msgstr "圖表" #: oleacc.rc:45 msgid "dialog" -msgstr "" +msgstr "對話框" #: oleacc.rc:46 msgid "border" -msgstr "" +msgstr "邊框" #: oleacc.rc:47 msgid "grouping" -msgstr "" +msgstr "分組" #: oleacc.rc:48 msgid "separator" @@ -6863,15 +6894,15 @@ msgstr "表格" #: oleacc.rc:52 msgid "column header" -msgstr "" +msgstr "欄首" #: oleacc.rc:53 msgid "row header" -msgstr "" +msgstr "列首" #: oleacc.rc:54 msgid "column" -msgstr "行" +msgstr "欄" #: oleacc.rc:55 msgid "row" @@ -6879,51 +6910,51 @@ msgstr "列" #: oleacc.rc:56 msgid "cell" -msgstr "" +msgstr "儲存格" #: oleacc.rc:57 msgid "link" -msgstr "" +msgstr "鏈結" #: oleacc.rc:58 msgid "help balloon" -msgstr "" +msgstr "說明泡泡" #: oleacc.rc:59 msgid "character" -msgstr "" +msgstr "字元" #: oleacc.rc:60 msgid "list" -msgstr "" +msgstr "清單" #: oleacc.rc:61 msgid "list item" -msgstr "" +msgstr "清單項目" #: oleacc.rc:62 msgid "outline" -msgstr "" +msgstr "描邊" #: oleacc.rc:63 msgid "outline item" -msgstr "" +msgstr "描邊項目" #: oleacc.rc:64 msgid "page tab" -msgstr "" +msgstr "頁面頁標" #: oleacc.rc:65 msgid "property page" -msgstr "" +msgstr "內容頁面" #: oleacc.rc:66 msgid "indicator" -msgstr "" +msgstr "指示器" #: oleacc.rc:67 msgid "graphic" -msgstr "" +msgstr "圖形" #: oleacc.rc:68 msgid "static text" @@ -6935,47 +6966,47 @@ msgstr "文字" #: oleacc.rc:70 msgid "push button" -msgstr "" +msgstr "按鈕" #: oleacc.rc:71 msgid "check button" -msgstr "" +msgstr "檢查按鈕" #: oleacc.rc:72 msgid "radio button" -msgstr "" +msgstr "單選按鈕" #: oleacc.rc:73 msgid "combo box" -msgstr "" +msgstr "複合方塊" #: oleacc.rc:74 msgid "drop down" -msgstr "" +msgstr "下拉選單" #: oleacc.rc:75 msgid "progress bar" -msgstr "" +msgstr "進度條" #: oleacc.rc:76 msgid "dial" -msgstr "" +msgstr "撥號" #: oleacc.rc:77 msgid "hot key field" -msgstr "" +msgstr "快速鍵欄位" #: oleacc.rc:78 msgid "slider" -msgstr "" +msgstr "滑動軸" #: oleacc.rc:79 msgid "spin box" -msgstr "" +msgstr "數值調整框" #: oleacc.rc:80 msgid "diagram" -msgstr "" +msgstr "圖表" #: oleacc.rc:81 msgid "animation" @@ -6983,27 +7014,27 @@ msgstr "動畫" #: oleacc.rc:82 msgid "equation" -msgstr "" +msgstr "方程式" #: oleacc.rc:83 msgid "drop down button" -msgstr "" +msgstr "下拉按鈕" #: oleacc.rc:84 msgid "menu button" -msgstr "" +msgstr "選單按鈕" #: oleacc.rc:85 msgid "grid drop down button" -msgstr "" +msgstr "格線下拉按鈕" #: oleacc.rc:86 msgid "white space" -msgstr "" +msgstr "空白" #: oleacc.rc:87 msgid "page tab list" -msgstr "" +msgstr "頁面頁標清單" #: oleacc.rc:88 msgid "clock" @@ -7011,7 +7042,7 @@ msgstr "時鐘" #: oleacc.rc:89 msgid "split button" -msgstr "" +msgstr "分割按鈕" #: oleacc.rc:90 ipconfig.rc:33 msgid "IP address" @@ -7019,7 +7050,7 @@ msgstr "IP 位址" #: oleacc.rc:91 msgid "outline button" -msgstr "" +msgstr "描邊按鈕" #: oleaut32.rc:27 oleview.rc:144 msgid "True" @@ -7063,7 +7094,7 @@ msgstr "建立於檔案" #: oledlg.rc:65 msgid "&Add Control..." -msgstr "新增控制項(&A)..." +msgstr "新增控制項(&A)…" #: oledlg.rc:66 msgid "Display As Icon" @@ -7071,7 +7102,7 @@ msgstr "顯示為圖示" #: oledlg.rc:68 setupapi.rc:58 msgid "Browse..." -msgstr "瀏覽..." +msgstr "瀏覽…" #: oledlg.rc:69 msgid "File:" @@ -7104,7 +7135,7 @@ msgstr "顯示為圖示(&D)" #: oledlg.rc:92 msgid "Change &Icon..." -msgstr "變更圖示(&I)..." +msgstr "變更圖示(&I)…" #: oledlg.rc:25 msgid "Insert a new %s object into your document" @@ -7195,7 +7226,7 @@ msgstr "正在掃描" #: sane.rc:44 msgid "SCANNING... Please Wait" -msgstr "正在掃描... 請稍候" +msgstr "正在掃描… 請稍候" #: sane.rc:31 msgctxt "unit: pixels" @@ -7248,7 +7279,7 @@ msgstr "停止位元" #: setupapi.rc:36 msgid "Copying Files..." -msgstr "複製檔案..." +msgstr "複製檔案…" #: setupapi.rc:42 msgid "Destination:" @@ -7292,7 +7323,7 @@ msgstr "向前(&O)" #: shdoclc.rc:41 msgid "&Save Background As..." -msgstr "將背景存為(&S)..." +msgstr "將背景存為(&S)…" #: shdoclc.rc:42 msgid "Set As Back&ground" @@ -7316,7 +7347,7 @@ msgstr "建立捷徑(&T)" #: shdoclc.rc:50 shdoclc.rc:81 shdoclc.rc:134 shdoclc.rc:161 shdoclc.rc:185 msgid "Add to &Favorites..." -msgstr "新增至我的最愛(&F)..." +msgstr "新增至我的最愛(&F)…" #: shdoclc.rc:51 msgid "&View Source" @@ -7340,7 +7371,7 @@ msgstr "在新視窗開啟連結(&N)" #: shdoclc.rc:65 shdoclc.rc:126 shdoclc.rc:148 shdoclc.rc:172 msgid "Save Target &As..." -msgstr "另存目標(&A)..." +msgstr "另存目標(&A)…" #: shdoclc.rc:66 shdoclc.rc:127 shdoclc.rc:149 shdoclc.rc:173 msgid "&Print Target" @@ -7352,15 +7383,15 @@ msgstr "顯示圖片(&H)" #: shdoclc.rc:69 shdoclc.rc:176 msgid "&Save Picture As..." -msgstr "另存圖片(&S)..." +msgstr "另存圖片(&S)…" #: shdoclc.rc:70 msgid "&E-mail Picture..." -msgstr "電郵圖片(&E)..." +msgstr "電子郵件圖片(&E)…" #: shdoclc.rc:71 msgid "Pr&int Picture..." -msgstr "列印圖片(&I)..." +msgstr "列印圖片(&I)…" #: shdoclc.rc:72 msgid "&Go to My Pictures" @@ -7372,7 +7403,7 @@ msgstr "設為背景(&G)" #: shdoclc.rc:74 shdoclc.rc:154 shdoclc.rc:178 msgid "Set as &Desktop Item..." -msgstr "設為桌面項目(&D)..." +msgstr "設為桌面項目(&D)…" #: shdoclc.rc:76 shdoclc.rc:90 shdoclc.rc:114 shdoclc.rc:156 shdoclc.rc:180 #: user32.rc:57 wordpad.rc:101 @@ -7411,11 +7442,11 @@ msgstr "格(&C)" #: shdoclc.rc:103 msgid "&Row" -msgstr "行(&R)" +msgstr "列(&R)" #: shdoclc.rc:104 msgid "&Column" -msgstr "列(&O)" +msgstr "欄(&O)" #: shdoclc.rc:105 msgid "&Table" @@ -7447,7 +7478,7 @@ msgstr "剪下" #: shdoclc.rc:152 msgid "&Save Video As..." -msgstr "將視訊另存為(&S)..." +msgstr "將視訊另存為(&S)…" #: shdoclc.rc:163 shdoclc.rc:187 msgid "Play" @@ -7503,7 +7534,7 @@ msgstr "記憶體監控" #: shdoclc.rc:207 msgid "Performance Meters" -msgstr "" +msgstr "效能量尺" #: shdoclc.rc:208 msgid "Save HTML" @@ -7622,7 +7653,7 @@ msgstr "自動排列(&A)" #: shell32.rc:57 msgid "Line up Icons" -msgstr "" +msgstr "貼齊圖示" #: shell32.rc:62 msgid "Paste as Link" @@ -7651,7 +7682,7 @@ msgstr "回復(&R)" #: shell32.rc:83 msgid "&Erase" -msgstr "" +msgstr "清除(&E)" #: shell32.rc:95 msgid "E&xplore" @@ -7676,7 +7707,7 @@ msgstr "結束(&X)" #: shell32.rc:127 msgid "&About Control Panel" -msgstr "關於控制台(&A)" +msgstr "關於控制臺(&A)" #: shell32.rc:270 shell32.rc:285 msgid "Browse for Folder" @@ -7735,7 +7766,7 @@ msgstr "開啟(&O):" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:130 msgid "&Browse..." -msgstr "瀏覽(&B)..." +msgstr "瀏覽(&B)…" #: shell32.rc:135 shell32.rc:139 winefile.rc:105 msgid "Size" @@ -7771,7 +7802,7 @@ msgstr "群組" #: shell32.rc:145 msgid "Original location" -msgstr "" +msgstr "原來的位置" #: shell32.rc:146 msgid "Date deleted" @@ -7788,7 +7819,7 @@ msgstr "我的電腦" #: shell32.rc:156 msgid "Control Panel" -msgstr "Wine 控制台" +msgstr "Wine 控制臺" #: shell32.rc:163 msgid "Select" @@ -7853,7 +7884,7 @@ msgstr "樣板" #: shell32.rc:210 msgid "PrintHood" -msgstr "" +msgstr "印表套頁" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -7861,7 +7892,7 @@ msgstr "紀錄" #: shell32.rc:212 msgid "Program Files" -msgstr "" +msgstr "程式檔案" #: shell32.rc:214 msgid "My Pictures" @@ -7869,7 +7900,7 @@ msgstr "我的圖片" #: shell32.rc:215 msgid "Common Files" -msgstr "" +msgstr "共同檔案" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents"

1 0

Nikolay Sivov : ole32: Give names to 1Ole stream header fields.
by Alexandre Julliard July 18, 2012

July 18, 2012

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