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

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 25bb38347407de4532c4fcd421b9d075fc2a678e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bb38347407de4532c4fcd42… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue May 22 22:12:41 2012 +0900 po: Update Korean translation. --- po/ko.po | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/po/ko.po b/po/ko.po index e5404ac..017a1d8 100644 --- a/po/ko.po +++ b/po/ko.po @@ -156,21 +156,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,13 +168,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 키" -"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" -"다.\n" +"Wine은 닷넷 응용프로그램을 제대로 실행시키기 위해 필요한 Mono 패키지를 찾을 " +"수없습니다. Wine은 당신을 위해서 자동으로 다운로드하고 설치할 것입니다.\n" "\n" -"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " -"href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> 보십시" -"오." +"Note: it is recommended to use your distribution's packages instead. See <a " +"주의:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다.자세한 것은<a " +"href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> 을 보십" +"시오." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Andrew Eikum : msgsm32: Downgrade ERR to WARN.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 99661c7ddf594cbce6740b527f3b201c7101f0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=99661c7ddf594cbce6740b527… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:01:23 2012 -0500 msgsm32: Downgrade ERR to WARN. --- dlls/msgsm32.acm/msgsm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 2543e0b..8b0885f 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -618,7 +618,7 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case ACMDM_STREAM_CONVERT: return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2); #else - case ACMDM_STREAM_OPEN: ERR("libgsm support not compiled in!\n"); + case ACMDM_STREAM_OPEN: WARN("libgsm support not compiled in!\n"); case ACMDM_STREAM_CLOSE: case ACMDM_STREAM_SIZE: case ACMDM_STREAM_CONVERT:

1 0

Andrew Eikum : wineoss.drv: Track number of frames reserved by client in capture direction.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 1c37857a1828758b5e8c0dcb5f5fb3ec812c1834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c37857a1828758b5e8c0dcb5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:11:06 2012 -0500 wineoss.drv: Track number of frames reserved by client in capture direction. --- dlls/wineoss.drv/mmdevdrv.c | 49 ++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9b0f5f8..c8b12a3 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -120,7 +120,6 @@ struct ACImpl { UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ BYTE *local_buffer, *tmp_buffer; - int buf_state; LONG32 getbuf_last; /* <0 when using tmp_buffer */ HANDLE timer; @@ -132,12 +131,6 @@ struct ACImpl { struct list entry; }; -enum BufferStates { - NOT_LOCKED = 0, - LOCKED_NORMAL, /* public buffer piece is from local_buffer */ - LOCKED_WRAPPED /* public buffer piece is in tmp_buffer */ -}; - typedef struct _SessionMgr { IAudioSessionManager2 IAudioSessionManager2_iface; @@ -1571,7 +1564,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED || This->getbuf_last){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -1928,7 +1921,6 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - HRESULT hr; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1938,19 +1930,21 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioCaptureClient_GetNextPacketSize(iface, frames); - if(FAILED(hr)){ + if(This->held_frames < This->period_frames){ + *frames = 0; LeaveCriticalSection(&This->lock); - return hr; + return AUDCLNT_S_BUFFER_EMPTY; } *flags = 0; + *frames = This->period_frames; + if(This->lcl_offs_frames + *frames > This->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(This->tmp_buffer_frames < *frames){ @@ -1976,10 +1970,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = *frames; - if(devpos || qpcpos) - IAudioClock_GetPosition(&This->IAudioClock_iface, devpos, qpcpos); + if(devpos) + *devpos = This->written_frames; + if(qpcpos){ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } LeaveCriticalSection(&This->lock); @@ -1995,16 +1995,27 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED){ + if(!done){ + This->getbuf_last = 0; + LeaveCriticalSection(&This->lock); + return S_OK; + } + + if(!This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } + if(This->getbuf_last != done){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + + This->written_frames += done; This->held_frames -= done; This->lcl_offs_frames += done; This->lcl_offs_frames %= This->bufsize_frames; - - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock);

1 0

Andrew Eikum : wineoss.drv: Resolve some diff between winealsa and wineoss.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: e5551393bd086dbdba1c15ad7e95e4154d1726df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5551393bd086dbdba1c15ad7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:11:09 2012 -0500 wineoss.drv: Resolve some diff between winealsa and wineoss. --- dlls/wineoss.drv/mmdevdrv.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c8b12a3..62ae7ca 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1571,12 +1571,12 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(This->dataflow == eRender){ This->written_frames = 0; + This->last_pos_frames = 0; }else{ This->written_frames += This->held_frames; } - This->lcl_offs_frames = 0; This->held_frames = 0; - This->last_pos_frames = 0; + This->lcl_offs_frames = 0; LeaveCriticalSection(&This->lock); @@ -1752,8 +1752,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 pad, write_pos; - HRESULT hr; + UINT32 write_pos; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1774,13 +1773,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad + frames > This->bufsize_frames){ + if(This->held_frames + frames > This->bufsize_frames){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } @@ -2029,7 +2022,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( TRACE("(%p)->(%p)\n", This, frames); - return AudioClient_GetCurrentPadding(&This->IAudioClient_iface, frames); + if(!frames) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + *frames = This->held_frames < This->period_frames ? 0 : This->period_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =

1 0

Nikolay Sivov : comctl32: Make it possible to use TVM_GETITEM with item from another tree.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 95a15a3482ba47c1b84fd77a63f95d5cd784a97a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95a15a3482ba47c1b84fd77a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 22 11:31:23 2012 +0400 comctl32: Make it possible to use TVM_GETITEM with item from another tree. --- dlls/comctl32/tests/treeview.c | 13 +++++++- dlls/comctl32/treeview.c | 68 +++++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 2246c79..a669df9 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -746,8 +746,8 @@ static void test_get_set_item(void) TVITEMA tviRoot = {0}; int nBufferSize = 80; char szBuffer[80] = {0}; + HWND hTree, hTree2; DWORD ret; - HWND hTree; hTree = create_treeview_control(0); fill_tree(hTree); @@ -791,7 +791,18 @@ static void test_get_set_item(void) ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_item_seq, "test get set item", FALSE); + /* get item from a different tree */ + hTree2 = create_treeview_control(0); + + tviRoot.hItem = hRoot; + tviRoot.mask = TVIF_STATE; + tviRoot.state = 0; + ret = SendMessage( hTree2, TVM_GETITEMA, 0, (LPARAM)&tviRoot ); + expect(TRUE, ret); + ok(tviRoot.state == TVIS_FOCUSED, "got state 0x%0x\n", tviRoot.state); + DestroyWindow(hTree); + DestroyWindow(hTree2); } static void test_get_set_itemheight(void) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3f4fdc6..63e3507 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -67,36 +67,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); /* internal structures */ -typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ -{ - HTREEITEM parent; /* handle to parent or 0 if at root */ - HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ - HTREEITEM firstChild; /* handle to first child or 0 if no child */ - - UINT callbackMask; - UINT state; - UINT stateMask; - LPWSTR pszText; - int cchTextMax; - int iImage; - int iSelectedImage; - int iExpandedImage; - int cChildren; - LPARAM lParam; - int iIntegral; /* item height multiplier (1 is normal) */ - int iLevel; /* indentation level:0=root level */ - HTREEITEM lastChild; - HTREEITEM prevSibling; /* handle to prev item in list, 0 if first */ - RECT rect; - LONG linesOffset; - LONG stateOffset; - LONG imageOffset; - LONG textOffset; - LONG textWidth; /* horizontal text extent for pszText */ - LONG visibleOrder; /* visible ordering, 0 is first visible item */ -} TREEVIEW_ITEM; - - typedef struct tagTREEVIEW_INFO { HWND hwnd; @@ -163,6 +133,35 @@ typedef struct tagTREEVIEW_INFO WCHAR szSearchParam[ MAX_PATH ]; } TREEVIEW_INFO; +typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ +{ + HTREEITEM parent; /* handle to parent or 0 if at root */ + HTREEITEM nextSibling; /* handle to next item in list, 0 if last */ + HTREEITEM firstChild; /* handle to first child or 0 if no child */ + + UINT callbackMask; + UINT state; + UINT stateMask; + LPWSTR pszText; + int cchTextMax; + int iImage; + int iSelectedImage; + int iExpandedImage; + int cChildren; + LPARAM lParam; + int iIntegral; /* item height multiplier (1 is normal) */ + int iLevel; /* indentation level:0=root level */ + HTREEITEM lastChild; + HTREEITEM prevSibling; /* handle to prev item in list, 0 if first */ + RECT rect; + LONG linesOffset; + LONG stateOffset; + LONG imageOffset; + LONG textOffset; + LONG textWidth; /* horizontal text extent for pszText */ + LONG visibleOrder; /* visible ordering, 0 is first visible item */ + const TREEVIEW_INFO *infoPtr; /* tree data this item belongs to */ +} TREEVIEW_ITEM; /******** Defines that TREEVIEW_ProcessLetterKeys uses ****************/ #define KEY_DELAY 450 @@ -1012,6 +1011,7 @@ TREEVIEW_AllocateItem(const TREEVIEW_INFO *infoPtr) newItem->iImage = 0; newItem->iSelectedImage = 0; newItem->iExpandedImage = (WORD)I_IMAGENONE; + newItem->infoPtr = infoPtr; if (DPA_InsertPtr(infoPtr->items, INT_MAX, newItem) == -1) { @@ -2082,7 +2082,13 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW) TREEVIEW_ITEM *item = tvItem->hItem; if (!TREEVIEW_ValidItem(infoPtr, item)) - return FALSE; + { + if (!item) return FALSE; + + TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr); + infoPtr = item->infoPtr; + if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE; + } TREEVIEW_UpdateDispInfo(infoPtr, item, tvItem->mask);

1 0

Hans Leidekker : fusion: Enumerate 64-bit assemblies.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: be9459a948097ddaa780745ae2374a320cabd1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=be9459a948097ddaa780745ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 22 10:10:01 2012 +0200 fusion: Enumerate 64-bit assemblies. --- dlls/fusion/asmenum.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index e4f73e8..1d4de5b 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -21,6 +21,8 @@ #include <stdarg.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" @@ -384,8 +386,10 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) { static const WCHAR gac[] = {'\\','G','A','C',0}; static const WCHAR gac_32[] = {'\\','G','A','C','_','3','2',0}; + static const WCHAR gac_64[] = {'\\','G','A','C','_','6','4',0}; static const WCHAR gac_msil[] = {'\\','G','A','C','_','M','S','I','L',0}; WCHAR path[MAX_PATH], buf[MAX_PATH]; + SYSTEM_INFO info; HRESULT hr; DWORD size; @@ -394,6 +398,15 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + GetNativeSystemInfo(&info); + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path, buf); + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + } strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); @@ -411,6 +424,14 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + { + strcpyW(path, buf); + strcpyW(path + size - 1, gac_64); + hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); + if (FAILED(hr)) + return hr; + } strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path);

1 0

Hans Leidekker : fusion: Get rid of some redundant buffer copying.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 14a0486118d2424b3220ba28e4f84adfafb32749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a0486118d2424b3220ba28e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 22 10:10:22 2012 +0200 fusion: Get rid of some redundant buffer copying. --- dlls/fusion/asmenum.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index 1d4de5b..f4da88a 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -398,22 +398,20 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + strcpyW(path, buf); GetNativeSystemInfo(&info); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) @@ -424,27 +422,24 @@ static HRESULT enumerate_gac(IAssemblyEnumImpl *asmenum, IAssemblyName *pName) if (FAILED(hr)) return hr; + strcpyW(path, buf); if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { - strcpyW(path, buf); strcpyW(path + size - 1, gac_64); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; } - strcpyW(path, buf); strcpyW(path + size - 1, gac_32); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac_msil); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr)) return hr; - strcpyW(path, buf); strcpyW(path + size - 1, gac); hr = enum_gac_assemblies(&asmenum->assemblies, pName, 0, path); if (FAILED(hr))

1 0

Michael Stefaniuc : mshtml/tests: Remove leftover code from c3d8d052.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 2addfb73e3d783eb8fc3c3a5abc4c13f9f94c198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2addfb73e3d783eb8fc3c3a5a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:24:55 2012 +0200 mshtml/tests: Remove leftover code from c3d8d052. --- dlls/mshtml/tests/dom.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 14d91cc..4dc55db 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3541,9 +3541,6 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, test_elem_collection((IUnknown*)disp, elem_types, len); IDispatch_Release(disp); - ok(hres == S_OK, "Could not get IHTMLElementCollection interface: %08x\n", hres); - if(hres != S_OK) - goto cleanup; V_VT(&index) = VT_I4; @@ -3573,7 +3570,6 @@ static void test_elem_col_item(IHTMLElementCollection *col, const char *n, ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(disp == NULL, "disp != NULL\n"); -cleanup: SysFreeString(V_BSTR(&name)); }

1 0

Michael Stefaniuc : wininet/tests: Remove wrong check for 'len'.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 92c97c1710c8842d4d45f02e5b1527f125f0ca9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=92c97c1710c8842d4d45f02e5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:32:25 2012 +0200 wininet/tests: Remove wrong check for 'len'. --- dlls/wininet/tests/url.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 15fbb09..a391aa6 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -792,7 +792,6 @@ static void InternetCreateUrlA_test(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - ok(len == -1, "Expected len -1, got %d\n", len); /* test valid lpUrlComponents, empty szUrl * lpdwUrlLength is size of buffer required on exit, including

1 0

Michael Stefaniuc : d3dx9_36/tests: Check the correct return value.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 7446af76f4e151d1a701ec2827dfc11b158ce814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7446af76f4e151d1a701ec282… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 22 11:36:20 2012 +0200 d3dx9_36/tests: Check the correct return value. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index d11a918..aa3ac12 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -480,7 +480,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device) res = ID3DXConstantTable_SetMatrix(ctable, device, "mvp", &mvp); ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable mvp: got 0x%08x\n", res); - ID3DXConstantTable_SetInt(ctable, device, "i", i + 1); + res = ID3DXConstantTable_SetInt(ctable, device, "i", i + 1); ok(res == D3D_OK, "ID3DXConstantTable_SetInt failed on variable i: got 0x%08x\n", res); /* Check that setting i again will overwrite the previous value */

1 0