April 2011 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : vendor: Show versions and their ratings along with app names
by Alexander Nicolaysen Sørnes April 21, 2011

April 21, 2011

Module: appdb Branch: master Commit: e31534010203539e1f1fce5d07555f89425a7e38 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e31534010203539e1f1fce5d… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Thu Apr 21 16:55:35 2011 +0200 vendor: Show versions and their ratings along with app names --- include/vendor.php | 53 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 820741b..189a3d0 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -392,15 +392,60 @@ class Vendor { if($this->aApplicationsIds) { - echo ' Applications by '.$this->sName.' <ol>',"\n"; + echo ' Applications by '.$this->sName.' ',"\n"; + + $oTable = new Table(); + + $oRow = new TableRow(); + $oRow->AddTextCell('Name'); + $oRow->AddTextCell('Rating'); + $oRow->AddTextCell('Tested Wine version'); + $oRow->SetClass('color4'); + $oRow->SetStyle('color: #ffffff;'); + $oTable->AddRow($oRow); + + $i = 0; + foreach($this->aApplicationsIds as $iAppId) { $oApp = new Application($iAppId); - if($oApp->objectGetState() == 'accepted') - echo '<li>'.$oApp->objectMakeLink().'</li>',"\n"; + if($oApp->objectGetState() != 'accepted') + continue; + + $i++; + $oRow = new TableRow(); + $oRow->SetClass(($i % 2) ? 'color0' : 'color1'); + $oRow->AddTextCell($oApp->objectMakeLink()); + $oRow->AddTextCell(''); + $oRow->AddTextCell(''); + $oTable->AddRow($oRow); + + $aVersions = $oApp->objectGetChildrenClassSpecific('version'); + + foreach($aVersions as $oVersion) + { + if($oVersion->objectGetState() != 'accepted') + continue; + + $i++; + $oRow = new TableRow(); + $oRow->SetClass(($i % 2) ? 'color0' : 'color1'); + $oRow->AddTextCell('   '.$oVersion->objectMakeLink()); + + $oCell = new TableCell($oVersion->sTestedRating); + $oCell->setClass($oVersion->sTestedRating); + $oRow->AddCell($oCell); + + $oCell = new TableCell($oVersion->sTestedRelease); + $oCell->setClass($oVersion->sTestedRating); + $oRow->AddCell($oCell); + + $oTable->AddRow($oRow); + } + } - echo '</ol>',"\n"; + echo $oTable->GetString(),"\n"; } }

1 0

Dylan Smith : d3dxof: GetName can be used to just get the name length.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 8cae5c23121ffbf76cce42947ac22a30f3b1f369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cae5c23121ffbf76cce42947… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 20 16:20:53 2011 -0400 d3dxof: GetName can be used to just get the name length. --- dlls/d3dxof/d3dxof.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 51fc14b..7e3eb9e 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -728,13 +728,23 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetName(IDirectXFileData* iface, LPST { IDirectXFileDataImpl *This = (IDirectXFileDataImpl *)iface; + DWORD len; TRACE("(%p/%p)->(%p,%p)\n", This, iface, pstrNameBuf, pdwBufLen); - if (!pstrNameBuf) + if (!pdwBufLen) return DXFILEERR_BADVALUE; - strcpy(pstrNameBuf, This->pobj->name); + len = strlen(This->pobj->name); + if (len) + len++; + + if (pstrNameBuf) { + if (*pdwBufLen < len) + return DXFILEERR_BADVALUE; + CopyMemory(pstrNameBuf, This->pobj->name, len); + } + *pdwBufLen = len; return DXFILE_OK; } @@ -962,15 +972,25 @@ static ULONG WINAPI IDirectXFileDataReferenceImpl_Release(IDirectXFileDataRefere static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetName(IDirectXFileDataReference* iface, LPSTR pstrNameBuf, LPDWORD pdwBufLen) { IDirectXFileDataReferenceImpl *This = (IDirectXFileDataReferenceImpl *)iface; + DWORD len; TRACE("(%p/%p)->(%p,%p)\n", This, iface, pstrNameBuf, pdwBufLen); - if (!pstrNameBuf) + if (!pdwBufLen) return DXFILEERR_BADVALUE; - strcpy(pstrNameBuf, This->ptarget->name); + len = strlen(This->ptarget->name); + if (len) + len++; - return DXFILEERR_BADVALUE; + if (pstrNameBuf) { + if (*pdwBufLen < len) + return DXFILEERR_BADVALUE; + CopyMemory(pstrNameBuf, This->ptarget->name, len); + } + *pdwBufLen = len; + + return DXFILE_OK; } static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetId(IDirectXFileDataReference* iface, LPGUID pGuid)

1 0

Akihiro Sagawa : comdlg32: Update Japanese resource.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 5368652d6be77fa842b5fc66ba5d1c90a60eea67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5368652d6be77fa842b5fc66b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 21 22:56:14 2011 +0900 comdlg32: Update Japanese resource. --- dlls/comdlg32/cdlg_Ja.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg_Ja.rc b/dlls/comdlg32/cdlg_Ja.rc index 18d9f78..cd336e9 100644 --- a/dlls/comdlg32/cdlg_Ja.rc +++ b/dlls/comdlg32/cdlg_Ja.rc @@ -354,3 +354,21 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "キャンセル", IDCANCEL,222,128,50,14 PUSHBUTTON "ヘルプ(&H)", pshHelp,222,145,50,14 } + +NEWFILEOPENV3ORD DIALOG 0, 0, 440, 300 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN | + WS_THICKFRAME +CAPTION "ファイルを開く" +FONT 8, "MS Shell Dlg" +{ + LTEXT "ファイル名:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT + EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP + + LTEXT "ファイルの種類:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | + CBS_HASSTRINGS | CBS_DROPDOWNLIST + + DEFPUSHBUTTON "開く(&O)", IDOK, 350, 240, 40, 14, WS_GROUP + PUSHBUTTON "キャンセル", IDCANCEL, 395, 240, 40, 14 + PUSHBUTTON "ヘルプ(&H)", pshHelp, 350, 272, 40, 14 +}

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: f50ad1223dce4caca6f2dc139f24aa58b22afcb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50ad1223dce4caca6f2dc139… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 21 22:56:17 2011 +0900 po: Update Japanese translation. --- po/ja.po | 61 ++++++++++++++++++++++++------------------------------------- 1 files changed, 24 insertions(+), 37 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2429fd1..36a74f6 100644 --- a/po/ja.po +++ b/po/ja.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: 2011-03-23 23:12+0900\n" +"PO-Revision-Date: 2011-04-21 22:22+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -2005,13 +2005,12 @@ msgid "Default MidiOut Device" msgstr "デフォルト MidiOut デバイス" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "既定の設定" +msgstr "地域の設定" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%u MB 使用中、%u MB 使用可能" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options" @@ -2170,36 +2169,32 @@ msgid "Configure Wine Internet Browser and related settings" msgstr "Wine インターネットブラウザや関連する設定を構成します" #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "終了時に設定を保存(&S)" +msgstr "ゾーンのセキュリティ設定: " #: inetcpl.rc:31 -#, fuzzy msgid "Custom" -msgstr "カスタマイズ" +msgstr "カスタム" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "超低" #: inetcpl.rc:33 -#, fuzzy msgid "Low" -msgstr "低(&L)" +msgstr "低" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "中" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "中高" #: inetcpl.rc:36 -#, fuzzy msgid "High" -msgstr "高(&H)" +msgstr "高" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -6284,7 +6279,7 @@ msgstr "ヘルプ(&H)" #: shdocvw.rc:57 msgid "&About Internet Explorer..." -msgstr "インターネットエクスプローラについて(&A)..." +msgstr "バージョン情報(&A)..." #: shdocvw.rc:73 msgid "Address" @@ -6380,7 +6375,7 @@ msgstr "終了(&X)" #: shell32.rc:115 msgid "&About Control Panel..." -msgstr "コントロールパネルについて(&A)..." +msgstr "バージョン情報(&A)..." #: shell32.rc:123 shell32.rc:127 winefile.rc:113 msgid "Size" @@ -7725,9 +7720,8 @@ msgid "&Always on Top" msgstr "常に手前に表示(&A)" #: clock.rc:42 -#, fuzzy msgid "&About Clock" -msgstr "時計について(&A)..." +msgstr "バージョン情報(&A)" #: clock.rc:48 msgid "Clock" @@ -8273,7 +8267,7 @@ msgstr "文法エラー\n" #: cmd.rc:266 msgid "%s: File Not Found\n" -msgstr "%s : ファイルが見つかりません\n" +msgstr "%s: ファイルが見つかりません\n" #: cmd.rc:267 msgid "No help available for %s\n" @@ -8608,13 +8602,12 @@ msgid "&Replace...\tCtrl+H" msgstr "置換(&R)...\tCtrl+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 -#, fuzzy msgid "&Contents\tF1" -msgstr "目次(&C)" +msgstr "目次(&C)\tF1" #: notepad.rc:59 msgid "&About Notepad" -msgstr "メモ帳について(&A)" +msgstr "バージョン情報(&A)" #: notepad.rc:65 msgid "&f" @@ -8818,7 +8811,7 @@ msgstr "更新(&R)\tF5" #: oleview.rc:71 msgid "&About OleView" -msgstr "OleView について(&A)" +msgstr "バージョン情報(&A)" #: oleview.rc:79 msgid "&Save as..." @@ -9070,9 +9063,8 @@ msgid "&Arrange Icons" msgstr "アイコンの並び替え(&A)" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "プログラムマネージャ" +msgstr "バージョン情報(&A)" #: progman.rc:60 msgid "Program Manager" @@ -9231,9 +9223,8 @@ msgid "&Multi String Value" msgstr "複数行文字列値(&M)" #: regedit.rc:52 regedit.rc:103 -#, fuzzy msgid "&Expandable String Value" -msgstr "文字列値(&S)" +msgstr "展開可能な文字列値(&E)" #: regedit.rc:56 regedit.rc:107 msgid "&Rename\tF2" @@ -10824,9 +10815,8 @@ msgid "Arrange &Symbols" msgstr "Arrange &Symbols" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File" -msgstr "Winefile について(&A)..." +msgstr "バージョン情報(&A)" #: winefile.rc:93 msgid "Applying font settings" @@ -10890,7 +10880,7 @@ msgstr "%s of %s free" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "ゲーム(&G)" #: winemine.rc:35 msgid "&New\tF2" @@ -10898,7 +10888,7 @@ msgstr "スタート(&N)\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "?マークを使用(&M)" #: winemine.rc:39 msgid "&Beginner" @@ -10917,14 +10907,12 @@ msgid "&Custom..." msgstr "盤面の変更(&C)" #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" msgstr "ハイスコア(&F)" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "Wineについて(&A)" +msgstr "バージョン情報(&A)" #: winemine.rc:27 msgid "WineMine" @@ -10975,9 +10963,8 @@ msgid "Large" msgstr "大" #: winhlp32.rc:54 -#, fuzzy msgid "&Help on help\tF1" -msgstr "ヘルプの使い方(&H)" +msgstr "ヘルプの使い方(&H)\tF1" #: winhlp32.rc:55 msgid "Always on &top"

1 0

Dylan Smith : d3dxof: Initialize binary member variable of xobjects.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 7cf7421e7a9d6afdbe6ba5dac7c433ae3cf952a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cf7421e7a9d6afdbe6ba5dac… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 20 16:21:06 2011 -0400 d3dxof: Initialize binary member variable of xobjects. --- dlls/d3dxof/parsing.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 34801ac..c3bfba0 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1229,6 +1229,7 @@ _exit: buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; + buf->pxo->childs[buf->pxo->nb_childs]->binary = FALSE; buf->pxo->nb_childs++; } else if (check_TOKEN(buf) == TOKEN_NAME) @@ -1274,6 +1275,7 @@ BOOL parse_object(parse_buffer * buf) buf->pxo->pos_data = buf->cur_pos_data; buf->pxo->ptarget = NULL; + buf->pxo->binary = FALSE; buf->pxo->root = buf->pxo_tab; if (get_TOKEN(buf) != TOKEN_NAME)

1 0

Dylan Smith : d3dxof/tests: Make expected value in string and comparison match.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 183d03871d53f34d8aacfdb02607fbfbeec18a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183d03871d53f34d8aacfdb02… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 20 16:21:17 2011 -0400 d3dxof/tests: Make expected value in string and comparison match. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index a3fc070..39fa880 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -155,7 +155,7 @@ static void test_refcount(void) ref = getRefcount( (IUnknown *) lpdxfeo); ok(ref == 1, "Got refcount %d, expected 1\n", ref); ref = getRefcount( (IUnknown *) lpdxfd); - ok(ref == 2, "Got refcount %d, expected 1\n", ref); + ok(ref == 2, "Got refcount %d, expected 2\n", ref); ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(ref == 0, "Got refcount %d, expected 0\n", ref);

1 0

Piotr Caban : msvcrt: Added _resetstkoflw implementation.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 18b8f951bfe8fab2726e7ac47b4d3917d3e2281e URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b8f951bfe8fab2726e7ac47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 12:37:56 2011 +0200 msvcrt: Added _resetstkoflw implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 12 +++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cf5b3e1..6d7718c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1045,7 +1045,7 @@ @ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt -@ stub _resetstkoflw +@ cdecl _resetstkoflw() msvcrt._resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 9df4d9c..a48003b 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -499,7 +499,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _resetstkoflw +@ cdecl _resetstkoflw() msvcrt._resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7949a4b..9caefb7 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -494,7 +494,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ extern _pwctype msvcrt._pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _resetstkoflw +@ cdecl _resetstkoflw() msvcrt._resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e2aec87..fa2a271 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -893,7 +893,7 @@ @ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt -@ stub _resetstkoflw +@ cdecl _resetstkoflw() msvcrt._resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 36c7bdb..cbf4f74 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -879,7 +879,7 @@ @ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) @ stub _recalloc_crt -@ stub _resetstkoflw +@ cdecl _resetstkoflw() msvcrt._resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir @ cdecl _rmtmp() msvcrt._rmtmp @ cdecl _rotl(long long) msvcrt._rotl diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index b32fdb9..a572636 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -256,9 +256,19 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, /********************************************************************* * _get_output_format (MSVCRT.@) - * */ unsigned int CDECL _get_output_format(void) { return 0; } + +/********************************************************************* + * _resetstkoflw (MSVCRT.@) + */ +int CDECL _resetstkoflw(void) +{ + int stack_addr; + + /* causes stack fault that updates NtCurrentTeb()->Tib.StackLimit */ + return VirtualProtect( &stack_addr, 1, PAGE_GUARD|PAGE_READWRITE, NULL ); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9777e32..aaaca94 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -827,7 +827,7 @@ # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read # stub _realloc_dbg -# stub _resetstkoflw +@ cdecl _resetstkoflw() @ cdecl _rmdir(str) MSVCRT__rmdir @ cdecl _rmtmp() @ cdecl _rotl(long long)

1 0

Jacek Caban : wininet: Use wrappers for HeapAlloc calls.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 354a74e0043f9df464dcd6ee44e35f9d063639cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=354a74e0043f9df464dcd6ee4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 21 13:39:03 2011 +0200 wininet: Use wrappers for HeapAlloc calls. --- dlls/wininet/cookie.c | 8 ++-- dlls/wininet/ftp.c | 14 +++--- dlls/wininet/http.c | 94 ++++++++++++++++++++--------------------- dlls/wininet/internet.c | 60 +++++++++++++------------- dlls/wininet/internet.h | 8 ++-- dlls/wininet/netconnection.c | 2 +- dlls/wininet/urlcache.c | 12 +++--- dlls/wininet/utility.c | 6 +- 8 files changed, 101 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=354a74e0043f9df464dcd…

1 0

Dylan Smith : d3dxof: Avoid overflowing temp buffers for large tokens.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: 10fbf5f54205d12171334c5653ff6a21c578a184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fbf5f54205d12171334c565… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 20 16:20:11 2011 -0400 d3dxof: Avoid overflowing temp buffers for large tokens. --- dlls/d3dxof/parsing.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 038486a..34801ac 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -340,7 +340,7 @@ static BOOL is_guid(parse_buffer* buf) if (buf->rem_bytes < 38 || *buf->buffer != '<') return FALSE; tmp[0] = '<'; - while (*(buf->buffer+pos) != '>') + while (pos < sizeof(tmp) - 2 && *(buf->buffer+pos) != '>') { tmp[pos] = *(buf->buffer+pos); pos++; @@ -381,7 +381,7 @@ static BOOL is_guid(parse_buffer* buf) static BOOL is_name(parse_buffer* buf) { - char tmp[50]; + char tmp[512]; DWORD pos = 0; char c; BOOL error = 0; @@ -389,9 +389,11 @@ static BOOL is_name(parse_buffer* buf) { if (!(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) || (c == '_') || (c == '-'))) error = 1; - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; if (error) { @@ -410,7 +412,7 @@ static BOOL is_name(parse_buffer* buf) static BOOL is_float(parse_buffer* buf) { - char tmp[50]; + char tmp[512]; DWORD pos = 0; char c; float decimal; @@ -422,9 +424,11 @@ static BOOL is_float(parse_buffer* buf) return FALSE; if (c == '.') dot = TRUE; - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; buf->buffer += pos; buf->rem_bytes -= pos; @@ -440,7 +444,7 @@ static BOOL is_float(parse_buffer* buf) static BOOL is_integer(parse_buffer* buf) { - char tmp[50]; + char tmp[512]; DWORD pos = 0; char c; DWORD integer; @@ -449,9 +453,11 @@ static BOOL is_integer(parse_buffer* buf) { if (!((c >= '0') && (c <= '9'))) return FALSE; - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; buf->buffer += pos; buf->rem_bytes -= pos; @@ -467,7 +473,7 @@ static BOOL is_integer(parse_buffer* buf) static BOOL is_string(parse_buffer* buf) { - char tmp[100]; + char tmp[512]; DWORD pos = 0; char c; BOOL ok = 0; @@ -475,16 +481,18 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (pos < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1)) && (pos < 99)) + while (pos < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) { if (c == '"') { ok = 1; break; } - tmp[pos++] = c; + if (pos < sizeof(tmp)) + tmp[pos] = c; + pos++; } - tmp[pos] = 0; + tmp[min(pos, sizeof(tmp) - 1)] = 0; if (!ok) {

1 0

Alexandre Julliard : user32: Don' t start menu tracking when the owner window is invalid.
by Alexandre Julliard April 21, 2011

April 21, 2011

Module: wine Branch: master Commit: bd1fab7862a97009fcbd7a1d1239cb0704fd139b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1fab7862a97009fcbd7a1d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 21 14:35:11 2011 +0200 user32: Don't start menu tracking when the owner window is invalid. --- dlls/user32/menu.c | 5 +++++ dlls/user32/tests/menu.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index e834cbd..7fd7d4c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1848,6 +1848,11 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, } /* store the owner for DrawItem */ + if (!IsWindow( hwndOwner )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } menu->hwndOwner = hwndOwner; menu->nScrollPos = 0; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index c0c8b9e..26fe6fb 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2932,6 +2932,20 @@ static void test_menu_trackpopupmenu(void) gflag_initmenupopup ? " WM_INITMENUPOPUP ": " ", gflag_entermenuloop ? "WM_INITMENULOOP ": "", gflag_initmenu ? "WM_INITMENU": ""); + + /* invalid window */ + SetLastError(0xdeadbeef); + gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0; + ret = MyTrackPopupMenu( Ex, hmenu, TPM_RETURNCMD, 100,100, 0, NULL); + gle = GetLastError(); + ok( !ret, "TrackPopupMenu%s should have failed\n", Ex ? "Ex" : ""); + ok( gle == ERROR_INVALID_WINDOW_HANDLE, "TrackPopupMenu%s error got %u\n", Ex ? "Ex" : "", gle ); + ok( !(gflag_initmenupopup || gflag_entermenuloop || gflag_initmenu), + "got unexpected message(s)%s%s%s\n", + gflag_initmenupopup ? " WM_INITMENUPOPUP ": " ", + gflag_entermenuloop ? "WM_INITMENULOOP ": "", + gflag_initmenu ? "WM_INITMENU": ""); + /* now a somewhat successful call */ SetLastError(0xdeadbeef); gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = 0;

1 0