June 2014 - Wine-Commits - list.winehq.org

Jacek Caban : vbscript: Always initialize is_array value (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 2de2e10d47aa27321cb3ba0954105b966fee2ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de2e10d47aa27321cb3ba095… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 10 10:23:55 2014 +0200 vbscript: Always initialize is_array value (valgrind). --- dlls/vbscript/compile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e1245d6..73f0615 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1656,11 +1656,10 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) return E_OUTOFMEMORY; class_desc->props[i].is_public = prop_decl->is_public; + class_desc->props[i].is_array = prop_decl->is_array; - if(prop_decl->is_array) { - class_desc->props[i].is_array = TRUE; + if(prop_decl->is_array) class_desc->array_cnt++; - } } if(class_desc->array_cnt) {

1 0

Jacek Caban : jscript: Properly handle NULL pvarResult in ParseScriptText.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 755eac8f0c722ece206eb6ad8433db6b69ce97df URL: http://source.winehq.org/git/wine.git/?a=commit;h=755eac8f0c722ece206eb6ad8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 9 14:02:35 2014 +0200 jscript: Properly handle NULL pvarResult in ParseScriptText. --- dlls/jscript/jscript.c | 3 ++- dlls/jscript/tests/run.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index c56e638..4a32c4d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -783,7 +783,8 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, clear_ei(This->ctx); hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); if(SUCCEEDED(hres)) { - hres = jsval_to_variant(r, pvarResult); + if(pvarResult) + hres = jsval_to_variant(r, pvarResult); jsval_release(r); } exec_release(exec_ctx); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index a92282a..dbd9b6b 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1945,6 +1945,13 @@ static void test_script_exprs(void) hres = parse_script_expr("reportSuccess(); return true", &v); ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = parse_script_expr("reportSuccess(); true", NULL); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + testing_expr = FALSE; }

1 0

Michael Stefaniuc : dmime: Move a struct definition to the .c file that uses it.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 8b9fd8939bfc86d8046a2c69859d8ce3b69cab8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9fd8939bfc86d8046a2c698… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:27:04 2014 +0200 dmime: Move a struct definition to the .c file that uses it. --- dlls/dmime/dmime_private.h | 17 ----------------- dlls/dmime/segment.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 01cd528..35b51a2 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -46,7 +46,6 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl; typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl; typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; @@ -122,22 +121,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { } DMUSIC_PRIVATE_PCHANNEL, *LPDMUSIC_PRIVATE_PCHANNEL; /***************************************************************************** - * IDirectMusicSegment8Impl implementation structure - */ -struct IDirectMusicSegment8Impl { - IDirectMusicSegment8 IDirectMusicSegment8_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicSegment8Impl fields */ - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_SEGMENT_HEADER header; - IDirectMusicGraph* pGraph; - struct list Tracks; -}; - -/***************************************************************************** * IDirectMusicAudioPathImpl implementation structure */ struct IDirectMusicAudioPathImpl { diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 1bdf163..d17b341 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -26,6 +26,17 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicSegmentImpl implementation */ +typedef struct IDirectMusicSegment8Impl { + IDirectMusicSegment8 IDirectMusicSegment8_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_SEGMENT_HEADER header; + IDirectMusicGraph *pGraph; + struct list Tracks; +} IDirectMusicSegment8Impl; + static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMusicSegment8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface);

1 0

Michael Stefaniuc : dmime/tests: Rather test for IDirectMusicObject as invalid iface.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 232aeb6b20ac7612824e6c5ad03a046b9a8a05e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=232aeb6b20ac7612824e6c5ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 9 13:23:07 2014 +0200 dmime/tests: Rather test for IDirectMusicObject as invalid iface. --- dlls/dmime/tests/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 143eeed..de8b76e 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -216,7 +216,7 @@ static void test_COM(void) /* Invalid RIID */ hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectSound, (void**)&dmp); + &IID_IDirectMusicObject, (void**)&dmp); ok(hr == E_NOINTERFACE, "DirectMusicPerformance create failed: %08x, expected E_NOINTERFACE\n", hr);

1 0

Nikolay Sivov : comctl32/treeview: Simplify sending parent WM_NOTIFY notifications.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3f8bda94fc264188133d25f7a5c9b4d544414cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f8bda94fc264188133d25f7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 4 00:13:38 2014 +0400 comctl32/treeview: Simplify sending parent WM_NOTIFY notifications. --- dlls/comctl32/treeview.c | 80 ++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 59 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 6dd7e93..c26513f 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -499,24 +499,22 @@ static INT get_notifycode(const TREEVIEW_INFO *infoPtr, INT code) } static inline BOOL -TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPNMHDR pnmh) +TREEVIEW_SendRealNotify(const TREEVIEW_INFO *infoPtr, UINT code, NMHDR *hdr) { - TRACE("wParam=%ld, lParam=%p\n", wParam, pnmh); - return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, wParam, (LPARAM)pnmh); + TRACE("code=%d, hdr=%p\n", code, hdr); + + hdr->hwndFrom = infoPtr->hwnd; + hdr->idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); + hdr->code = get_notifycode(infoPtr, code); + + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); } static BOOL TREEVIEW_SendSimpleNotify(const TREEVIEW_INFO *infoPtr, UINT code) { - NMHDR nmhdr; - HWND hwnd = infoPtr->hwnd; - - TRACE("%d\n", code); - nmhdr.hwndFrom = hwnd; - nmhdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.code = get_notifycode(infoPtr, code); - - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.idFrom, &nmhdr); + NMHDR hdr; + return TREEVIEW_SendRealNotify(infoPtr, code, &hdr); } static VOID @@ -556,18 +554,13 @@ static BOOL TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action, UINT mask, HTREEITEM oldItem, HTREEITEM newItem) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; BOOL ret; TRACE("code:%d action:%x olditem:%p newitem:%p\n", code, action, oldItem, newItem); - ZeroMemory(&nmhdr, sizeof(NMTREEVIEWW)); - - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); + memset(&nmhdr, 0, sizeof(NMTREEVIEWW)); nmhdr.action = action; if (oldItem) @@ -579,7 +572,7 @@ TREEVIEW_SendTreeviewNotify(const TREEVIEW_INFO *infoPtr, UINT code, UINT action nmhdr.ptDrag.x = 0; nmhdr.ptDrag.y = 0; - ret = TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); if (!infoPtr->bNtfUnicode) { Free(nmhdr.itemOld.pszText); @@ -592,14 +585,10 @@ static BOOL TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, HTREEITEM dragItem, POINT pt) { - HWND hwnd = infoPtr->hwnd; NMTREEVIEWW nmhdr; TRACE("code:%d dragitem:%p\n", code, dragItem); - nmhdr.hdr.hwndFrom = hwnd; - nmhdr.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmhdr.hdr.code = get_notifycode(infoPtr, code); nmhdr.action = 0; nmhdr.itemNew.mask = TVIF_STATE | TVIF_PARAM | TVIF_HANDLE; nmhdr.itemNew.hItem = dragItem; @@ -609,7 +598,7 @@ TREEVIEW_SendTreeviewDnDNotify(const TREEVIEW_INFO *infoPtr, UINT code, nmhdr.ptDrag.x = pt.x; nmhdr.ptDrag.y = pt.y; - return TREEVIEW_SendRealNotify(infoPtr, nmhdr.hdr.idFrom, &nmhdr.hdr); + return TREEVIEW_SendRealNotify(infoPtr, code, &nmhdr.hdr); } @@ -617,16 +606,12 @@ static BOOL TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, HDC hdc, RECT rc) { - HWND hwnd = infoPtr->hwnd; NMTVCUSTOMDRAW nmcdhdr; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; TRACE("drawstage:%x hdc:%p\n", dwDrawStage, hdc); nmcd = &nmcdhdr.nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = rc; @@ -637,11 +622,9 @@ TREEVIEW_SendCustomDrawNotify(const TREEVIEW_INFO *infoPtr, DWORD dwDrawStage, nmcdhdr.clrTextBk = infoPtr->clrBk; nmcdhdr.iLevel = 0; - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr.nmcd.hdr); + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr.nmcd.hdr); } - - /* FIXME: need to find out when the flags in uItemState need to be set */ static BOOL @@ -649,8 +632,7 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item, UINT uItemDrawState, NMTVCUSTOMDRAW *nmcdhdr) { - HWND hwnd = infoPtr->hwnd; - LPNMCUSTOMDRAW nmcd; + NMCUSTOMDRAW *nmcd; DWORD dwDrawStage; DWORD_PTR dwItemSpec; UINT uItemState; @@ -666,9 +648,6 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, uItemState |= CDIS_HOT; nmcd = &nmcdhdr->nmcd; - nmcd->hdr.hwndFrom = hwnd; - nmcd->hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - nmcd->hdr.code = NM_CUSTOMDRAW; nmcd->dwDrawStage = dwDrawStage; nmcd->hdc = hdc; nmcd->rc = item->rect; @@ -681,24 +660,19 @@ TREEVIEW_SendCustomDrawItemNotify(const TREEVIEW_INFO *infoPtr, HDC hdc, nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec, nmcd->uItemState, nmcd->lItemlParam); - return TREEVIEW_SendRealNotify(infoPtr, nmcd->hdr.idFrom, &nmcdhdr->nmcd.hdr); + return TREEVIEW_SendRealNotify(infoPtr, NM_CUSTOMDRAW, &nmcdhdr->nmcd.hdr); } static BOOL TREEVIEW_BeginLabelEditNotify(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *editItem) { - HWND hwnd = infoPtr->hwnd; NMTVDISPINFOW tvdi; BOOL ret; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_BEGINLABELEDITW); - TREEVIEW_TVItemFromItem(infoPtr, TVIF_HANDLE | TVIF_STATE | TVIF_PARAM | TVIF_TEXT, &tvdi.item, editItem); - ret = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + ret = TREEVIEW_SendRealNotify(infoPtr, TVN_BEGINLABELEDITW, &tvdi.hdr); if (!infoPtr->bNtfUnicode) Free(tvdi.item.pszText); @@ -711,17 +685,12 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, UINT mask) { NMTVDISPINFOEXW callback; - HWND hwnd = infoPtr->hwnd; TRACE("mask=0x%x, callbackmask=0x%x\n", mask, item->callbackMask); mask &= item->callbackMask; if (mask == 0) return; - callback.hdr.hwndFrom = hwnd; - callback.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - callback.hdr.code = get_notifycode(infoPtr, TVN_GETDISPINFOW); - /* 'state' always contains valid value, as well as 'lParam'. * All other parameters are uninitialized. */ @@ -736,7 +705,7 @@ TREEVIEW_UpdateDispInfo(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, if (mask & TVIF_TEXT) item->textWidth = 0; - TREEVIEW_SendRealNotify(infoPtr, callback.hdr.idFrom, &callback.hdr); + TREEVIEW_SendRealNotify(infoPtr, TVN_GETDISPINFOW, &callback.hdr); TRACE("resulting code 0x%08x\n", callback.hdr.code); /* It may have changed due to a call to SetItem. */ @@ -3990,7 +3959,6 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) static LRESULT TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { - HWND hwnd = infoPtr->hwnd; TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; @@ -4000,9 +3968,6 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!IsWindow(infoPtr->hwndEdit)) return FALSE; - tvdi.hdr.hwndFrom = hwnd; - tvdi.hdr.idFrom = GetWindowLongPtrW(hwnd, GWLP_ID); - tvdi.hdr.code = get_notifycode(infoPtr, TVN_ENDLABELEDITW); tvdi.item.mask = 0; tvdi.item.hItem = editedItem; tvdi.item.state = editedItem->state; @@ -4030,7 +3995,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) tvdi.item.cchTextMax = 0; } - bCommit = TREEVIEW_SendRealNotify(infoPtr, tvdi.hdr.idFrom, &tvdi.hdr); + bCommit = TREEVIEW_SendRealNotify(infoPtr, TVN_ENDLABELEDITW, &tvdi.hdr); if (!bCancel && bCommit) /* Apply the changes */ { @@ -5543,9 +5508,6 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) item = TREEVIEW_HitTestPoint(infoPtr, pt); memset(&nmmouse, 0, sizeof(nmmouse)); - nmmouse.hdr.hwndFrom = infoPtr->hwnd; - nmmouse.hdr.idFrom = GetWindowLongPtrW(infoPtr->hwnd, GWLP_ID); - nmmouse.hdr.code = NM_SETCURSOR; if (item) { nmmouse.dwItemSpec = (DWORD_PTR)item; @@ -5554,7 +5516,7 @@ TREEVIEW_SetCursor(const TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) nmmouse.pt.x = 0; nmmouse.pt.y = 0; nmmouse.dwHitInfo = lParam; - if (TREEVIEW_SendRealNotify(infoPtr, nmmouse.hdr.idFrom, &nmmouse.hdr)) + if (TREEVIEW_SendRealNotify(infoPtr, NM_SETCURSOR, &nmmouse.hdr)) return 0; if (item && (infoPtr->dwStyle & TVS_TRACKSELECT))

1 0

Nikolay Sivov : comctl32/progress: Erase background too on WM_TIMER for marquee animation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: c69a7ecfb6c2ca6e9844a567c4dfe58f6f7070d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69a7ecfb6c2ca6e9844a567c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 7 23:46:25 2014 +0400 comctl32/progress: Erase background too on WM_TIMER for marquee animation. --- dlls/comctl32/progress.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 69e9cf8..7c996cb 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -474,11 +474,9 @@ static LRESULT PROGRESS_Timer (PROGRESS_INFO *infoPtr, INT idTimer) /* increment the marquee progress */ if(++infoPtr->MarqueePos >= leds) - { infoPtr->MarqueePos = 0; - } - InvalidateRect(infoPtr->Self, &rect, FALSE); + InvalidateRect(infoPtr->Self, &rect, TRUE); UpdateWindow(infoPtr->Self); } return 0;

1 0

Nikolay Sivov : comctl32/progress: Set default marquee animation timer to 30 msec.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 25279d310e90a90c7584111932b014f035c3f203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25279d310e90a90c758411193… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 7 23:29:38 2014 +0400 comctl32/progress: Set default marquee animation timer to 30 msec. --- dlls/comctl32/progress.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 989c61e..69e9cf8 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -68,6 +68,7 @@ typedef struct #define LED_GAP 2 #define MARQUEE_LEDS 5 #define ID_MARQUEE_TIMER 1 +#define DEFAULT_MARQUEE_PERIOD 30 /* Helper to obtain size of a progress bar chunk ("led"). */ static inline int get_led_size ( const PROGRESS_INFO *infoPtr, LONG style, @@ -724,8 +725,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, case PBM_SETMARQUEE: if(wParam != 0) { + UINT period = lParam ? (UINT)lParam : DEFAULT_MARQUEE_PERIOD; infoPtr->Marquee = TRUE; - SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, (UINT)lParam, NULL); + SetTimer(infoPtr->Self, ID_MARQUEE_TIMER, period, NULL); } else {

1 0

Jacek Caban : ntdll: Removed no longer used defines.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1d6bf952d384ca0799943f193a96a7c647b32bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d6bf952d384ca0799943f193… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 5 15:43:16 2014 +0200 ntdll: Removed no longer used defines. --- dlls/ntdll/misc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 8bd4eb7..659d504 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -32,11 +32,6 @@ #include "ntdll_misc.h" -#if defined(__GNUC__) && defined(__i386__) -#define DO_FPU(x,y) __asm__ __volatile__( x " %0;fwait" : "=m" (y) : ) -#define POP_FPU(x) DO_FPU("fstpl",x) -#endif - LPCSTR debugstr_ObjectAttributes(const OBJECT_ATTRIBUTES *oa) { if (!oa) return "<null>";

1 0

Piotr Caban : msvcp70: Export basic_string iterator functions.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 9e4803dd0bf7cf01c6fc0577e6b0f9aa52bf69dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e4803dd0bf7cf01c6fc0577e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 4 15:07:20 2014 +0200 msvcp70: Export basic_string iterator functions. --- dlls/msvcp70/msvcp70.spec | 146 ++++++++++++++++++++++----------------------- dlls/msvcp90/string.c | 77 +++++++++++++++++++++++- 2 files changed, 148 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e4803dd0bf7cf01c6fc0…

1 0

Stefan Dösinger : ddraw/tests: Test D3DVBCAPS_WRITEONLY.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: e7163c802d3e13f434bcb58afe04f40d35221a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7163c802d3e13f434bcb58af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 3 09:41:43 2014 +0200 ddraw/tests: Test D3DVBCAPS_WRITEONLY. --- dlls/ddraw/tests/ddraw4.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3d0bfe5..464d955 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7438,6 +7438,75 @@ static void test_palette_alpha(void) DestroyWindow(window); } +static void test_vb_writeonly(void) +{ + IDirect3DDevice3 *device; + IDirect3D3 *d3d; + IDirect3DVertexBuffer *buffer; + HWND window; + HRESULT hr; + D3DVERTEXBUFFERDESC desc; + void *ptr; + static const struct vec4 quad[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + {640.0f, 480.0f, 0.0f, 1.0f}, + {640.0f, 0.0f, 0.0f, 1.0f}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZRHW; + desc.dwNumVertices = sizeof(quad) / sizeof(*quad); + hr = IDirect3D3_CreateVertexBuffer(d3d, &desc, &buffer, 0, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, &ptr, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, 0, &ptr, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_READONLY, &ptr, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer_Release(buffer); + IDirect3D3_Release(d3d); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { IDirectDraw4 *ddraw; @@ -7500,4 +7569,5 @@ START_TEST(ddraw4) test_material(); test_palette_gdi(); test_palette_alpha(); + test_vb_writeonly(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 97a6a19..1c5bc1d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7160,6 +7160,75 @@ static void test_palette_alpha(void) DestroyWindow(window); } +static void test_vb_writeonly(void) +{ + IDirect3DDevice7 *device; + IDirect3D7 *d3d; + IDirect3DVertexBuffer7 *buffer; + HWND window; + HRESULT hr; + D3DVERTEXBUFFERDESC desc; + void *ptr; + static const struct vec4 quad[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + {640.0f, 480.0f, 0.0f, 1.0f}, + {640.0f, 0.0f, 0.0f, 1.0f}, + }; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZRHW; + desc.dwNumVertices = sizeof(quad) / sizeof(*quad); + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &buffer, 0); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, &ptr, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, 0, &ptr, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_READONLY, &ptr, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + ok (!memcmp(ptr, quad, sizeof(quad)), "Got unexpected vertex buffer data.\n"); + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer7_Release(buffer); + IDirect3D7_Release(d3d); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -7229,4 +7298,5 @@ START_TEST(ddraw7) test_material(); test_palette_gdi(); test_palette_alpha(); + test_vb_writeonly(); }

1 0