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

Nikolay Sivov : ole32: COM cleanup of HGLOBAL ILockBytes implementation.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 897d4d4e4aa148e9f8a978d27e409d59f1af81f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897d4d4e4aa148e9f8a978d27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:53:14 2012 +0400 ole32: COM cleanup of HGLOBAL ILockBytes implementation. --- dlls/ole32/memlockbytes.c | 210 +++++++++++++-------------------------------- 1 files changed, 61 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=897d4d4e4aa148e9f8a97…

1 0

Lucas Zawacki : joy.cpl: Tab for force feedback tests.
by Alexandre Julliard July 17, 2012

July 17, 2012

1 0

Nikolay Sivov : ole32: Make ole stream creation helper capable of handling flags data.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 52ce30d242154530a0a46bae4d5bc332f7906c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ce30d242154530a0a46bae4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:31:08 2012 +0400 ole32: Make ole stream creation helper capable of handling flags data. --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/storage32.c | 73 +++++++++++++++++++---------------------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b98404f..57b0c46 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -662,7 +662,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) ProgIDFromCLSID(&clsID, &strProgID); WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL ); - OLECONVERT_CreateOleStream(std.u.pstg); + STORAGE_CreateOleStream(std.u.pstg, 0); OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName); } } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 30d380b..f4f2d88 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8520,18 +8520,18 @@ static DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData) } /************************************************************************* - * OLECONVERT_CreateOleStream [Internal] + * STORAGE_CreateOleStream [Internal] * * Creates the "\001OLE" stream in the IStorage if necessary. * * PARAMS - * pStorage [I] Dest storage to create the stream in + * storage [I] Dest storage to create the stream in + * flags [I] flags to be set for newly created stream * * RETURNS - * Nothing + * HRESULT return value * * NOTES - * This function is used by OleConvertOLESTREAMToIStorage only. * * This stream is still unknown, MS Word seems to have extra data * but since the data is stored in the OLESTREAM there should be @@ -8539,28 +8539,32 @@ static DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData) * deleted it will create it with this default data. * */ -void OLECONVERT_CreateOleStream(LPSTORAGE pStorage) +HRESULT STORAGE_CreateOleStream(IStorage *storage, DWORD flags) { - HRESULT hRes; - IStream *pStream; - static const WCHAR wstrStreamName[] = {1,'O', 'l', 'e', 0}; - BYTE pOleStreamHeader [] = + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + static const DWORD version_magic = 0x02000001; + IStream *stream; + HRESULT hr; + + hr = IStorage_CreateStream(storage, stream_1oleW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); + if (hr == S_OK) { - 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 - }; + struct empty_1ole_stream { + DWORD version_magic; + DWORD flags; + BYTE padding[12]; + }; + struct empty_1ole_stream stream_data; - /* Create stream if not present */ - hRes = IStorage_CreateStream(pStorage, wstrStreamName, - STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream ); + stream_data.version_magic = version_magic; + stream_data.flags = flags; + memset(stream_data.padding, 0, sizeof(stream_data.padding)); - if(hRes == S_OK) - { - /* Write default Data */ - hRes = IStream_Write(pStream, pOleStreamHeader, sizeof(pOleStreamHeader), NULL); - IStream_Release(pStream); + hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); + IStream_Release(stream); } + + return hr; } /* write a string to a stream, preceded by its length */ @@ -9291,7 +9295,7 @@ HRESULT WINAPI OleConvertOLESTREAMToIStorage ( if(hRes == S_OK) { /*Create the Ole Stream if necessary */ - OLECONVERT_CreateOleStream(pstg); + STORAGE_CreateOleStream(pstg, 0); } } @@ -9418,33 +9422,16 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) */ HRESULT WINAPI SetConvertStg(IStorage *storage, BOOL convert) { - static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; - static const DWORD version_magic = 0x02000001; DWORD flags = convert ? OleStream_Convert : 0; - IStream *stream; HRESULT hr; TRACE("(%p, %d)\n", storage, convert); - hr = IStorage_CreateStream(storage, stream_1oleW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); - if (hr == S_OK) - { - struct empty_1ole_stream { - DWORD version_magic; - DWORD flags; - BYTE padding[12]; - }; - 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)); - - hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); - IStream_Release(stream); - } - else if (hr == STG_E_FILEALREADYEXISTS) + hr = STORAGE_CreateOleStream(storage, flags); + if (hr == STG_E_FILEALREADYEXISTS) { + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + IStream *stream; DWORD header[2]; hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 80fe01b..f2061f3 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -160,7 +160,7 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN * Ole Convert support */ -void OLECONVERT_CreateOleStream(LPSTORAGE pStorage) DECLSPEC_HIDDEN; +HRESULT STORAGE_CreateOleStream(IStorage*, DWORD) DECLSPEC_HIDDEN; HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName) DECLSPEC_HIDDEN;

1 0

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

July 17, 2012

Module: wine Branch: master Commit: 659304097c959eb7cdcaee515fa59ecfd936f799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=659304097c959eb7cdcaee515… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:33:07 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 713 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 374 insertions(+), 339 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=659304097c959eb7cdcae…

1 0

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

July 17, 2012

Module: wine Branch: master Commit: 60c1bd151ddc530a13e578ce06dcef1489e62acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c1bd151ddc530a13e578ce0… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Sat Jul 14 00:32:45 2012 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 72 +++++++++++++++++++++++----------------------------------- 1 files changed, 29 insertions(+), 43 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 9ced8a8..5945942 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -5,13 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: N/A\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2012-07-07 00:06+0800\n" +"Last-Translator: Wei-Lun Chao <bluebat(a)member.fsf.org>\n" +"Language-Team: Chinese (traditional) <zh-l10n(a)linux.org.tw>\n" "Language: Chinese (Taiwan)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:55 msgid "Install/Uninstall" @@ -21,24 +22,20 @@ msgstr "安裝/移除" msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." -msgstr "要從軟碟，光碟或硬碟安裝新程式，請按「安裝」。" +msgstr "要從軟碟、光碟或硬碟安裝新程式，請按「安裝」。" #: appwiz.rc:59 msgid "&Install..." -msgstr "安裝(&I)..." +msgstr "安裝(&I)…" #: appwiz.rc:62 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" "Remove." msgstr "" -"下列軟體可以自動解除安裝。按「新增/移除」可以移除程式或者調整已安裝元件。" +"下列軟體可以自動解除安裝。從清單中選取它並按下「新增/移除」，可以移除程式或" +"者調整已安裝元件。" #: appwiz.rc:64 msgid "&Support Information" @@ -46,7 +43,7 @@ msgstr "技術支援資訊(&S)" #: appwiz.rc:65 regedit.rc:42 regedit.rc:87 msgid "&Modify..." -msgstr "修改(&M)..." +msgstr "修改(&M)…" #: appwiz.rc:66 appwiz.rc:42 cryptui.rc:343 msacm32.rc:37 winecfg.rc:191 #: winecfg.rc:228 wordpad.rc:245 @@ -156,21 +153,10 @@ msgid "Cancel" msgstr "取消" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko 安裝程式" +msgstr "Wine Mono 安裝程式" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -179,11 +165,11 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine 需要安裝 Gecko 套件才能正確顯示嵌在應用程式中的 HTML 網頁。Wine 可以自動" -"幫您下載並安裝 Gecko。\n" +"Wine 需要安裝 Mono 套件才能正確執行 .NET 應用程式。Wine 可以自動幫您下載並安" +"裝它。\n" "\n" "備註：建議您使用發行版所附的套件。詳情請見 <a href=\"http://wiki.winehq.org/" -"Gecko\">http://wiki.winehq.org/Gecko</a>" +"Mono\">http://wiki.winehq.org/Mono</a>" #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -203,7 +189,7 @@ msgstr "應用程式" msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" -msgstr "無法執行移除程式「%s」。您想將這個移除程式從登錄檔中刪除嗎？" +msgstr "無法執行移除程式「%s」。您想將這個移除程式從註冊表中刪除嗎？" #: appwiz.rc:33 msgid "Not specified" @@ -240,17 +226,17 @@ msgstr "修改/移除(&M)" #: appwiz.rc:48 msgid "Downloading..." -msgstr "正在下載..." +msgstr "正在下載…" #: appwiz.rc:49 msgid "Installing..." -msgstr "正在安裝..." +msgstr "正在安裝…" #: appwiz.rc:50 msgid "" "Unexpected checksum of downloaded file. Aborting installation of corrupted " "file." -msgstr "" +msgstr "已下載檔案的總和檢查碼不符預期。放棄安裝已損壞檔案。" #: avifil32.rc:39 msgid "Compress options" @@ -262,7 +248,7 @@ msgstr "選擇來源(&C)：" #: avifil32.rc:45 wordpad.rc:73 msgid "&Options..." -msgstr "選項(&O)..." +msgstr "選項(&O)…" #: avifil32.rc:46 msgid "&Interleave every" @@ -306,7 +292,7 @@ msgstr "未壓縮" #: browseui.rc:25 msgid "Canceling..." -msgstr "正在取消..." +msgstr "正在取消…" #: comctl32.rc:49 winefile.rc:157 msgid "Properties for %s" @@ -357,7 +343,7 @@ msgstr "重置(&e)" #: progman.rc:199 progman.rc:216 regedit.rc:76 taskmgr.rc:87 winefile.rc:79 #: winemine.rc:48 winhlp32.rc:53 wordpad.rc:91 msgid "&Help" -msgstr "說明(&H)" +msgstr "求助(&H)" #: comctl32.rc:84 msgid "Move &Up" @@ -432,7 +418,7 @@ msgstr "唯讀(&R)" #: comdlg32.rc:173 msgid "Save As..." -msgstr "另存新檔..." +msgstr "另存新檔…" #: comdlg32.rc:186 comdlg32.rc:141 msgid "Save As" @@ -485,7 +471,7 @@ msgstr "列印至檔案(&L)" #: comdlg32.rc:212 msgid "Condensed" -msgstr "" +msgstr "已壓縮" #: comdlg32.rc:218 comdlg32.rc:389 msgid "Print Setup" @@ -505,7 +491,7 @@ msgstr "[無]" #: comdlg32.rc:224 msgid "Specific &Printer" -msgstr "" +msgstr "特定的印表機(&P)" #: comdlg32.rc:229 comdlg32.rc:415 comdlg32.rc:434 wineps.rc:31 msgid "Orientation" @@ -776,7 +762,7 @@ msgstr "下(&B)：" #: comdlg32.rc:448 msgid "P&rinter..." -msgstr "印表機(&R)..." +msgstr "印表機(&R)…" #: comdlg32.rc:456 msgid "Look &in:" @@ -892,7 +878,7 @@ msgstr "黑色" #: comdlg32.rc:118 wordpad.rc:115 msgid "Maroon" -msgstr "" +msgstr "暗紅" #: comdlg32.rc:119 wordpad.rc:116 msgid "Green" @@ -912,7 +898,7 @@ msgstr "紫色" #: comdlg32.rc:123 wordpad.rc:120 msgid "Teal" -msgstr "" +msgstr "藍綠" #: comdlg32.rc:124 wordpad.rc:121 msgid "Gray" @@ -940,7 +926,7 @@ msgstr "藍色" #: comdlg32.rc:130 wordpad.rc:127 msgid "Fuchsia" -msgstr "" +msgstr "桃紅" #: comdlg32.rc:131 wordpad.rc:128 msgid "Aqua" @@ -1020,7 +1006,7 @@ msgstr "" #: comdlg32.rc:137 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "" +msgstr "選取介於 %1!d! 和 %2!d! 點的字型尺寸。" #: comdlg32.rc:138 ieframe.rc:32 msgid "&Save" @@ -1104,7 +1090,7 @@ msgstr "正在處理；" #: comdlg32.rc:95 msgid "Initializing; " -msgstr "正在啓動；" +msgstr "正在初始化；" #: comdlg32.rc:96 msgid "Warming up; "

1 0

Daniel Lehman : msvcp90: Handle npos as a len in basic_string<>::replace.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: e8314684011d269aebab4655a6da9a615e8aa5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8314684011d269aebab4655a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Dec 29 16:08:39 2011 -0800 msvcp90: Handle npos as a len in basic_string<>::replace. --- dlls/msvcp90/string.c | 8 +++--- dlls/msvcp90/tests/string.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index d8bc6f3..8a72291 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1949,7 +1949,7 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_char_npos-str_len <= this->size-len) @@ -2040,7 +2040,7 @@ basic_string_char* __thiscall basic_string_char_replace_ch(basic_string_char *th if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_char_npos-count <= this->size-len) @@ -3901,7 +3901,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_wchar_npos-str_len <= this->size-len) @@ -4000,7 +4000,7 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_ch(basic_string_wchar if(this->size < off) MSVCP__String_base_Xran(); - if(off+len > this->size) + if(len > this->size-off) len = this->size-off; if(MSVCP_basic_string_wchar_npos-count <= this->size-len) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 8bc5f18..1e3ccec 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -76,6 +76,7 @@ static int (__thiscall *p_basic_string_char_compare_substr_substr)(basic_string_ static int (__thiscall *p_basic_string_char_compare_substr_cstr_len)(basic_string_char*, size_t, size_t, const char*, size_t); static size_t (__thiscall *p_basic_string_char_find_cstr_substr)(basic_string_char*, const char*, size_t, size_t); static size_t (__thiscall *p_basic_string_char_rfind_cstr_substr)(basic_string_char*, const char*, size_t, size_t); +static basic_string_char* (__thiscall *p_basic_string_char_replace_cstr)(basic_string_char*, size_t, size_t, const char*); static size_t *p_basic_string_char_npos; @@ -225,6 +226,8 @@ static BOOL init(void) "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); SET(p_basic_string_char_rfind_cstr_substr, "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); + SET(p_basic_string_char_replace_cstr, + "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2_KB"); @@ -289,6 +292,8 @@ static BOOL init(void) "?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); SET(p_basic_string_char_rfind_cstr_substr, "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); + SET(p_basic_string_char_replace_cstr, + "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IIPBD@Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB"); @@ -549,6 +554,54 @@ static void test_basic_string_char_rfind(void) { } } +static void test_basic_string_char_replace(void) { + struct replace_char_test { + const char *str; + size_t off; + size_t len; + const char *replace; + const char *ret; + }; + + int i; + basic_string_char str; + basic_string_char *ret; + struct replace_char_test tests[] = { + { "", 0, 0, "", "" }, /* empty string */ + { "", 0, 10, "", "" }, /* empty string with invalid len */ + + { "ABCDEF", 0, 0, "", "ABCDEF" }, /* replace with empty string */ + { "ABCDEF", 0, 0, "-", "-ABCDEF"}, /* replace with 0 len */ + { "ABCDEF", 0, 1, "-", "-BCDEF" }, /* replace 1 at beginning */ + { "ABCDEF", 0, 3, "-", "-DEF" }, /* replace 3 at beginning */ + { "ABCDEF", 0, 42, "-", "-" }, /* replace whole string with invalid long len */ + { "ABCDEF", 0, *p_basic_string_char_npos, "-", "-" }, /* replace whole string with npos */ + + { "ABCDEF", 5, 0, "", "ABCDEF" }, /* replace at end with empty string */ + { "ABCDEF", 5, 0, "-", "ABCDE-F"}, /* replace at end with 0 len */ + { "ABCDEF", 5, 1, "-", "ABCDE-" }, /* replace 1 at end */ + { "ABCDEF", 5, 42, "-", "ABCDE-" }, /* replace end with invalid long len */ + { "ABCDEF", 5, *p_basic_string_char_npos, "-", "ABCDE-" }, /* replace end with npos */ + + { "ABCDEF", 6, 0, "", "ABCDEF" }, /* replace after end with empty string */ + { "ABCDEF", 6, 0, "-", "ABCDEF-"}, /* replace after end with 0 len */ + { "ABCDEF", 6, 1, "-", "ABCDEF-" }, /* replace 1 after end */ + { "ABCDEF", 6, 42, "-", "ABCDEF-" }, /* replace after end with invalid long len */ + { "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */ + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + + ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); + ok(ret == &str, "str = %p ret = %p\n", ret, &str); + ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + + call_func1(p_basic_string_char_dtor, &str); + } +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -661,6 +714,7 @@ START_TEST(string) test_basic_string_char_concatenate(); test_basic_string_char_find(); test_basic_string_char_rfind(); + test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap();

1 0

Alexandre Goujon : kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE ( DvdManufacturerDescriptor) test.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 5feea8ce1a90e651a12ce6a10bca538907deab97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5feea8ce1a90e651a12ce6a10… Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Mon Jul 16 20:06:25 2012 +0200 kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdManufacturerDescriptor) test. --- dlls/kernel32/tests/volume.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/cdrom.c | 21 +++++++++++++++++---- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 45bac31..8152ae1 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -34,6 +34,16 @@ struct COMPLETE_DVD_LAYER_DESCRIPTOR #include <poppack.h> C_ASSERT(sizeof(struct COMPLETE_DVD_LAYER_DESCRIPTOR) == 22); +#include <pshpack1.h> +struct COMPLETE_DVD_MANUFACTURER_DESCRIPTOR +{ + DVD_DESCRIPTOR_HEADER Header; + DVD_MANUFACTURER_DESCRIPTOR Descriptor; + UCHAR Padding; +}; +#include <poppack.h> +C_ASSERT(sizeof(struct COMPLETE_DVD_MANUFACTURER_DESCRIPTOR) == 2053); + static HINSTANCE hdll; static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static BOOL (WINAPI * pGetVolumeNameForVolumeMountPointW)(LPCWSTR, LPWSTR, DWORD); @@ -750,6 +760,7 @@ static void test_dvd_read_structure(HANDLE handle) DVD_LAYER_DESCRIPTOR dvdLayerDescriptor; struct COMPLETE_DVD_LAYER_DESCRIPTOR completeDvdLayerDescriptor; DVD_COPYRIGHT_DESCRIPTOR dvdCopyrightDescriptor; + struct COMPLETE_DVD_MANUFACTURER_DESCRIPTOR completeDvdManufacturerDescriptor; dvdReadStructure.BlockByteOffset.QuadPart = 0; dvdReadStructure.SessionId = 0; @@ -839,6 +850,31 @@ static void test_dvd_read_structure(HANDLE handle) &dvdCopyrightDescriptor, i, &nbBytes, NULL); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); } + + + /* DvdManufacturerDescriptor */ + dvdReadStructure.Format = 4; + + SetLastError(0xdeadbeef); + + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + &completeDvdManufacturerDescriptor, sizeof(DVD_MANUFACTURER_DESCRIPTOR), &nbBytes, NULL); + ok(ret || broken(GetLastError() == ERROR_NOT_READY), + "IOCTL_DVD_READ_STRUCTURE (DvdManufacturerDescriptor) failed, last error = %u\n", GetLastError()); + if(!ret) + return; + + /* Confirm there is always a header before the actual data */ + ok( completeDvdManufacturerDescriptor.Header.Length == 0x0802, "Length is 0x%04x instead of 0x0802\n", completeDvdManufacturerDescriptor.Header.Length); + ok( completeDvdManufacturerDescriptor.Header.Reserved[0] == 0, "Reserved[0] is %x instead of 0\n", completeDvdManufacturerDescriptor.Header.Reserved[0]); + ok( completeDvdManufacturerDescriptor.Header.Reserved[1] == 0, "Reserved[1] is %x instead of 0\n", completeDvdManufacturerDescriptor.Header.Reserved[1]); + + SetLastError(0xdeadbeef); + + /* Basic parameter check */ + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + NULL, sizeof(DVD_MANUFACTURER_DESCRIPTOR), &nbBytes, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); } static void test_cdrom_ioctl(void) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 8374761..87e0695 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -231,6 +231,13 @@ typedef struct } internal_dvd_layer_descriptor; C_ASSERT(sizeof(internal_dvd_layer_descriptor) == 22); +typedef struct +{ + DVD_DESCRIPTOR_HEADER Header; + DVD_MANUFACTURER_DESCRIPTOR Descriptor; + UCHAR Padding; +} internal_dvd_manufacturer_descriptor; +C_ASSERT(sizeof(internal_dvd_manufacturer_descriptor) == 2053); static NTSTATUS CDROM_ReadTOC(int, int, CDROM_TOC*); static NTSTATUS CDROM_GetStatusCode(int); @@ -2595,9 +2602,12 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, case DvdManufacturerDescriptor: { - PDVD_MANUFACTURER_DESCRIPTOR p = (PDVD_MANUFACTURER_DESCRIPTOR) layer; + internal_dvd_manufacturer_descriptor *p = (internal_dvd_manufacturer_descriptor*) layer; - memcpy(p->ManufacturingInformation, s.manufact.value, 2048); + p->Header.Length = 0x0802; + p->Header.Reserved[0] = 0; + p->Header.Reserved[1] = 0; + memcpy(p->Descriptor.ManufacturingInformation, s.manufact.value, 2048); } break; @@ -2620,7 +2630,7 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, internal_dvd_layer_descriptor *xlayer; PDVD_COPYRIGHT_DESCRIPTOR copy; PDVD_DISK_KEY_DESCRIPTOR disk_key; - PDVD_MANUFACTURER_DESCRIPTOR manf; + internal_dvd_manufacturer_descriptor *manf; } nt_desc; nt_desc.layer = layer; @@ -2705,8 +2715,11 @@ static NTSTATUS DVD_ReadStructure(int dev, const DVD_READ_STRUCTURE *structure, break; case DvdManufacturerDescriptor: + nt_desc.manf->Header.Length = 0x0802; + nt_desc.manf->Header.Reserved[0] = 0; + nt_desc.manf->Header.Reserved[1] = 0; memcpy( - nt_desc.manf->ManufacturingInformation, + nt_desc.manf->Descriptor.ManufacturingInformation, desc.manf.discManufacturingInfo, 2048); break;

1 0

Matteo Bruni : d3dcompiler: Implement basic expressions parsing.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 27880abb979f72297e9314f51683067281b8a2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=27880abb979f72297e9314f51… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:23 2012 +0200 d3dcompiler: Implement basic expressions parsing. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 88 ++++++ dlls/d3dcompiler_43/hlsl.y | 14 + dlls/d3dcompiler_43/utils.c | 417 +++++++++++++++++++++++++++++ 3 files changed, 519 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27880abb979f72297e931…

1 0

Matteo Bruni : d3dcompiler: Store location information in constants, variable dereferences and constructors.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: be350b0bb39ee1f2bc76237cbacf7ea8d788752e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be350b0bb39ee1f2bc76237cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:19 2012 +0200 d3dcompiler: Store location information in constants, variable dereferences and constructors. --- dlls/d3dcompiler_43/hlsl.y | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cf0c7b5..f7f62fe 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -799,6 +799,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; $$ = &c->node; @@ -812,6 +813,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("int", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; $$ = &c->node; @@ -825,6 +827,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("bool", HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; $$ = &c->node; @@ -832,7 +835,13 @@ primary_expr: C_FLOAT | variable { struct hlsl_ir_deref *deref = new_var_deref($1); - $$ = deref ? &deref->node : NULL; + if (deref) + { + $$ = &deref->node; + set_location(&$$->loc, &@1); + } + else + $$ = NULL; } | '(' expr ')' { @@ -888,6 +897,7 @@ postfix_expr: primary_expr constructor = d3dcompiler_alloc(sizeof(*constructor)); constructor->node.type = HLSL_IR_CONSTRUCTOR; + set_location(&constructor->node.loc, &@3); constructor->node.data_type = $2; constructor->arguments = $4;

1 0

Matteo Bruni : d3dcompiler: Don't allow semantics on void functions.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 604a91eb579bd3249d366cb90018810e08f51717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604a91eb579bd3249d366cb90… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:22 2012 +0200 d3dcompiler: Don't allow semantics on void functions. --- dlls/d3dcompiler_43/hlsl.y | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index eedf357..33db86b 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -396,6 +396,11 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' s HLSL_LEVEL_ERROR, "redefinition of '%s'\n", $3); return 1; } + if ($2->base_type == HLSL_TYPE_VOID && $7) + { + hlsl_report_message(hlsl_ctx.source_file, @7.first_line, @7.first_column, + HLSL_LEVEL_ERROR, "void function with a semantic"); + } $$ = new_func_decl($3, $2, $5); if (!$$)

1 0