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

Akihiro Sagawa : oleaut32: Delete opposite side keys on UnRegisterTypeLib.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 86b7fc3829b3891c359090f0d12b447f9cd0a4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b7fc3829b3891c359090f0d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 1 20:30:05 2014 +0900 oleaut32: Delete opposite side keys on UnRegisterTypeLib. --- dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 39 ++++++++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index dcf56d1..312195b 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4347,10 +4347,7 @@ static void test_register_typelib(BOOL system_registration) if (is_win64 || is_wow64) { ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); - todo_wine { ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); - } } } ITypeInfo_ReleaseTypeAttr(typeinfo, attr); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index d4fd22e..48b171b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -838,6 +838,24 @@ HRESULT WINAPI RegisterTypeLib( return res; } +static void TLB_unregister_interface(GUID *guid, REGSAM flag) +{ + WCHAR subKeyName[50]; + HKEY subKey; + + /* the path to the type */ + get_interface_key( guid, subKeyName ); + + /* Delete its bits */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE | flag, &subKey) != ERROR_SUCCESS) + return; + + RegDeleteKeyW(subKey, ProxyStubClsidW); + RegDeleteKeyW(subKey, ProxyStubClsid32W); + RegDeleteKeyW(subKey, TypeLibW); + RegCloseKey(subKey); + RegDeleteKeyExW(HKEY_CLASSES_ROOT, subKeyName, flag, 0); +} /****************************************************************************** * UnRegisterTypeLib [OLEAUT32.186] @@ -863,7 +881,6 @@ HRESULT WINAPI UnRegisterTypeLib( DWORD i = 0; BOOL deleteOtherStuff; HKEY key = NULL; - HKEY subKey = NULL; TYPEATTR* typeAttr = NULL; TYPEKIND kind; ITypeInfo* typeInfo = NULL; @@ -922,19 +939,16 @@ HRESULT WINAPI UnRegisterTypeLib( if ((kind == TKIND_INTERFACE && (typeAttr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || kind == TKIND_DISPATCH) { - /* the path to the type */ - get_interface_key( &typeAttr->guid, subKeyName ); + BOOL is_wow64; + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); - /* Delete its bits */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) - goto enddeleteloop; + TLB_unregister_interface(&typeAttr->guid, 0); - RegDeleteKeyW(subKey, ProxyStubClsidW); - RegDeleteKeyW(subKey, ProxyStubClsid32W); - RegDeleteKeyW(subKey, TypeLibW); - RegCloseKey(subKey); - subKey = NULL; - RegDeleteKeyW(HKEY_CLASSES_ROOT, subKeyName); + /* unregister TLBs into the opposite registry view, too */ + if(opposite == KEY_WOW64_32KEY || + (IsWow64Process(GetCurrentProcess(), &is_wow64) && is_wow64)) { + TLB_unregister_interface(&typeAttr->guid, opposite); + } } enddeleteloop: @@ -980,7 +994,6 @@ enddeleteloop: end: SysFreeString(tlibPath); if (typeLib) ITypeLib_Release(typeLib); - if (subKey) RegCloseKey(subKey); if (key) RegCloseKey(key); return result; }

1 0

Akihiro Sagawa : oleaut32/tests: Test UnRegisterTypeLib surely deletes registry keys.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3f65a86959c1471fe52da2b659474ad848c59cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f65a86959c1471fe52da2b65… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 1 20:30:03 2014 +0900 oleaut32/tests: Test UnRegisterTypeLib surely deletes registry keys. --- dlls/oleaut32/tests/typelib.c | 50 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 7abd606..dcf56d1 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -74,6 +74,7 @@ static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static VOID (WINAPI *pReleaseActCtx)(HANDLE); +static BOOL (WINAPI *pIsWow64Process)(HANDLE,LPBOOL); static const WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; static WCHAR wszGUID[] = {'G','U','I','D',0}; @@ -172,6 +173,7 @@ static void init_function_pointers(void) pCreateActCtxW = (void *)GetProcAddress(hk32, "CreateActCtxW"); pDeactivateActCtx = (void *)GetProcAddress(hk32, "DeactivateActCtx"); pReleaseActCtx = (void *)GetProcAddress(hk32, "ReleaseActCtx"); + pIsWow64Process = (void *)GetProcAddress(hk32, "IsWow64Process"); } static void ref_count_test(LPCWSTR type_lib) @@ -4195,6 +4197,8 @@ static void test_register_typelib(BOOL system_registration) LONG ret, expect_ret; UINT count, i; HKEY hkey; + REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); + BOOL is_wow64 = FALSE; struct { TYPEKIND kind; @@ -4224,6 +4228,9 @@ static void test_register_typelib(BOOL system_registration) return; } + if (pIsWow64Process) + pIsWow64Process(GetCurrentProcess(), &is_wow64); + filenameA = create_test_typelib(3); MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH); @@ -4250,7 +4257,6 @@ static void test_register_typelib(BOOL system_registration) { ITypeInfo *typeinfo; TYPEATTR *attr; - REGSAM opposite = (sizeof(void*) == 8 ? KEY_WOW64_32KEY : KEY_WOW64_64KEY); hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); ok(hr == S_OK, "got %08x\n", hr); @@ -4301,9 +4307,12 @@ static void test_register_typelib(BOOL system_registration) if(ret == ERROR_SUCCESS) RegCloseKey(hkey); /* 32-bit typelibs should be registered into both registry bit modes */ - ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); - ok(ret == expect_ret, "%d: got %d\n", i, ret); - if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + if (is_win64 || is_wow64) + { + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + ok(ret == expect_ret, "%d: got %d\n", i, ret); + if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + } ITypeInfo_ReleaseTypeAttr(typeinfo, attr); ITypeInfo_Release(typeinfo); @@ -4315,6 +4324,39 @@ static void test_register_typelib(BOOL system_registration) hr = pUnRegisterTypeLibForUser(&LIBID_register_test, 1, 0, LOCALE_NEUTRAL, is_win64 ? SYS_WIN64 : SYS_WIN32); ok(hr == S_OK, "got %08x\n", hr); + for(i = 0; i < count; i++) + { + ITypeInfo *typeinfo; + TYPEATTR *attr; + + hr = ITypeLib_GetTypeInfo(typelib, i, &typeinfo); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ITypeInfo_GetTypeAttr(typeinfo, &attr); + ok(hr == S_OK, "got %08x\n", hr); + + if((attr->typekind == TKIND_INTERFACE && (attr->wTypeFlags & TYPEFLAG_FOLEAUTOMATION)) || + attr->typekind == TKIND_DISPATCH) + { + StringFromGUID2(&attr->guid, uuidW, sizeof(uuidW) / sizeof(uuidW[0])); + WideCharToMultiByte(CP_ACP, 0, uuidW, -1, uuid, sizeof(uuid), NULL, NULL); + sprintf(key_name, "Interface\\%s", uuid); + + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ, &hkey); + ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); + if (is_win64 || is_wow64) + { + ret = RegOpenKeyExA(HKEY_CLASSES_ROOT, key_name, 0, KEY_READ | opposite, &hkey); + todo_wine { + ok(ret == ERROR_FILE_NOT_FOUND, "Interface registry remains in %s (%d)\n", key_name, i); + if(ret == ERROR_SUCCESS) RegCloseKey(hkey); + } + } + } + ITypeInfo_ReleaseTypeAttr(typeinfo, attr); + ITypeInfo_Release(typeinfo); + } + ITypeLib_Release(typelib); DeleteFileA( filenameA ); }

1 0

Akihiro Sagawa : oleaut32/tests: Use a boolean constant for BOOL argument.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 8006d57607f86eb4c9d9356cd37c34e3132c09b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8006d57607f86eb4c9d9356cd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 1 20:30:01 2014 +0900 oleaut32/tests: Use a boolean constant for BOOL argument. --- dlls/oleaut32/tests/typelib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a7e7c96..7abd606 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1298,11 +1298,11 @@ static void test_QueryPathOfRegTypeLib(DWORD arch) StringFromGUID2(&uid, uid_str, 40); /*trace("GUID: %s\n", wine_dbgstr_w(uid_str));*/ - if (!do_typelib_reg_key(&uid, 3, 0, arch, base, 0)) return; - if (!do_typelib_reg_key(&uid, 3, 1, arch, base, 0)) return; - if (!do_typelib_reg_key(&uid, 3, 37, arch, base, 0)) return; - if (!do_typelib_reg_key(&uid, 5, 37, arch, base, 0)) return; - if (arch == 64 && !do_typelib_reg_key(&uid, 5, 37, 32, wrongW, 0)) return; + if (!do_typelib_reg_key(&uid, 3, 0, arch, base, FALSE)) return; + if (!do_typelib_reg_key(&uid, 3, 1, arch, base, FALSE)) return; + if (!do_typelib_reg_key(&uid, 3, 37, arch, base, FALSE)) return; + if (!do_typelib_reg_key(&uid, 5, 37, arch, base, FALSE)) return; + if (arch == 64 && !do_typelib_reg_key(&uid, 5, 37, 32, wrongW, FALSE)) return; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { @@ -1315,7 +1315,7 @@ static void test_QueryPathOfRegTypeLib(DWORD arch) } } - do_typelib_reg_key(&uid, 0, 0, arch, NULL, 1); + do_typelib_reg_key(&uid, 0, 0, arch, NULL, TRUE); } static void test_inheritance(void)

1 0

Toshiaki Hirose : po: Update Japanese translation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 47ac7399f38aceee0bb7a50992f430281a0352b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ac7399f38aceee0bb7a5099… Author: Toshiaki Hirose <t_hirose(a)aol.com> Date: Thu May 22 01:08:29 2014 +0900 po: Update Japanese translation. --- po/ja.po | 161 +++++++++++++++++++++++++------------------------------------- 1 file changed, 65 insertions(+), 96 deletions(-) diff --git a/po/ja.po b/po/ja.po index 2a2cf56..78d2fa6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-12-05 20:08+0900\n" -"Last-Translator: Akira Nakagawa <matyapiro31(a)yahoo.co.jp>\n" +"PO-Revision-Date: 2014-05-22 01:00+0900\n" +"Last-Translator: Toshiaki Hirose <t_hirose(a)aol.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" @@ -1379,7 +1379,7 @@ msgstr "Netscape コメント" #: crypt32.rc:71 msgid "Country/Region" -msgstr "国/地域" +msgstr "国と地域" #: crypt32.rc:72 msgid "Organization" @@ -6577,10 +6577,8 @@ msgid "The username could not be found.\n" msgstr "ユーザ名を見つけられませんでした。\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "ネットワーク上の場所がありません。\n" +msgstr "このネットワーク接続は存在しません。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -7115,206 +7113,164 @@ msgid "outline button" msgstr "アウトラインボタン" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "標準" +msgstr "normal" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "利用不可" +msgstr "unavailable" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "選択" +msgstr "selected" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "中断" +msgstr "focused" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "圧縮済み(&C)" +msgstr "pressed" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "checked" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "混合" +msgstr "mixed" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "読み取り専用(&R)" +msgstr "read only" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "選択中のアイテム" +msgstr "hot tracked" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "デフォルト" +msgstr "default" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "expanded" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "collapsed" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "busy" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "floating" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "marqueed" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "アニメーション" +msgstr "animated" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "invisible" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "offscreen" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "有効(&E)" +msgstr "sizeable" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "有効(&E)" +msgstr "moveable" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "self voicing" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "中断" +msgstr "focusable" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "テーブル" +msgstr "selectable" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "リンク" +msgstr "linked" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "traversed" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "テーブル" +msgstr "multi selectable" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "ファイルを選択してください。" +msgstr "extended selectable" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "警告" +msgstr "alert low" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "警告" +msgstr "alert medium" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "警告" +msgstr "alert high" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "書き込み禁止です。\n" +msgstr "protected" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "has popup" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -10278,7 +10234,7 @@ msgstr "Wine コマンドプロンプト" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10346,10 +10302,8 @@ msgid "Wine Explorer" msgstr "Wine エクスプローラ" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "StartUp" +msgstr "スタート" #: explorer.rc:34 winefile.rc:36 msgid "&Run..." @@ -11870,6 +11824,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Wine DLL 登録ユーティリティ\n" +"\n" +"DLLを登録するサービスを提供します。\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11884,54 +11842,65 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"使い方:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] Dll名\n" +"\n" +"オプション:\n" +" [/u] サーバの登録を消去します。\n" +" [/s] サイレントモード (一切のメッセージが表示されません)。\n" +" [/i] DllInstallを呼び出し、追加の[cmdline]を渡します。\n" +"\t[/u]を付けて使った場合、DllInstallはアンインストールモードで呼び出されま" +"す。 \n" +" [/n] DllRegisterServerを呼び出しません。[/i]と一緒に使用してください。\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: 無効または認識できないスイッチです[%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "'%1' を開けません\n" +msgstr "regsvr32: '%1' を読み込めませんでした\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1はDLL '%2'内で実装されていません\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'の登録に失敗しました\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'の登録に成功しました\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'の登録消去に失敗しました\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'の登録消去に成功しました\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'のインストールに失敗しました\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'のインストールに成功しました\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'のアンインストールに失敗しました\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1'のアンインストールに成功しました\n" #: start.rc:55 msgid ""

1 0

Sebastian Lackner : ntdll/tests: Fix exception test failures on x86_64.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: dd0e9fe91e647ee5ce95709b7f47b2e1e782a3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0e9fe91e647ee5ce95709b7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 31 06:29:33 2014 +0200 ntdll/tests: Fix exception test failures on x86_64. --- dlls/ntdll/signal_x86_64.c | 1 + dlls/ntdll/tests/exception.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c6e9a9b..7007db0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2684,6 +2684,7 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG64 pc, ULONG64 *base, UNWI func = lookup_function_info( pc, base, &module ); if (!func) { + *base = 0; if (module) WARN( "no exception table found in module %p pc %lx\n", module->BaseAddress, pc ); else diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 817a19c..8a80928 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1487,8 +1487,8 @@ static void test_dynamic_unwind(void) func = pRtlLookupFunctionEntry( (ULONG_PTR)code_mem + code_offset + 16, &base, NULL ); ok( func == NULL, "RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func ); - ok( base == 0xdeadbeef, - "RtlLookupFunctionEntry modified base address, expected: 0xdeadbeef, got: %lx\n", base ); + ok( !base || broken(base == 0xdeadbeef), + "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base ); /* Test with pointer inside of our function */ base = 0xdeadbeef; @@ -1546,8 +1546,8 @@ static void test_dynamic_unwind(void) func = pRtlLookupFunctionEntry( (ULONG_PTR)code_mem + code_offset + 32, &base, NULL ); ok( func == NULL, "RtlLookupFunctionEntry returned unexpected function, expected: NULL, got: %p\n", func ); - ok( base == 0xdeadbeef, - "RtlLookupFunctionEntry modified base address, expected: 0xdeadbeef, got: %lx\n", base ); + ok( !base || broken(base == 0xdeadbeef), + "RtlLookupFunctionEntry modified base address, expected: 0, got: %lx\n", base ); ok( !count, "RtlLookupFunctionEntry issued %d unexpected calls to dynamic_unwind_callback\n", count );

1 0

Jacek Caban : vbscript: Added support for exponential form of numeric literals.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: f0e85ee2f35816684f72582d5641f5da09fe69dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e85ee2f35816684f72582d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 5 11:45:41 2014 +0200 vbscript: Added support for exponential form of numeric literals. --- dlls/vbscript/lex.c | 60 ++++++++++++++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 9 +++++++ 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index dc5a9fe..98b4cbb 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include <assert.h> +#include <limits.h> #include "vbscript.h" #include "parse.h" @@ -261,8 +262,10 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) { + BOOL use_int = TRUE; LONGLONG d = 0, hlp; int exp = 0; + double r; if(*ctx->ptr == '0' && !('0' <= ctx->ptr[1] && ctx->ptr[1] <= '9') && ctx->ptr[1] != '.') return *ctx->ptr++; @@ -281,13 +284,8 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) ctx->ptr++; } - if(*ctx->ptr != '.') { - if(!exp && (LONG)d == d) { - LONG l = d; - *(LONG*)ret = l; - return (short)l == l ? tShort : tLong; - } - }else { + if(*ctx->ptr == '.') { + use_int = FALSE; ctx->ptr++; while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { @@ -302,7 +300,53 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) ctx->ptr++; } - *(double*)ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); + if(*ctx->ptr == 'e' || *ctx->ptr == 'E') { + int e = 0, sign = 1; + + if(*++ctx->ptr == '-') { + ctx->ptr++; + sign = -1; + } + + if(!isdigitW(*ctx->ptr)) { + FIXME("Invalid numeric literal\n"); + return 0; + } + + use_int = FALSE; + + do { + e = e*10 + *(ctx->ptr++) - '0'; + if(sign == -1 && -e+exp < -(INT_MAX/100)) { + /* The literal will be rounded to 0 anyway. */ + while(isdigitW(*ctx->ptr)) + ctx->ptr++; + *(double*)ret = 0; + return tDouble; + } + + if(sign*e + exp > INT_MAX/100) { + FIXME("Invalid numeric literal\n"); + return 0; + } + } while(isdigitW(*ctx->ptr)); + + exp += sign*e; + } + + if(use_int && (LONG)d == d) { + LONG l = d; + *(LONG*)ret = l; + return (short)l == l ? tShort : tLong; + } + + r = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); + if(isinf(r)) { + FIXME("Invalid numeric literal\n"); + return 0; + } + + *(double*)ret = r; return tDouble; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 530c5dd..3ee445c 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -40,6 +40,12 @@ Call ok(010 = 10, "010 <> 10") Call ok(10. = 10, "10. <> 10") Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") +Call ok(34e5 = 3400000, "34e5 <> 3400000") +Call ok(56.789e5 = 5678900, "56.789e5 = 5678900") +Call ok(56.789e-2 = 0.56789, "56.789e-2 <> 0.56789") +Call ok(1e-94938484 = 0, "1e-... <> 0") +Call ok(34e0 = 34, "34e0 <> 34") +Call ok(34E1 = 340, "34E0 <> 340") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(true = -1, "! true = -1") @@ -78,6 +84,9 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") +Call ok(getVT(1e2) = "VT_R8", "getVT(1e2) is not VT_R8") +Call ok(getVT(1e0) = "VT_R8", "getVT(1e0) is not VT_R8") +Call ok(getVT(0.1e2) = "VT_R8", "getVT(0.1e2) is not VT_R8") Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") Call ok(getVT(-empty) = "VT_I2", "getVT(-empty) = " & getVT(-empty)) Call ok(getVT(-null) = "VT_NULL", "getVT(-null) = " & getVT(-null))

1 0

Stefan Dösinger : wined3d: Remove d3dfmt_p8_init_palette.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 390921577350dd8cd5d6d6fba6d38055588330d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390921577350dd8cd5d6d6fba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 3 09:41:39 2014 +0200 wined3d: Remove d3dfmt_p8_init_palette. --- dlls/wined3d/arb_program_shader.c | 18 ++++++--- dlls/wined3d/surface.c | 81 ++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 44 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d23eed..fa15b1e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7280,12 +7280,10 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, /* Context activation is done by the caller. */ static void upload_palette(const struct wined3d_surface *surface, struct wined3d_context *context) { - BYTE table[256][4]; struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; - - d3dfmt_p8_init_palette(surface, table); + const struct wined3d_palette *palette = surface->palette; if (!priv->palette_texture) gl_info->gl_ops.gl.p_glGenTextures(1, &priv->palette_texture); @@ -7299,9 +7297,19 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d /* Make sure we have discrete color levels. */ gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - /* Upload the palette */ /* TODO: avoid unneeded uploads in the future by adding some SFLAG_PALETTE_DIRTY mechanism */ - gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGBA, 256, 0, GL_RGBA, GL_UNSIGNED_BYTE, table); + if (palette) + { + gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_BGRA, + GL_UNSIGNED_INT_8_8_8_8_REV, palette->colors); + } + else + { + static const DWORD black; + FIXME("P8 surface loaded without a palette.\n"); + gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 1, 0, GL_BGRA, + GL_UNSIGNED_INT_8_8_8_8_REV, &black); + } /* Switch back to unit 0 in which the 2D texture will be stored. */ context_active_texture(context, gl_info, 0); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f198bf0..ce95631 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3370,38 +3370,6 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) -{ - const struct wined3d_palette *pal = surface->palette; - unsigned int i; - - if (!pal) - { - FIXME("No palette set.\n"); - /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if - * there's no palette at this time. */ - for (i = 0; i < 256; i++) - table[i][3] = i; - } - else - { - TRACE("Using surface palette %p\n", pal); - for (i = 0; i < 256; ++i) - { - table[i][0] = pal->colors[i].rgbRed; - table[i][1] = pal->colors[i].rgbGreen; - table[i][2] = pal->colors[i].rgbBlue; - /* The palette index is stored in the alpha component. In case of a - * readback we can then read GL_ALPHA. Color keying is handled in - * surface_blt_to_drawable() using a GL_ALPHA_TEST using GL_NOT_EQUAL. - * In case of a P8 surface the color key itself is passed to - * glAlphaFunc in other cases the alpha component of pixels that - * should be masked away is set to 0. */ - table[i][3] = i; - } - } -} - static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3420,27 +3388,40 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI } case WINED3D_CT_PALETTED: - { - BYTE table[256][4]; - unsigned int x, y; - - d3dfmt_p8_init_palette(surface, table); - - for (y = 0; y < height; y++) + if (surface->palette) { - source = src + pitch * y; - dest = dst + outpitch * y; - /* This is an 1 bpp format, using the width here is fine */ - for (x = 0; x < width; x++) { - BYTE color = *source++; - *dest++ = table[color][0]; - *dest++ = table[color][1]; - *dest++ = table[color][2]; - *dest++ = table[color][3]; + unsigned int x, y; + const struct wined3d_palette *palette = surface->palette; + for (y = 0; y < height; y++) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; x++) + { + BYTE color = *source++; + *dest++ = palette->colors[color].rgbRed; + *dest++ = palette->colors[color].rgbGreen; + *dest++ = palette->colors[color].rgbBlue; + *dest++ = 0; + } } } - } - break; + else + { + /* This should probably use the system palette, but unless + * the X server is running in P8 mode there is no such thing. + * The probably best solution is to set the fixed 20 colors + * from the default windows palette and set the rest to black, + * white, or some ugly pink. For now use black for the entire + * palette. Don't use pink everywhere. Age of Empires 2 draws + * a front buffer filled with zeroes without a palette when + * starting and we don't want the screen to flash in an ugly + * color. */ + FIXME("P8 surface loaded without a palette.\n"); + memset(dst, 0, height * outpitch); + } + + break; case WINED3D_CT_CK_565: { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3cb884..b1c7089 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2350,8 +2350,6 @@ enum wined3d_conversion_type WINED3D_CT_CK_ARGB32, }; -void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4]) DECLSPEC_HIDDEN; - struct wined3d_sampler { LONG refcount;

1 0

Stefan Dösinger : d3d8/tests: Add a test for D3DUSAGE_WRITEONLY.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: af733f0475040ed5e40b9a7ba230f21097910dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af733f0475040ed5e40b9a7ba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 3 09:41:42 2014 +0200 d3d8/tests: Add a test for D3DUSAGE_WRITEONLY. --- dlls/d3d8/tests/device.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a1f237c..e3197d2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -26,6 +26,11 @@ #include <d3d8.h> #include "wine/test.h" +struct vec3 +{ + float x, y, z; +}; + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) @@ -6168,6 +6173,81 @@ static void test_mipmap_lock(void) IDirect3D8_Release(d3d); DestroyWindow(window); } + +static void test_writeonly_resource(void) +{ + IDirect3D8 *d3d; + IDirect3DDevice8 *device; + IDirect3DVertexBuffer8 *buffer; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *ptr; + static const struct + { + struct vec3 pos; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}} + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene %#x\n", hr); + hr = IDirect3DDevice8_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene %#x\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &ptr, 0); + 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 = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, &ptr, D3DLOCK_READONLY); + 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 = IDirect3DVertexBuffer8_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + refcount = IDirect3DVertexBuffer8_Release(buffer); + ok(!refcount, "Vertex buffer has %u references left.\n", refcount); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -6252,6 +6332,7 @@ START_TEST(device) test_shader_constant_apply(); test_resource_type(); test_mipmap_lock(); + test_writeonly_resource(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Add a test for D3DUSAGE_WRITEONLY.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: acf890e2b27aeb5a2ced66eb5db31967010d8cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf890e2b27aeb5a2ced66eb5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 3 09:41:41 2014 +0200 d3d9/tests: Add a test for D3DUSAGE_WRITEONLY. This test seeks to demonstrate that readbacks of WRITEONLY resources still work, even after a resource has been used for rendering. --- dlls/d3d9/tests/device.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 894e566..d877ece 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -26,6 +26,11 @@ #include <d3d9.h> #include "wine/test.h" +struct vec3 +{ + float x, y, z; +}; + #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) @@ -8741,6 +8746,80 @@ static void test_mipmap_lock(void) DestroyWindow(window); } +static void test_writeonly_resource(void) +{ + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + IDirect3DVertexBuffer9 *buffer; + ULONG refcount; + HWND window; + HRESULT hr; + void *ptr; + static const struct + { + struct vec3 pos; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}} + }; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, D3DLOCK_DISCARD); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(ptr, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene %#x\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene %#x\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, 0); + 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 = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, &ptr, D3DLOCK_READONLY); + 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 = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + refcount = IDirect3DVertexBuffer9_Release(buffer); + ok(!refcount, "Vertex buffer has %u references left.\n", refcount); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -8838,6 +8917,7 @@ START_TEST(device) test_vdecl_apply(); test_resource_type(); test_mipmap_lock(); + test_writeonly_resource(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Nikolay Sivov : comctl32/progress: Update position by one step on PBM_SETPOS in PBS_MARQUEE style.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 2a348791ee56c6556887a64d98eea68aaa01cc01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a348791ee56c6556887a64d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 8 00:04:28 2014 +0400 comctl32/progress: Update position by one step on PBM_SETPOS in PBS_MARQUEE style. --- dlls/comctl32/progress.c | 85 +++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 7c996cb..44fdd3f 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -448,38 +448,32 @@ static LRESULT PROGRESS_Paint (PROGRESS_INFO *infoPtr, HDC hdc) /*********************************************************************** - * PROGRESS_Timer - * Handle the marquee timer messages + * Advance marquee progress by one step. */ -static LRESULT PROGRESS_Timer (PROGRESS_INFO *infoPtr, INT idTimer) +static void PROGRESS_UpdateMarquee (PROGRESS_INFO *infoPtr) { - if(idTimer == ID_MARQUEE_TIMER) - { - LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); - RECT rect; - int ledWidth, leds; - HTHEME theme = GetWindowTheme (infoPtr->Self); - BOOL barSmooth = (style & PBS_SMOOTH) && !theme; + LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE); + RECT rect; + int ledWidth, leds; + HTHEME theme = GetWindowTheme (infoPtr->Self); + BOOL smooth = (style & PBS_SMOOTH) && !theme; - get_client_rect (infoPtr->Self, &rect); + get_client_rect (infoPtr->Self, &rect); - if(!barSmooth) - ledWidth = get_led_size( infoPtr, style, &rect ) + - get_led_gap( infoPtr ); - else - ledWidth = 1; + if (smooth) + ledWidth = 1; + else + ledWidth = get_led_size( infoPtr, style, &rect ) + get_led_gap( infoPtr ); - leds = (get_bar_size( style, &rect ) + ledWidth - 1) / - ledWidth; + leds = (get_bar_size( style, &rect ) + ledWidth - 1) / + ledWidth; - /* increment the marquee progress */ - if(++infoPtr->MarqueePos >= leds) - infoPtr->MarqueePos = 0; + /* increment the marquee progress */ + if (++infoPtr->MarqueePos >= leds) + infoPtr->MarqueePos = 0; - InvalidateRect(infoPtr->Self, &rect, TRUE); - UpdateWindow(infoPtr->Self); - } - return 0; + InvalidateRect(infoPtr->Self, &rect, TRUE); + UpdateWindow(infoPtr->Self); } @@ -522,6 +516,30 @@ static DWORD PROGRESS_SetRange (PROGRESS_INFO *infoPtr, int low, int high) return res; } +static UINT PROGRESS_SetPos (PROGRESS_INFO *infoPtr, INT pos) +{ + DWORD style = GetWindowLongW(infoPtr->Self, GWL_STYLE); + + if (style & PBS_MARQUEE) + { + PROGRESS_UpdateMarquee(infoPtr); + return 1; + } + else + { + UINT oldVal; + oldVal = infoPtr->CurVal; + if (oldVal != pos) { + infoPtr->CurVal = pos; + PROGRESS_CoercePos(infoPtr); + TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); + PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); + UpdateWindow( infoPtr->Self ); + } + return oldVal; + } +} + /*********************************************************************** * ProgressWindowProc */ @@ -596,7 +614,9 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, return PROGRESS_Paint (infoPtr, (HDC)wParam); case WM_TIMER: - return PROGRESS_Timer (infoPtr, (INT)wParam); + if (wParam == ID_MARQUEE_TIMER) + PROGRESS_UpdateMarquee (infoPtr); + return 0; case WM_THEMECHANGED: { @@ -632,18 +652,7 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message, } case PBM_SETPOS: - { - UINT oldVal; - oldVal = infoPtr->CurVal; - if(oldVal != wParam) { - infoPtr->CurVal = (INT)wParam; - PROGRESS_CoercePos(infoPtr); - TRACE("PBM_SETPOS: current pos changed from %d to %d\n", oldVal, infoPtr->CurVal); - PROGRESS_Invalidate( infoPtr, oldVal, infoPtr->CurVal ); - UpdateWindow( infoPtr->Self ); - } - return oldVal; - } + return PROGRESS_SetPos(infoPtr, wParam); case PBM_SETRANGE: return PROGRESS_SetRange (infoPtr, (int)LOWORD(lParam), (int)HIWORD(lParam));

1 0

Nicolas Le Cam : winedbg: Remove unused variable.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 81a904e72911d86475aef9999e827343285ec48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a904e72911d86475aef9999… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Jun 2 00:21:11 2014 +0200 winedbg: Remove unused variable. --- programs/winedbg/be_x86_64.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 18032d4..8628025 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -347,7 +347,6 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) { BYTE ch; LONG delta; - short segment; unsigned op_size = 32, rex = 0; DWORD64 dst; @@ -383,7 +382,6 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) switch (f_reg(ch)) { case 0x02: - segment = dbg_context.SegCs; break; default: return FALSE; }

1 0

Michael Stefaniuc : dmusic: Lock/unlock the module only on creation/ destruction of the object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1a7c0a6a70b3b7f4d07c032796d5b0d05a55ada6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7c0a6a70b3b7f4d07c03279… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 20:12:31 2014 +0200 dmusic: Lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/collection.c | 9 ++++----- dlls/dmusic/download.c | 10 +++++----- dlls/dmusic/port.c | 6 ++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 3d09815..2c826f5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -92,8 +92,6 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - DMUSIC_LockModule(); - return ref; } @@ -104,10 +102,10 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -851,6 +849,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p obj->ref = 1; list_init (&obj->Instruments); + DMUSIC_LockModule(); hr = IDirectMusicCollection_QueryInterface(&obj->IDirectMusicCollection_iface, lpcGUID, ppobj); IDirectMusicCollection_Release(&obj->IDirectMusicCollection_iface); diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index cc2b024..a88ec2c 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -52,8 +52,6 @@ static ULONG WINAPI IDirectMusicDownloadImpl_AddRef(IDirectMusicDownload *iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -64,10 +62,10 @@ static ULONG WINAPI IDirectMusicDownloadImpl_Release(IDirectMusicDownload *iface TRACE("(%p)->(): new ref = %u\n", iface, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -102,5 +100,7 @@ HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; download->ref = 1; *ret_iface = download; + + DMUSIC_LockModule(); return S_OK; } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 9d42667..ad61ba5 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -70,8 +70,6 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_AddRef(LPDIRECTMUSICDOW TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -86,10 +84,9 @@ static ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release(LPDIRECTMUSICDO { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -123,6 +120,7 @@ static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDown object->ref = 1; *instrument = &object->IDirectMusicDownloadedInstrument_iface; + DMUSIC_LockModule(); return S_OK; }

1 0

Michael Stefaniuc : dmusic: Don' t leak memory on DirectMusicInstrument creation failure.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d67f35b9dce3c3656a7c32513d75fdec2c157aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67f35b9dce3c3656a7c32513… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:22:48 2014 +0200 dmusic: Don't leak memory on DirectMusicInstrument creation failure. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/instrument.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 9df3e0c..87b31c1 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -62,8 +62,6 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_AddRef(LPDIRECTMUSICINSTRUMENT if TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -83,10 +81,9 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i HeapFree(GetProcessHeap(), 0, This->articulations->connections); HeapFree(GetProcessHeap(), 0, This->articulations); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -125,16 +122,22 @@ static const IDirectMusicInstrumentVtbl DirectMusicInstrument_Vtbl = /* for ClassFactory */ HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicInstrumentImpl* dminst; - + HRESULT hr; + dminst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicInstrumentImpl)); if (NULL == dminst) { *ppobj = NULL; return E_OUTOFMEMORY; } dminst->IDirectMusicInstrument_iface.lpVtbl = &DirectMusicInstrument_Vtbl; - dminst->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, ppobj); + dminst->ref = 1; + + DMUSIC_LockModule(); + hr = IDirectMusicInstrument_QueryInterface(&dminst->IDirectMusicInstrument_iface, lpcGUID, + ppobj); + IDirectMusicInstrument_Release(&dminst->IDirectMusicInstrument_iface); + + return hr; } static HRESULT read_from_stream(IStream *stream, void *data, ULONG size)

1 0

Michael Stefaniuc : dmusic: Don' t leak memory on IReferenceClock creation failure.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 19eba06a2658d5abab32642071140414a0be18b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19eba06a2658d5abab3264207… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:20:14 2014 +0200 dmusic: Don't leak memory on IReferenceClock creation failure. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/clock.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 2a8cd09..46a035f 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -50,8 +50,6 @@ static ULONG WINAPI IReferenceClockImpl_AddRef(IReferenceClock *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -62,10 +60,10 @@ static ULONG WINAPI IReferenceClockImpl_Release(IReferenceClock *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - if (!ref) + if (!ref) { HeapFree(GetProcessHeap(), 0, This); - - DMUSIC_UnlockModule(); + DMUSIC_UnlockModule(); + } return ref; } @@ -123,6 +121,7 @@ static const IReferenceClockVtbl ReferenceClock_Vtbl = { HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) { IReferenceClockImpl* clock; + HRESULT hr; TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); @@ -133,9 +132,13 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO } clock->IReferenceClock_iface.lpVtbl = &ReferenceClock_Vtbl; - clock->ref = 0; /* Will be inited by QueryInterface */ + clock->ref = 1; clock->rtTime = 0; clock->pClockInfo.dwSize = sizeof (DMUS_CLOCKINFO); - return IReferenceClockImpl_QueryInterface((IReferenceClock*)clock, riid, ret_iface); + DMUSIC_LockModule(); + hr = IReferenceClockImpl_QueryInterface(&clock->IReferenceClock_iface, riid, ret_iface); + IReferenceClockImpl_Release(&clock->IReferenceClock_iface); + + return hr; }

1 0

Michael Stefaniuc : dmusic: Simplify the creation of a DirectMusicBuffer object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 57eb95a2ea19d555435a5ab0eaa1976426d8c1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=57eb95a2ea19d555435a5ab0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:18:55 2014 +0200 dmusic: Simplify the creation of a DirectMusicBuffer object. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/buffer.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 35cbd88..bd0ad1a 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -57,8 +57,6 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef(LPDIRECTMUSICBUFFER iface) TRACE("(%p)->(): new ref = %u\n", iface, ref); - DMUSIC_LockModule(); - return ref; } @@ -72,10 +70,9 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This->data); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -279,7 +276,6 @@ static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface) { IDirectMusicBufferImpl* dmbuffer; - HRESULT hr; TRACE("(%p, %p)\n", desc, ret_iface); @@ -290,7 +286,7 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i return E_OUTOFMEMORY; dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; - dmbuffer->ref = 0; /* Will be inited by QueryInterface */ + dmbuffer->ref = 1; if (IsEqualGUID(&desc->guidBufferFormat, &GUID_NULL)) dmbuffer->format = KSDATAFORMAT_SUBTYPE_MIDI; @@ -304,12 +300,8 @@ HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_i return E_OUTOFMEMORY; } - hr = IDirectMusicBufferImpl_QueryInterface((LPDIRECTMUSICBUFFER)dmbuffer, &IID_IDirectMusicBuffer, ret_iface); - if (FAILED(hr)) - { - HeapFree(GetProcessHeap(), 0, dmbuffer->data); - HeapFree(GetProcessHeap(), 0, dmbuffer); - } + DMUSIC_LockModule(); + *ret_iface = &dmbuffer->IDirectMusicBuffer_iface; - return hr; + return S_OK; }

1 0

Michael Stefaniuc : dmscript/tests: Test some IPersistStream methods of DMScriptTrack.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 19b6c4cfc77e05e4ea21de59096e02a9c3ee6d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19b6c4cfc77e05e4ea21de590… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:09:20 2014 +0200 dmscript/tests: Test some IPersistStream methods of DMScriptTrack. --- dlls/dmscript/tests/dmscript.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index 204cf7c..02fddc3 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -202,6 +202,37 @@ static void test_dmscript(void) while (IDirectMusicScript_Release(dms)); } +static void test_scripttrack(void) +{ + IDirectMusicTrack *dmt; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void**)&dmt); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicScriptTrack), + "Expected class CLSID_DirectMusicScriptTrack got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicTrack_Release(dmt)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -215,6 +246,7 @@ START_TEST(dmscript) test_COM(); test_COM_scripttrack(); test_dmscript(); + test_scripttrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmloader/tests: Test some IPersistStream methods of DMContainer.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: f9e1551e5a2c7cd8d18891083e35e1489470e744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e1551e5a2c7cd8d18891083… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:05:38 2014 +0200 dmloader/tests: Test some IPersistStream methods of DMContainer. --- dlls/dmloader/tests/loader.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 28adba1..46a2b93 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -218,6 +218,37 @@ static void test_COM_container(void) while (IDirectMusicContainer_Release(dmc)); } +static void test_container(void) +{ + IDirectMusicContainer *dmc; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicContainer, (void**)&dmc); + ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicContainer), + "Expected class CLSID_DirectMusicContainer got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicContainer_Release(dmc)); +} + START_TEST(loader) { CoInitialize(NULL); @@ -232,5 +263,6 @@ START_TEST(loader) test_simple_playing(); test_COM(); test_COM_container(); + test_container(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmscript: 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: e1fab4a837e13dcebd76b35f364eb218d10dee7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1fab4a837e13dcebd76b35f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:03:53 2014 +0200 dmscript: Move a struct definition to the .c file that uses it. --- dlls/dmscript/dmscript_private.h | 23 ----------------------- dlls/dmscript/script.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 082ffa4..551e7b7 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -43,35 +43,12 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicScriptImpl IDirectMusicScriptImpl; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirectMusicScriptImpl implementation structure - */ -struct IDirectMusicScriptImpl { - IDirectMusicScript IDirectMusicScript_iface; - const IDirectMusicObjectVtbl *ObjectVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicScriptImpl fields */ - IDirectMusicPerformance* pPerformance; - LPDMUS_OBJECTDESC pDesc; - DMUS_IO_SCRIPT_HEADER* pHeader; - DMUS_IO_VERSION* pVersion; - WCHAR* pwzLanguage; - WCHAR* pwzSource; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmscript.dll */ diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 6b9be6f..50394bc 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -34,6 +34,19 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicScriptImpl implementation */ +typedef struct IDirectMusicScriptImpl { + IDirectMusicScript IDirectMusicScript_iface; + const IDirectMusicObjectVtbl *ObjectVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + IDirectMusicPerformance *pPerformance; + DMUS_OBJECTDESC *pDesc; + DMUS_IO_SCRIPT_HEADER *pHeader; + DMUS_IO_VERSION *pVersion; + WCHAR *pwzLanguage; + WCHAR *pwzSource; +} IDirectMusicScriptImpl; + static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface) { return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface);

1 0

Bruno Jesus : winspool.drv: Do not try to check the registry if opening the printer fails (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 27280661524d3f66741cb8e7c7b27a3b46eca542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27280661524d3f66741cb8e7c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 22:04:56 2014 -0300 winspool.drv: Do not try to check the registry if opening the printer fails (valgrind). --- dlls/winspool.drv/info.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index e33b257..bfb22cb 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2530,6 +2530,7 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, */ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAULTSW pDefault) { + HKEY key; TRACE("(%s, %p, %p)\n", debugstr_w(lpPrinterName), phPrinter, pDefault); @@ -2542,12 +2543,10 @@ BOOL WINAPI OpenPrinterW(LPWSTR lpPrinterName,HANDLE *phPrinter, LPPRINTER_DEFAU /* Get the unique handle of the printer or Printserver */ *phPrinter = get_opened_printer_entry(lpPrinterName, pDefault); - if (*phPrinter) + if (*phPrinter && WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ) == ERROR_SUCCESS) { - HKEY key; DWORD deleting = 0, size = sizeof( deleting ), type; DWORD status; - WINSPOOL_GetOpenedPrinterRegKey( *phPrinter, &key ); RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&deleting, &size ); WaitForSingleObject( init_mutex, INFINITE ); status = get_dword_from_reg( key, StatusW );

1 0

Bruno Jesus : wintrust/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: dbdb244d132727452d11e63904fb7ffb5f52fd3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdb244d132727452d11e6390… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 22:03:06 2014 -0300 wintrust/tests: Fix a memory leak (valgrind). --- dlls/wintrust/tests/softpub.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index f342936..b1ac8a3 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -222,6 +222,7 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) } else skip("CertCreateCertificateContext failed: %08x\n", GetLastError()); + funcs->pfnFree(data.pasSigners); } }

1 0

Bruno Jesus : usp10: Fix a memory leak in _ItemizeInternal (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3c16044410cd60d2423bc1319117081e017a5020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c16044410cd60d2423bc1319… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri May 30 00:00:11 2014 -0300 usp10: Fix a memory leak in _ItemizeInternal (valgrind). --- dlls/usp10/usp10.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0493487..14feb6d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1280,6 +1280,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, WORD layoutRTL = 0; BOOL forceLevels = FALSE; INT consumed = 0; + HRESULT res = E_OUTOFMEMORY; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -1374,10 +1375,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { levels = heap_alloc_zero(cInChars * sizeof(WORD)); if (!levels) - { - heap_free(scripts); - return E_OUTOFMEMORY; - } + goto nomemory; BIDI_DetermineLevels(pwcInChars, cInChars, psState, psControl, levels); baselevel = levels[0]; @@ -1396,11 +1394,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, strength = heap_alloc_zero(cInChars * sizeof(WORD)); if (!strength) - { - heap_free(scripts); - heap_free(levels); - return E_OUTOFMEMORY; - } + goto nomemory; BIDI_GetStrengths(pwcInChars, cInChars, psControl, strength); /* We currently mis-level leading Diacriticals */ @@ -1580,7 +1574,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, index++; if (index+1 > cMaxItems) - return E_OUTOFMEMORY; + goto nomemory; if (strength) str = strength[cnt]; @@ -1616,7 +1610,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ index++; - if (index + 1 > cMaxItems) return E_OUTOFMEMORY; + if (index + 1 > cMaxItems) goto nomemory; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); @@ -1626,10 +1620,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, /* Set SCRIPT_ITEM */ pItems[index].iCharPos = cnt; /* the last item contains the ptr to the lastchar */ + res = S_OK; +nomemory: heap_free(levels); heap_free(strength); heap_free(scripts); - return S_OK; + return res; } /***********************************************************************

1 0

Nicolas Le Cam : mshtml/tests: Remove unused variable.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b57a88482940d5adb2b65d1c103364e9909deeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57a88482940d5adb2b65d1c1… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Jun 1 17:40:23 2014 +0200 mshtml/tests: Remove unused variable. --- dlls/mshtml/tests/events.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6755591..2f99699 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -88,7 +88,6 @@ DEFINE_EXPECT(iframe_onload); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; -static BOOL xy_todo; static BOOL is_ie9plus; typedef struct { @@ -1638,8 +1637,6 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(invoke_onclick); } - xy_todo = TRUE; - SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); @@ -2757,7 +2754,6 @@ static void run_test(const char *str, testfunc_t test) MSG msg; HRESULT hres; - xy_todo = FALSE; doc = create_document(); if (!doc) return;

1 0

Michael Stefaniuc : dmusic: Simplify the creation of a DirectMusic8 object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 096bfbd2143b07ca68441a7d8f722d38ce2dc3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096bfbd2143b07ca68441a7d8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:21:33 2014 +0200 dmusic: Simplify the creation of a DirectMusic8 object. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmusic/dmusic.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 30f69cc..28be851 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -61,8 +61,6 @@ static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); - DMUSIC_LockModule(); - return ref; } @@ -78,10 +76,9 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This); + DMUSIC_UnlockModule(); } - DMUSIC_UnlockModule(); - return ref; } @@ -417,7 +414,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return E_OUTOFMEMORY; dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; - dmusic->ref = 0; /* Will be inited by QueryInterface */ + dmusic->ref = 1; dmusic->pMasterClock = NULL; dmusic->ppPorts = NULL; dmusic->nrofports = 0; @@ -427,14 +424,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU return ret; } - ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); - if (FAILED(ret)) { - IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface); - HeapFree(GetProcessHeap(), 0, dmusic); - return ret; - } - create_system_ports_list(dmusic); - return S_OK; + DMUSIC_LockModule(); + ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); + IDirectMusic8Impl_Release(&dmusic->IDirectMusic8_iface); + + return ret; }

1 0

Michael Stefaniuc : dmusic: Release the clock when destroying the IDirectMusic8 object.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d82e2935e41da81bd9e5576046c362ea091d0fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82e2935e41da81bd9e557604… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 31 19:20:55 2014 +0200 dmusic: Release the clock when destroying the IDirectMusic8 object. --- dlls/dmusic/dmusic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 6c837f7..30f69cc 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -74,6 +74,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { + IReferenceClock_Release(&This->pMasterClock->IReferenceClock_iface); HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->ppPorts); HeapFree(GetProcessHeap(), 0, This);

1 0

Michael Stefaniuc : dmime/tests: Test some IPersistStream methods of objects with DMObject.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1a3a6d008408558ab17636c4669bee220aa8adff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3a6d008408558ab17636c46… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 23:08:01 2014 +0200 dmime/tests: Test some IPersistStream methods of objects with DMObject. --- dlls/dmime/tests/dmime.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index c1c2caa..1258d40 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -370,6 +370,99 @@ static void test_COM_track(void) } } +static void test_audiopathconfig(void) +{ + IDirectMusicObject *dmo; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicAudioPathConfig), + "Expected class CLSID_DirectMusicAudioPathConfig got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicObject_Release(dmo)); +} + +static void test_graph(void) +{ + IDirectMusicGraph *dmg; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicGraph, (void**)&dmg); + ok(hr == S_OK, "DirectMusicGraph create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicGraph_QueryInterface(dmg, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicGraph), + "Expected class CLSID_DirectMusicGraph got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicGraph_Release(dmg)); +} + +static void test_segment(void) +{ + IDirectMusicSegment *dms; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment, (void**)&dms); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicSegment_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicSegment), + "Expected class CLSID_DirectMusicSegment got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicSegment_Release(dms)); +} + START_TEST(dmime) { CoInitialize(NULL); @@ -386,6 +479,9 @@ START_TEST(dmime) test_COM_segment(); test_COM_segmentstate(); test_COM_track(); + test_audiopathconfig(); + test_graph(); + test_segment(); CoUninitialize(); }

1 0

Bruno Jesus : shlwapi: Avoid reading past the pointer in PathCreateFromUrlW (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 9dacce1b4e58ebfe33d317ecb7ac7719552a9894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dacce1b4e58ebfe33d317ecb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:57:51 2014 -0300 shlwapi: Avoid reading past the pointer in PathCreateFromUrlW (valgrind). --- dlls/shlwapi/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 080c243..01e3ae7 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -3377,7 +3377,7 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, len = src - pszUrl; StrCpyNW(dst, pszUrl, len + 1); dst += len; - if (isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) + if (*src && isalphaW(src[1]) && (src[2] == ':' || src[2] == '|')) { /* 'Forget' to add a trailing '/', just like Windows */ src++;

1 0

Bruno Jesus : wininet/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1f713cc56723cf3fbd520bf1c62b59bfd029204c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f713cc56723cf3fbd520bf1c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:44:03 2014 -0300 wininet/tests: Fix a memory leak (valgrind). --- dlls/wininet/tests/urlcache.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 07800e0..35ef77d 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -99,6 +99,7 @@ static void test_find_url_cache_entriesA(void) ret = FindCloseUrlCache(hEnumHandle); ok(ret, "FindCloseUrlCache failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); } static void test_GetUrlCacheEntryInfoExA(void)

1 0

Bruno Jesus : userenv/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 55f8233390a926b316c4a945436bc9296a5a090e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f8233390a926b316c4a9454… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 23:16:09 2014 -0300 userenv/tests: Fix a memory leak (valgrind). --- dlls/userenv/tests/userenv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index b085d17..5647cf3 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -154,6 +154,7 @@ static void test_create_env(void) r = get_env(env[i], "SystemRoot", &st); ok(!strcmp(st, "SystemRoot=overwrite"), "%s\n", st); expect(TRUE, r); + HeapFree(GetProcessHeap(), 0, st); } /* Test for common environment variables (NT4 and higher) */

1 0

Nikolay Sivov : wbemprox/tests: Fix some test failures on older XP versions.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: ba111c79e492f4c5cb3f071d6f4a25761c8de794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba111c79e492f4c5cb3f071d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:23:21 2014 +0400 wbemprox/tests: Fix some test failures on older XP versions. --- dlls/wbemprox/tests/services.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index b36748e..8ab6e83 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -131,7 +131,7 @@ static void test_IWbemLocator(void) { path8W, WBEM_E_INVALID_NAMESPACE }, { path9W, S_OK }, { path10W, WBEM_E_INVALID_PARAMETER }, - { path11W, S_OK }, + { path11W, S_OK, FALSE, WBEM_E_INVALID_PARAMETER }, { path12W, S_OK }, { path13W, S_OK }, { path14W, S_OK }, @@ -139,8 +139,8 @@ static void test_IWbemLocator(void) { path16W, S_OK }, { path17W, WBEM_E_INVALID_NAMESPACE }, { path18W, S_OK }, - { path19W, WBEM_E_INVALID_NAMESPACE }, - { path20W, WBEM_E_INVALID_NAMESPACE }, + { path19W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, + { path20W, WBEM_E_INVALID_NAMESPACE, FALSE, WBEM_E_INVALID_PARAMETER }, { path21W, S_OK }, { path22W, S_OK }, { path23W, WBEM_E_INVALID_NAMESPACE },

1 0

Bruno Jesus : wininet: Use a helper to send data and take care of EINTR.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 1b8d8ef372cbb6b77e8c381ce4e08ac2025f768c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8d8ef372cbb6b77e8c381ce… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 21:20:14 2014 -0300 wininet: Use a helper to send data and take care of EINTR. --- dlls/wininet/ftp.c | 8 ++++---- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 17 ++++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 837fcad..5576de9 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1220,7 +1220,7 @@ static DWORD FTPFILE_WriteFile(object_header_t *hdr, const void *buffer, DWORD s ftp_file_t *lpwh = (ftp_file_t*) hdr; int res; - res = send(lpwh->nDataSocket, buffer, size, 0); + res = sock_send(lpwh->nDataSocket, buffer, size, 0); *written = res>0 ? res : 0; return res >= 0 ? ERROR_SUCCESS : sock_get_error(errno); @@ -2316,7 +2316,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags TRACE("Sending (%s) len(%d)\n", cmd, len); while ((nBytesSent < len) && (nRC != -1)) { - nRC = send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); + nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); if (nRC != -1) { nBytesSent += nRC; @@ -2683,7 +2683,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, TRACE("Sending (%s) len(%d)\n", buf, len); while((nBytesSent < len) && (nRC != -1)) { - nRC = send(nSocket, buf+nBytesSent, len - nBytesSent, 0); + nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0); nBytesSent += nRC; } heap_free(buf); @@ -3263,7 +3263,7 @@ static BOOL FTP_SendData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE hFile) nLen = DATA_PACKET_SIZE < nBytesToSend ? DATA_PACKET_SIZE : nBytesToSend; - nRC = send(nDataSocket, lpszBuffer, nLen, 0); + nRC = sock_send(nDataSocket, lpszBuffer, nLen, 0); if (nRC != -1) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a641340..87369c6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -457,6 +457,7 @@ LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; +int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 074229e..595dd71 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -496,6 +496,17 @@ int sock_get_error( int err ) return err; } +int sock_send(int fd, const void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = send(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static void set_socket_blocking(int socket, blocking_mode_t mode) { #if defined(__MINGW32__) || defined (_MSC_VER) @@ -546,7 +557,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode TRACE("sending %u bytes\n", out_buf.cbBuffer); - size = send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + size = sock_send(connection->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); status = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; @@ -718,7 +729,7 @@ static BOOL send_ssl_chunk(netconn_t *conn, const void *msg, size_t size) return FALSE; } - if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + if(sock_send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { WARN("send failed\n"); return FALSE; } @@ -736,7 +747,7 @@ DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, { if(!connection->secure) { - *sent = send(connection->socket, msg, len, flags); + *sent = sock_send(connection->socket, msg, len, flags); if (*sent == -1) return sock_get_error(errno); return ERROR_SUCCESS;

1 0

Nikolay Sivov : include: Added IImageList2 definition.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: bc4ceca951bab517acc124963683f08ef085a8fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4ceca951bab517acc124963… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 9 08:45:01 2014 +0400 include: Added IImageList2 definition. --- include/commoncontrols.idl | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/include/commoncontrols.idl b/include/commoncontrols.idl index 6e00837..8cfcb56 100644 --- a/include/commoncontrols.idl +++ b/include/commoncontrols.idl @@ -66,9 +66,7 @@ cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, const UINT ILIF_ALPHA = 1; [ - object, - uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), - helpstring("Image List"), + uuid(46eb5926-582e-4017-9fdf-e8998daa0950), local ] interface IImageList : IUnknown @@ -200,15 +198,44 @@ interface IImageList : IUnknown } [ - uuid(BCADA15B-B428-420c-8D28-023590924C9F) + uuid(192b9d83-50fc-457b-90a0-2b82a8b5dae1), + local +] +interface IImageList2 : IImageList +{ + typedef struct tagIMAGELISTSTATS + { + DWORD cbSize; + INT cAlloc; + INT cUsed; + INT cStandby; + } IMAGELISTSTATS; + + HRESULT Resize(INT x_size, INT y_size); + HRESULT GetOriginalSize([in] INT image, [in] DWORD flags, [out] INT *cx, [out] INT *cy); + HRESULT SetOriginalSize([in] INT image, [in] INT cx, [in] INT cy); + HRESULT SetCallback([in, unique] IUnknown *callback); + HRESULT GetCallback([in] REFIID riid, [out, iid_is(riid)] void** ppv); + HRESULT ForceImagePresent([in] INT image, DWORD flags); + HRESULT DiscardImages([in] INT first_image, [in] INT last_image, [in] DWORD flags); + HRESULT PreloadImages([in] IMAGELISTDRAWPARAMS *params); + HRESULT GetStatistics([in, out] IMAGELISTSTATS *stats); + HRESULT Initialize([in] INT cx, [in] INT cy, [in] UINT flags, [in] INT initial, [in] INT grow); + HRESULT Replace2([in] INT i, [in] HBITMAP image, [in, unique] HBITMAP mask, [in, unique] IUnknown *unk, [in] DWORD flags); + HRESULT ReplaceFromImageList([in] INT i, [in] IImageList *imagelist, [in] INT src, [in, unique] IUnknown *unk, [in] DWORD flags); +} + +[ + uuid(bcada15B-b428-420c-8d28-023590924c9f) ] library CommonControlObjects { [ - uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + uuid(7c476ba2-02b1-48f4-8048-b24619ddc058) ] coclass ImageList { interface IImageList; + interface IImageList2; } }

1 0

Michael Müller : server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 9602fa7a9317f1bf856fe441dd0aeb7d0cbfa9fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9602fa7a9317f1bf856fe441d… Author: Michael Müller <michael(a)fds-team.de> Date: Sat May 31 02:44:36 2014 +0200 server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist. --- dlls/kernel32/tests/pipe.c | 6 ++++++ server/named_pipe.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b192f96..f7c7531 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -60,6 +60,12 @@ static void test_CreateNamedPipe(int pipemode) trace("test_CreateNamedPipe starting in byte mode\n"); else trace("test_CreateNamedPipe starting in message mode\n"); + + /* Wait for non existing pipe */ + ret = WaitNamedPipeA(PIPENAME, 2000); + ok(ret == 0, "WaitNamedPipe returned %d for non existing pipe\n", ret); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); + /* Bad parameter checks */ hnp = CreateNamedPipeA("not a named pipe", PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT, /* nMaxInstances */ 1, diff --git a/server/named_pipe.c b/server/named_pipe.c index 4c85104..4b23ba2 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -900,7 +900,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c name.len = (buffer->NameLength / sizeof(WCHAR)) * sizeof(WCHAR); if (!(pipe = (struct named_pipe *)find_object( device->pipes, &name, OBJ_CASE_INSENSITIVE ))) { - set_error( STATUS_PIPE_NOT_AVAILABLE ); + set_error( STATUS_OBJECT_NAME_NOT_FOUND ); return 0; } if (!(server = find_available_server( pipe )))

1 0

Vincent Povirk : ole32: Don't store file size in FileLockBytesImpl.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d32abd77266acf10a22213ded73b548710482427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32abd77266acf10a22213ded… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 27 14:14:45 2014 -0500 ole32: Don't store file size in FileLockBytesImpl. --- dlls/ole32/filelockbytes.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c index 9bd1163..52c1d26 100644 --- a/dlls/ole32/filelockbytes.c +++ b/dlls/ole32/filelockbytes.c @@ -49,7 +49,6 @@ typedef struct FileLockBytesImpl { ILockBytes ILockBytes_iface; LONG ref; - ULARGE_INTEGER filesize; HANDLE hfile; DWORD flProtect; LPWSTR pwcsName; @@ -108,8 +107,6 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN This->ILockBytes_iface.lpVtbl = &FileLockBytesImpl_Vtbl; This->ref = 1; This->hfile = hFile; - This->filesize.u.LowPart = GetFileSize(This->hfile, - &This->filesize.u.HighPart); This->flProtect = GetProtectMode(openFlags); if(pwcsName) { @@ -129,8 +126,6 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN else This->pwcsName = NULL; - TRACE("file len %u\n", This->filesize.u.LowPart); - *pLockBytes = &This->ILockBytes_iface; return S_OK; @@ -248,7 +243,6 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( ULONG* pcbWritten) /* [out] */ { FileLockBytesImpl* This = impl_from_ILockBytes(iface); - ULONG size_needed = ulOffset.u.LowPart + cb; ULONG bytes_left = cb; const BYTE *writePtr = pv; BOOL ret; @@ -266,14 +260,6 @@ static HRESULT WINAPI FileLockBytesImpl_WriteAt( if (pcbWritten) *pcbWritten = 0; - if (size_needed > This->filesize.u.LowPart) - { - ULARGE_INTEGER newSize; - newSize.u.HighPart = 0; - newSize.u.LowPart = size_needed; - ILockBytes_SetSize(iface, newSize); - } - offset.QuadPart = ulOffset.QuadPart; ret = SetFilePointerEx(This->hfile, offset, NULL, FILE_BEGIN); @@ -316,10 +302,7 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE HRESULT hr = S_OK; LARGE_INTEGER newpos; - if (This->filesize.u.LowPart == newSize.u.LowPart) - return hr; - - TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart); + TRACE("new size %u\n", newSize.u.LowPart); newpos.QuadPart = newSize.QuadPart; if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) @@ -327,7 +310,6 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE SetEndOfFile(This->hfile); } - This->filesize = newSize; return hr; } @@ -412,7 +394,8 @@ static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface, pstatstg->pwcsName = NULL; pstatstg->type = STGTY_LOCKBYTES; - pstatstg->cbSize = This->filesize; + + pstatstg->cbSize.u.LowPart = GetFileSize(This->hfile, &pstatstg->cbSize.u.HighPart); /* FIXME: If the implementation is exported, we'll need to set other fields. */ return S_OK;

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in npplugin.c.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: a0c2d641d435703f55a661df1c83b2e78d60f703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c2d641d435703f55a661df1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:30:12 2014 +0200 mshtml: Use get_elem_attr_value helper in npplugin.c. --- dlls/mshtml/npplugin.c | 60 ++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 0ce72ff..ca0d9fd 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -211,10 +211,11 @@ typedef struct _NPPluginFuncs { NPP_LostFocusPtr lostfocus; } NPPluginFuncs; -static nsIDOMElement *get_dom_element(NPP instance) +static nsIDOMHTMLElement *get_dom_element(NPP instance) { nsISupports *instance_unk = (nsISupports*)instance->ndata; nsIPluginInstance *plugin_instance; + nsIDOMHTMLElement *html_elem; nsIDOMElement *elem; nsresult nsres; @@ -231,17 +232,24 @@ static nsIDOMElement *get_dom_element(NPP instance) return NULL; } - return elem; + nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLElement, (void**)&html_elem); + nsIDOMElement_Release(elem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); + return NULL; + } + + return html_elem; } -static HTMLInnerWindow *get_elem_window(nsIDOMElement *elem) +static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem) { nsIDOMWindow *nswindow; nsIDOMDocument *nsdoc; HTMLOuterWindow *window; nsresult nsres; - nsres = nsIDOMElement_GetOwnerDocument(elem, &nsdoc); + nsres = nsIDOMHTMLElement_GetOwnerDocument(elem, &nsdoc); if(NS_FAILED(nsres)) return NULL; @@ -287,29 +295,22 @@ static BOOL parse_classid(const PRUnichar *classid, CLSID *clsid) return SUCCEEDED(hres); } -static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) +static BOOL get_elem_clsid(nsIDOMHTMLElement *elem, CLSID *clsid) { - nsAString attr_str, val_str; + const PRUnichar *val; + nsAString val_str; nsresult nsres; BOOL ret = FALSE; static const PRUnichar classidW[] = {'c','l','a','s','s','i','d',0}; - nsAString_InitDepend(&attr_str, classidW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMElement_GetAttribute(elem, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value(elem, classidW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); if(*val) ret = parse_classid(val, clsid); - }else { - ERR("GetAttribute failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); return ret; } @@ -529,35 +530,28 @@ static void install_codebase(const WCHAR *url) WARN("FAILED: %08x\n", hres); } -static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) +static void check_codebase(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem) { - nsAString attr_str, val_str; BOOL is_on_list = FALSE; install_entry_t *iter; + const PRUnichar *val; + nsAString val_str; IUri *uri = NULL; nsresult nsres; HRESULT hres; static const PRUnichar codebaseW[] = {'c','o','d','e','b','a','s','e',0}; - nsAString_InitDepend(&attr_str, codebaseW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMElement_GetAttribute(nselem, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value(nselem, codebaseW, &val_str, &val); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); if(*val) { hres = CoInternetCombineUrlEx(window->base.outer_window->uri, val, 0, &uri, 0); if(FAILED(hres)) uri = NULL; } - }else { - ERR("GetAttribute failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); if(!uri) return; @@ -599,7 +593,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) IUri_Release(uri); } -static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *nselem, CLSID *clsid) +static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMHTMLElement *nselem, CLSID *clsid) { IClassFactoryEx *cfex; IClassFactory *cf; @@ -645,7 +639,7 @@ static IUnknown *create_activex_object(HTMLInnerWindow *window, nsIDOMElement *n static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, INT16 argc, char **argn, char **argv, NPSavedData *saved) { - nsIDOMElement *nselem; + nsIDOMHTMLElement *nselem; HTMLInnerWindow *window; IUnknown *obj; CLSID clsid; @@ -662,7 +656,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I window = get_elem_window(nselem); if(!window) { ERR("Could not get element's window object\n"); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); return NPERR_GENERIC_ERROR; } @@ -671,7 +665,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I PluginHost *host; HRESULT hres; - hres = create_plugin_host(window->doc, nselem, obj, &clsid, &host); + hres = create_plugin_host(window->doc, (nsIDOMElement*)nselem, obj, &clsid, &host); IUnknown_Release(obj); if(SUCCEEDED(hres)) instance->pdata = host; @@ -681,7 +675,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I err = NPERR_GENERIC_ERROR; } - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); return err; }

1 0

Jacek Caban : mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 75a2e8c4f0f92c89b9079702feb5853b20ee2de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75a2e8c4f0f92c89b9079702f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:58 2014 +0200 mshtml: Use elem_string_attr_getter helper in HTMLLabelElement_get_htmlFor implementation. --- dlls/mshtml/htmlinput.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e6fb184..f5e086c 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1334,29 +1334,10 @@ static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BST static HRESULT WINAPI HTMLLabelElement_get_htmlFor(IHTMLLabelElement *iface, BSTR *p) { HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - nsAString for_str, val_str; - nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&for_str, forW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &for_str, &val_str); - nsAString_Finish(&for_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *val; - - nsAString_GetData(&val_str, &val); - *p = SysAllocString(val); - hres = *p ? S_OK : E_OUTOFMEMORY; - }else { - ERR("GetAttribute failed: %08x\n", nsres); - hres = E_FAIL; - } - - nsAString_Finish(&val_str); - return hres; + return elem_string_attr_getter(&This->element, forW, p); } static HRESULT WINAPI HTMLLabelElement_put_accessKey(IHTMLLabelElement *iface, BSTR v)

1 0

Bruno Jesus : winmm: Fix a memory leak in mciSendStringW (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: c3a362a4c44dea29d1f59fc5805b9be385df75ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3a362a4c44dea29d1f59fc58… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 20:53:19 2014 -0300 winmm: Fix a memory leak in mciSendStringW (valgrind). --- dlls/winmm/mci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 5c91045..10e2b40 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1316,7 +1316,7 @@ static DWORD MCI_HandleReturnValues(DWORD dwRet, LPWINE_MCIDRIVER wmd, DWORD ret DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, UINT uRetLen, HWND hwndCallback) { - LPWSTR verb, dev, args; + LPWSTR verb, dev, args, devType = NULL; LPWINE_MCIDRIVER wmd = 0; MCIDEVICEID uDevID, auto_open = 0; DWORD dwFlags = 0, dwRet = 0; @@ -1360,7 +1360,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, /* Determine devType from open */ if (!strcmpW(verb, wszOpen)) { - LPWSTR devType, tmp; + LPWSTR tmp; WCHAR buf[128]; /* case dev == 'new' has to be handled */ @@ -1426,7 +1426,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, dwRet = MCI_LoadMciDriver(devType, &wmd); if (dwRet == MCIERR_DEVICE_NOT_INSTALLED) dwRet = MCIERR_INVALID_DEVICE_NAME; - HeapFree(GetProcessHeap(), 0, devType); if (dwRet) goto errCleanUp; } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev))) @@ -1596,6 +1595,7 @@ errCleanUp: } if (wMsg == MCI_OPEN && LOWORD(dwRet) && wmd) MCI_UnLoadMciDriver(wmd); + HeapFree(GetProcessHeap(), 0, devType); HeapFree(GetProcessHeap(), 0, verb); return dwRet; }

1 0

Piotr Caban : user32: Try to activate topmost activable window in WINPOS_ActivateOtherWindow.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 7257b62bd1b95438c651716b48bf3d7438eb235a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7257b62bd1b95438c651716b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 28 12:57:47 2014 +0200 user32: Try to activate topmost activable window in WINPOS_ActivateOtherWindow. --- dlls/user32/tests/win.c | 5 +++++ dlls/user32/winpos.c | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cffceb3..cbcd6b6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3766,6 +3766,11 @@ static void test_SetParent(void) ok(bret, "SetForegroundWindow() failed\n"); check_active_state(popup, popup, popup); + ShowWindow(parent, SW_SHOW); + SetActiveWindow(popup); + ok(DestroyWindow(popup), "DestroyWindow() failed\n"); + check_active_state(parent, parent, parent); + ok(DestroyWindow(parent), "DestroyWindow() failed\n"); ok(!IsWindow(parent), "parent still exists\n"); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 57fefe3..0a70942 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1536,7 +1536,19 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) for (;;) { if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; - if (can_activate_window( hwndTo )) break; + if (can_activate_window( hwndTo )) goto done; + } + + hwndTo = GetTopWindow( 0 ); + for (;;) + { + if (hwndTo == hwnd) + { + hwndTo = 0; + break; + } + if (can_activate_window( hwndTo )) goto done; + if (!(hwndTo = GetWindow( hwndTo, GW_HWNDNEXT ))) break; } done:

1 0

Austin English : user32: Fix a comment.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 2227abbc2cf4c89e28ab95ec3381650cb90f7951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2227abbc2cf4c89e28ab95ec3… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 29 16:16:07 2014 -0700 user32: Fix a comment. --- dlls/user32/tests/winstation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 7f91b8b..0889dac 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -519,7 +519,7 @@ static void test_inputdesktop(void) ret = CloseDesktop(input_desk); ok(ret, "CloseDesktop failed!\n"); - /* by default, GetThreadDesktop is the input desktop, SendInput should success. */ + /* by default, GetThreadDesktop is the input desktop, SendInput should succeed. */ old_thread_desk = GetThreadDesktop(GetCurrentThreadId()); ok(old_thread_desk != NULL, "GetThreadDesktop faile!\n"); memset(name, 0, sizeof(name));

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 04ea007cbb4733cd84fcc48b6341c819472a6fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ea007cbb4733cd84fcc48b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:48 2014 +0200 mshtml: Use get_elem_attr_value helper in HTMLFormElement_get_dispid. --- dlls/mshtml/htmlform.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5b9982c..6cbf1f6 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -568,7 +568,7 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, { HTMLFormElement *This = impl_from_HTMLDOMNode(iface); nsIDOMHTMLCollection *elements; - nsAString nsname, nsstr; + nsAString nsstr, name_str; UINT32 len, i; nsresult nsres; HRESULT hres = DISP_E_UNKNOWNNAME; @@ -604,7 +604,6 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } } - nsAString_InitDepend(&nsname, nameW); nsAString_Init(&nsstr, NULL); for(i = 0; i < len; ++i) { nsIDOMNode *nsitem; @@ -644,21 +643,22 @@ static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, } /* compare by name attr */ - nsres = nsIDOMHTMLElement_GetAttribute(nshtml_elem, &nsname, &nsstr); + nsres = get_elem_attr_value(nshtml_elem, nameW, &name_str, &str); nsIDOMHTMLElement_Release(nshtml_elem); - nsAString_GetData(&nsstr, &str); - if(!strcmpiW(str, name)) { - /* FIXME: using index for dispid */ - *pid = MSHTML_DISPID_CUSTOM_MIN + i; - hres = S_OK; - break; + if(NS_SUCCEEDED(nsres)) { + if(!strcmpiW(str, name)) { + nsAString_Finish(&name_str); + /* FIXME: using index for dispid */ + *pid = MSHTML_DISPID_CUSTOM_MIN + i; + hres = S_OK; + break; + } + nsAString_Finish(&name_str); } } - nsAString_Finish(&nsname); - nsAString_Finish(&nsstr); + nsAString_Finish(&nsstr); nsIDOMHTMLCollection_Release(elements); - return hres; }

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in check_event_attr.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: df62eea18639ca985ce740d0b7d10e9c6b0b4b50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df62eea18639ca985ce740d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:37 2014 +0200 mshtml: Use get_elem_attr_value helper in check_event_attr. --- dlls/mshtml/htmlevent.c | 15 ++++----------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/mutation.c | 6 +++--- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ee384ee..484f3f7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1523,24 +1523,19 @@ void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr } } -void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) +void check_event_attr(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { const PRUnichar *attr_value; - nsAString attr_name_str, attr_value_str; + nsAString attr_value_str; IDispatch *disp; HTMLDOMNode *node; int i; nsresult nsres; HRESULT hres; - nsAString_Init(&attr_value_str, NULL); - nsAString_Init(&attr_name_str, NULL); - for(i=0; i < EVENTID_LAST; i++) { - nsAString_SetData(&attr_name_str, event_info[i].attr_name); - nsres = nsIDOMElement_GetAttribute(nselem, &attr_name_str, &attr_value_str); + nsres = get_elem_attr_value(nselem, event_info[i].attr_name, &attr_value_str, &attr_value); if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&attr_value_str, &attr_value); if(!*attr_value) continue; @@ -1555,11 +1550,9 @@ void check_event_attr(HTMLDocumentNode *doc, nsIDOMElement *nselem) } IDispatch_Release(disp); } + nsAString_Finish(&attr_value_str); } } - - nsAString_Finish(&attr_value_str); - nsAString_Finish(&attr_name_str); } HRESULT doc_init_events(HTMLDocumentNode *doc) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 528eded..d2426d3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -49,7 +49,7 @@ typedef enum { } eventid_t; eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; -void check_event_attr(HTMLDocumentNode*,nsIDOMElement*) DECLSPEC_HIDDEN; +void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(event_target_t**,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 23b37b5..b79ec1f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -638,16 +638,16 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, nsIDOMHTMLIFrameElement *nsiframe; nsIDOMHTMLFrameElement *nsframe; nsIDOMHTMLScriptElement *nsscript; + nsIDOMHTMLElement *nselem; nsIDOMComment *nscomment; - nsIDOMElement *nselem; nsresult nsres; TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMElement, (void**)&nselem); + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_SUCCEEDED(nsres)) { check_event_attr(This, nselem); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); } nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment);

1 0

Bruno Jesus : user32/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d90d2ab558fc81aee64a29b3f566bab4aa4c8f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90d2ab558fc81aee64a29b3f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 20:35:13 2014 -0300 user32/tests: Fix a memory leak (valgrind). --- dlls/user32/tests/cursoricon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 9540f3d..54d7963 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1699,6 +1699,7 @@ static void test_GetCursorFrameInfo(void) ret = DestroyCursor(h1); ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, hotspot); cleanup: if(bmpOld) SelectObject(hdc, bmpOld); if(bmp) DeleteObject(bmp);

1 0

Nikolay Sivov : shell32: Update to FolderItem2.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: c318cda8d17c2c7751c954b0ef9ada2db3d33904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c318cda8d17c2c7751c954b0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 24 18:23:52 2014 +0400 shell32: Update to FolderItem2. --- dlls/shell32/shelldispatch.c | 93 +++++++++++++++++++++++++----------------- include/shldisp.idl | 12 ++++++ 2 files changed, 67 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c318cda8d17c2c7751c95…

1 0

Huw Davies : gdi32/tests: tmLastChar is solely governed by the last entry before 0xffff in the cmap.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 0987e77089880680ae9deb01f3b550bce43f0ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0987e77089880680ae9deb01f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 23 11:33:54 2014 +0100 gdi32/tests: tmLastChar is solely governed by the last entry before 0xffff in the cmap. --- dlls/gdi32/tests/font.c | 40 ++++++++++++---------------------------- dlls/gdi32/tests/wine_test.sfd | 39 +++++++++++++++++++-------------------- dlls/gdi32/tests/wine_test.ttf | Bin 1760 -> 1776 bytes 3 files changed, 31 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0e75088..e978166 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3255,42 +3255,20 @@ static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last, DWOR int i; cmap_format_4 *cmap = (cmap_format_4*)ptr; USHORT seg_count = GET_BE_WORD(cmap->seg_countx2) / 2; - USHORT const *glyph_ids = cmap->end_count + 4 * seg_count + 1; *first = 0x10000; for(i = 0; i < seg_count; i++) { - DWORD code, index; cmap_format_4_seg seg; get_seg4(cmap, i, &seg); - for(code = seg.start_count; code <= seg.end_count; code++) - { - if(seg.id_range_offset == 0) - index = (seg.id_delta + code) & 0xffff; - else - { - index = seg.id_range_offset / 2 - + code - seg.start_count - + i - seg_count; - /* some fonts have broken last segment */ - if ((char *)(glyph_ids + index + 1) < (char *)ptr + limit) - index = GET_BE_WORD(glyph_ids[index]); - else - { - trace("segment %04x/%04x index %04x points to nowhere\n", - seg.start_count, seg.end_count, index); - index = 0; - } - if(index) index += seg.id_delta; - } - if(*first == 0x10000) - *last = *first = code; - else if(index) - *last = code; - } + if(seg.start_count > 0xfffe) break; + + if(*first == 0x10000) *first = seg.start_count; + + *last = min(seg.end_count, 0xfffe); } if(*first == 0x10000) return FALSE; @@ -3560,7 +3538,7 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) else { expect_first_W = cmap_first; - expect_last_W = min(cmap_last, os2_last_char); + expect_last_W = cmap_last; if(os2_first_char <= 1) expect_break_W = os2_first_char + 2; else if(os2_first_char > 0xff) @@ -5064,6 +5042,7 @@ static void test_GetGlyphOutline_metric_clipping(void) HFONT hfont, hfont_prev; GLYPHMETRICS gm; TEXTMETRICA tm; + TEXTMETRICW tmW; DWORD ret; memset(&lf, 0, sizeof(lf)); @@ -5092,6 +5071,11 @@ static void test_GetGlyphOutline_metric_clipping(void) "Glyph bottom(%d) exceeds descent(%d)\n", gm.gmptGlyphOrigin.y - gm.gmBlackBoxY, -tm.tmDescent); + /* Test tmLastChar - wine_test has code points fffb-fffe mapped to glyph 0 */ + GetTextMetricsW(hdc, &tmW); +todo_wine + ok( tmW.tmLastChar == 0xfffe, "got %04x\n", tmW.tmLastChar); + SelectObject(hdc, hfont_prev); DeleteObject(hfont); ReleaseDC(NULL, hdc); diff --git a/dlls/gdi32/tests/wine_test.sfd b/dlls/gdi32/tests/wine_test.sfd index 4c19377..c985b43 100644 --- a/dlls/gdi32/tests/wine_test.sfd +++ b/dlls/gdi32/tests/wine_test.sfd @@ -12,15 +12,13 @@ Ascent: 1638 Descent: 410 sfntRevision: 0x00010000 LayerCount: 2 -Layer: 0 1 "Back" 1 -Layer: 1 1 "Fore" 0 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 XUID: [1021 905 592216984 1247726] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 -CreationTime: 1288336343 -ModificationTime: 1366465321 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -92,6 +90,7 @@ BeginChars: 65539 7 StartChar: .notdef Encoding: 65536 -1 0 +AltUni2: 00fffe.ffffffff.0 00fffd.ffffffff.0 00fffc.ffffffff.0 00fffb.ffffffff.0 Width: 748 Flags: W TtInstrs: @@ -212,14 +211,14 @@ Flags: WO LayerCount: 2 Fore SplineSet -459 1258 m 29,0,-1 - 462 1639 l 5,1,-1 - 389 1638 l 5,2,-1 - 492 1815 l 5,3,-1 - 609 1638.5 l 5,4,-1 - 531 1637.5 l 5,5,-1 - 523 1258 l 5,6,-1 - 459 1258 l 29,0,-1 +459 1258 m 25,0,-1 + 462 1639 l 1,1,-1 + 389 1638 l 1,2,-1 + 492 1815 l 1,3,-1 + 609 1638.5 l 1,4,-1 + 531 1637.5 l 1,5,-1 + 523 1258 l 1,6,-1 + 459 1258 l 25,0,-1 EndSplineSet EndChar @@ -231,14 +230,14 @@ Flags: WO LayerCount: 2 Fore SplineSet -461 -30.7998 m 29,0,-1 - 464 -411.8 l 5,1,-1 - 391 -410.8 l 5,2,-1 - 494 -587.8 l 5,3,-1 - 611 -411.3 l 5,4,-1 - 533 -410.3 l 5,5,-1 - 525 -30.7998 l 5,6,-1 - 461 -30.7998 l 29,0,-1 +461 -30.7998 m 25,0,-1 + 464 -411.8 l 1,1,-1 + 391 -410.8 l 1,2,-1 + 494 -587.8 l 1,3,-1 + 611 -411.3 l 1,4,-1 + 533 -410.3 l 1,5,-1 + 525 -30.7998 l 1,6,-1 + 461 -30.7998 l 25,0,-1 EndSplineSet EndChar EndChars diff --git a/dlls/gdi32/tests/wine_test.ttf b/dlls/gdi32/tests/wine_test.ttf index 0868802..1562a32 100644 Binary files a/dlls/gdi32/tests/wine_test.ttf and b/dlls/gdi32/tests/wine_test.ttf differ

1 0

Jacek Caban : mshtml: Added function object default value getter implementation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 62624922528d640cb1a86a699960233c562b316d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62624922528d640cb1a86a699… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 2 15:45:13 2014 +0200 mshtml: Added function object default value getter implementation. --- dlls/mshtml/dispex.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/jstest.html | 3 +++ dlls/mshtml/tests/script.c | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d68a132..a81bf7c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -717,6 +717,37 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_UNEXPECTED; hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; + case DISPATCH_PROPERTYGET: { + unsigned name_len; + WCHAR *ptr; + BSTR str; + + static const WCHAR func_prefixW[] = + {'\n','f','u','n','c','t','i','o','n',' '}; + static const WCHAR func_suffixW[] = + {'(',')',' ','{','\n',' ',' ',' ',' ','[','n','a','t','i','v','e',' ','c','o','d','e',']','\n','}','\n'}; + + /* FIXME: This probably should be more generic. Also we should try to get IID_IActiveScriptSite and SID_GetCaller. */ + if(!caller) + return E_ACCESSDENIED; + + name_len = SysStringLen(This->info->name); + ptr = str = SysAllocStringLen(NULL, name_len + (sizeof(func_prefixW)+sizeof(func_suffixW))/sizeof(WCHAR)); + if(!str) + return E_OUTOFMEMORY; + + memcpy(ptr, func_prefixW, sizeof(func_prefixW)); + ptr += sizeof(func_prefixW)/sizeof(WCHAR); + + memcpy(ptr, This->info->name, name_len*sizeof(WCHAR)); + ptr += name_len; + + memcpy(ptr, func_suffixW, sizeof(func_suffixW)); + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + return S_OK; + } default: FIXME("Unimplemented flags %x\n", flags); hres = E_NOTIMPL; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index bfa98c0..b47de42 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -165,6 +165,9 @@ function test_override_functions() { var tmp = div.addBehavior(); ok(tmp === "test", "div.addBehavior() = " + tmp); + + tmp = String(div.attachEvent); + ok(tmp == "\nfunction attachEvent() {\n [native code]\n}\n", "String(div.attachEvent) = " + tmp); } function test_forin() { diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index df52a75..5e9ca60 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -132,6 +132,8 @@ DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller_secmgr); DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller); DEFINE_EXPECT(external_success); DEFINE_EXPECT(QS_VariantConversion); +DEFINE_EXPECT(QS_IActiveScriptSite); +DEFINE_EXPECT(QS_GetCaller); DEFINE_EXPECT(ChangeType); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" @@ -162,6 +164,9 @@ static HRESULT ax_getopt_hres = S_OK, ax_setopt_dispex_hres = S_OK; static HRESULT ax_setopt_disp_caller_hres = S_OK, ax_setopt_disp_data_hres = S_OK; static BOOL skip_loadobject_tests; +static IActiveScriptSite *site; +static SCRIPTSTATE state; + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -332,6 +337,19 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return S_OK; } + if(IsEqualGUID(guidService, &IID_IActiveScriptSite)) { + CHECK_EXPECT(QS_IActiveScriptSite); + ok(IsEqualGUID(riid, &IID_IOleCommandTarget), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + return IActiveScriptSite_QueryInterface(site, riid, ppv); + } + + if(IsEqualGUID(guidService, &SID_GetCaller)) { + CHECK_EXPECT(QS_GetCaller); + ok(IsEqualGUID(riid, &IID_IServiceProvider), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -1280,9 +1298,6 @@ static void load_doc(IHTMLDocument2 *doc, const char *str) IHTMLElement_Release(body); } -static IActiveScriptSite *site; -static SCRIPTSTATE state; - static HRESULT WINAPI ObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1902,6 +1917,22 @@ static void test_func(IDispatchEx *obj) hres = dispex_propput(obj, id, 0, &var, NULL); ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); + hres = dispex_propget(dispex, DISPID_VALUE, &var, NULL); + ok(hres == E_ACCESSDENIED, "InvokeEx returned: %08x, expected E_ACCESSDENIED\n", hres); + if(SUCCEEDED(hres)) + VariantClear(&var); + + SET_EXPECT(QS_IActiveScriptSite); + SET_EXPECT(QS_GetCaller); + hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp); + ok(hres == S_OK, "InvokeEx returned: %08x, expected S_OK\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + ok(!strcmp_wa(V_BSTR(&var), "\nfunction toString() {\n [native code]\n}\n"), + "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + todo_wine CHECK_CALLED(QS_IActiveScriptSite); + todo_wine CHECK_CALLED(QS_GetCaller); + IDispatchEx_Release(dispex); }

1 0

Nikolay Sivov : include: Add more error codes.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 056a8f1d2362240d9db6889895e0f500636e2e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056a8f1d2362240d9db688989… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:10:06 2014 +0400 include: Add more error codes. --- include/winbase.h | 1 - include/winerror.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/include/winbase.h b/include/winbase.h index 29ff218..7432983 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1045,7 +1045,6 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define WAIT_ABANDONED STATUS_ABANDONED_WAIT_0 #define WAIT_ABANDONED_0 STATUS_ABANDONED_WAIT_0 #define WAIT_IO_COMPLETION STATUS_USER_APC -#define WAIT_TIMEOUT STATUS_TIMEOUT #define STILL_ACTIVE STATUS_PENDING #define FILE_BEGIN 0 diff --git a/include/winerror.h b/include/winerror.h index 9d988fb..3c3a53b 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -239,6 +239,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_MAX_THRDS_REACHED 164 #define ERROR_LOCK_FAILED 167 #define ERROR_BUSY 170 +#define ERROR_DEVICE_SUPPORT_IN_PROGRESS 171 #define ERROR_CANCEL_VIOLATION 173 #define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174 #define ERROR_INVALID_SEGMENT_NUMBER 180 @@ -272,6 +273,16 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_TOO_MANY_MODULES 214 #define ERROR_NESTING_NOT_ALLOWED 215 #define ERROR_EXE_MACHINE_TYPE_MISMATCH 216 +#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217 +#define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218 +#define ERROR_FILE_CHECKED_OUT 220 +#define ERROR_CHECKOUT_REQUIRED 221 +#define ERROR_BAD_FILE_TYPE 222 +#define ERROR_FILE_TOO_LARGE 223 +#define ERROR_FORMS_AUTH_REQUIRED 224 +#define ERROR_VIRUS_INFECTED 225 +#define ERROR_VIRUS_DELETED 226 +#define ERROR_PIPE_LOCAL 229 #define ERROR_BAD_PIPE 230 #define ERROR_PIPE_BUSY 231 #define ERROR_NO_DATA 232 @@ -280,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255 +#define WAIT_TIMEOUT 258 #define ERROR_NO_MORE_ITEMS 259 #define ERROR_CANNOT_COPY 266 #define ERROR_DIRECTORY 267 @@ -294,8 +306,44 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_OPLOCK_NOT_GRANTED 300 #define ERROR_INVALID_OPLOCK_PROTOCOL 301 #define ERROR_DISK_TOO_FRAGMENTED 302 +#define ERROR_DELETE_PENDING 303 +#define ERROR_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING 304 +#define ERROR_SHORT_NAMES_NOT_ENABLED_ON_VOLUME 305 +#define ERROR_SECURITY_STREAM_IS_INCONSISTENT 306 +#define ERROR_INVALID_LOCK_RANGE 307 +#define ERROR_IMAGE_SUBSYSTEM_NOT_PRESENT 308 +#define ERROR_NOTIFICATION_GUID_ALREADY_DEFINED 309 +#define ERROR_INVALID_EXCEPTION_HANDLER 310 +#define ERROR_DUPLICATE_PRIVILEGES 311 +#define ERROR_NO_RANGES_PROCESSED 312 +#define ERROR_NOT_ALLOWED_ON_SYSTEM_FILE 313 +#define ERROR_DISK_RESOURCES_EXHAUSTED 314 +#define ERROR_INVALID_TOKEN 315 +#define ERROR_DEVICE_FEATURE_NOT_SUPPORTED 316 #define ERROR_MR_MID_NOT_FOUND 317 #define ERROR_SCOPE_NOT_FOUND 318 +#define ERROR_UNDEFINED_SCOPE 319 +#define ERROR_INVALID_CAP 320 +#define ERROR_DEVICE_UNREACHABLE 321 +#define ERROR_DEVICE_NO_RESOURCES 322 +#define ERROR_DATA_CHECKSUM_ERROR 323 +#define ERROR_INTERMIXED_KERNEL_EA_OPERATION 324 +#define ERROR_FILE_LEVEL_TRIM_NOT_SUPPORTED 326 +#define ERROR_OFFSET_ALIGNMENT_VIOLATION 327 +#define ERROR_INVALID_FIELD_IN_PARAMETER_LIST 328 +#define ERROR_OPERATION_IN_PROGRESS 329 +#define ERROR_BAD_DEVICE_PATH 330 +#define ERROR_TOO_MANY_DESCRIPTORS 331 +#define ERROR_SCRUB_DATA_DISABLED 332 +#define ERROR_NOT_REDUNDANT_STORAGE 333 +#define ERROR_RESIDENT_FILE_NOT_SUPPORTED 334 +#define ERROR_COMPRESSED_FILE_NOT_SUPPORTED 335 +#define ERROR_DIRECTORY_NOT_SUPPORTED 336 +#define ERROR_NOT_READ_FROM_COPY 337 +#define ERROR_FT_WRITE_FAILURE 338 +#define ERROR_FT_DI_SCAN_REQUIRED 339 +#define ERROR_INVALID_KERNEL_INFO_VERSION 340 +#define ERROR_INVALID_PEP_INFO_VERSION 341 #define ERROR_FAIL_NOACTION_REBOOT 350 #define ERROR_FAIL_SHUTDOWN 351 #define ERROR_FAIL_RESTART 352 @@ -463,7 +511,15 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_FIRMWARE_UPDATED 728 #define ERROR_DRIVERS_LEAKING_LOCKED_PAGES 729 #define ERROR_WAKE_SYSTEM 730 +#define ERROR_WAIT_1 731 +#define ERROR_WAIT_2 732 +#define ERROR_WAIT_3 733 +#define ERROR_WAIT_63 734 #define ERROR_ABANDONED_WAIT_0 735 +#define ERROR_ABANDONED_WAIT_63 736 +#define ERROR_USER_APC 737 +#define ERROR_KERNEL_APC 738 +#define ERROR_ALERTED 739 #define ERROR_ELEVATION_REQUIRED 740 #define ERROR_REPARSE 741 #define ERROR_OPLOCK_BREAK_IN_PROGRESS 742 @@ -515,6 +571,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED 788 #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR 789 #define ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR 790 +#define ERROR_NO_ACE_CONDITION 804 +#define ERROR_INVALID_ACE_CONDITION 805 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996

1 0

Huw Davies : riched20: Don' t skip the final carriage return in SFF_SELECTION mode.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b89c7c8fc2b1e1de06ddb49a8cc8326b45573961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89c7c8fc2b1e1de06ddb49a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 29 15:47:42 2014 +0100 riched20: Don't skip the final carriage return in SFF_SELECTION mode. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bc5bc08..0127616 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1620,7 +1620,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre CR/LF counters, since RTF streaming presents only \para tokens, which are converted according to the standard rules: \r for 2.0, \r\n for 1.0 */ - if (stripLastCR) { + if (stripLastCR && !(format & SFF_SELECTION)) { int newto; ME_GetSelection(editor, &selStart, &selEnd); newto = ME_GetCursorOfs(selEnd); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e14d7f6..2a85357 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5072,10 +5072,12 @@ static void test_EM_STREAMIN(void) LRESULT result; EDITSTREAM es; char buffer[1024] = {0}, tmp[16]; + CHARRANGE range; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; + const char * ptr; const char * streamText1 = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" @@ -5132,7 +5134,8 @@ static void test_EM_STREAMIN(void) ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ - es.dwCookie = (DWORD_PTR)&streamText0a; + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); @@ -5161,6 +5164,43 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test 0-b set error %d, expected %d\n", es.dwError, 0); + /* Show that when using SFF_SELECTION the last \par is not ignored. */ + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 12, + "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-a set error %d, expected %d\n", es.dwError, 0); + + range.cpMin = 0; + range.cpMax = -1; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + ok (result == 13, "got %ld\n", result); + + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SFF_SELECTION | SF_RTF, (LPARAM)&es); + ok(result == 13, "got %ld, expected 13\n", result); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 14, + "EM_STREAMIN: Test SFF_SELECTION 0-a returned %ld, expected 14\n", result); + result = strcmp (buffer,"TestSomeText\r\n"); + ok (result == 0, + "EM_STREAMIN: Test SFF_SELECTION 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test SFF_SELECTION 0-a set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback;

1 0

Nikolay Sivov : ntdll: Fix LdrLockLoaderLock()/LdrUnlockLoaderLock() on 64bit.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 5a8d73283cf637e3d00dbb781cc4cd49027a29b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8d73283cf637e3d00dbb781… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 28 08:58:59 2014 +0400 ntdll: Fix LdrLockLoaderLock()/LdrUnlockLoaderLock() on 64bit. --- dlls/kernel32/module.c | 7 ++++--- dlls/kernel32/tests/loader.c | 6 +++--- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/tests/rtl.c | 15 ++++++++------- include/winternl.h | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d1555f1..514b6be 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -538,7 +538,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) { NTSTATUS status = STATUS_SUCCESS; HMODULE ret; - ULONG magic; + ULONG_PTR magic; BOOL lock; if (!module) @@ -666,7 +666,8 @@ DWORD WINAPI GetModuleFileNameA( */ DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName, DWORD size ) { - ULONG magic, len = 0; + ULONG len = 0; + ULONG_PTR magic; LDR_MODULE *pldr; NTSTATUS nts; WIN16_SUBSYSTEM_TIB *win16_tib; @@ -911,7 +912,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (flags & LOAD_LIBRARY_AS_DATAFILE) { - ULONG magic; + ULONG_PTR magic; LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrGetDllHandle( load_path, flags, libname, &hModule )) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e749238..af43779 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -61,8 +61,8 @@ static void (WINAPI *pLdrShutdownProcess)(void); static BOOLEAN (WINAPI *pRtlDllShutdownInProgress)(void); static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); -static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG *); -static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG_PTR *); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, @@ -1367,7 +1367,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) { - ULONG loader_lock_magic; + ULONG_PTR loader_lock_magic; trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 14e196f..9a9dec9 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2435,7 +2435,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) { NTSTATUS status; - ULONG magic; + ULONG_PTR magic; LDR_MODULE *pldr; LdrLockLoaderLock(0, NULL, &magic); @@ -2934,7 +2934,7 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) } else if (flags & (QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS|QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE)) { - ULONG magic; + ULONG_PTR magic; LDR_MODULE *pldr; if (!*handle) return STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6471290..79aa341 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1340,7 +1340,7 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) * Note: some flags are not implemented. * Flag 0x01 is used to raise exceptions on errors. */ -NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) +NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG_PTR *magic ) { if (flags & ~0x2) FIXME( "flags %x not supported\n", flags ); @@ -1372,7 +1372,7 @@ NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) /****************************************************************** * LdrUnlockLoaderUnlock (NTDLL.@) */ -NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG magic ) +NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) { if (magic) { diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 72cee05..e8eb04a 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,8 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); -static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG*); -static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -1549,7 +1549,8 @@ static void test_LdrAddRefDll(void) static void test_LdrLockLoaderLock(void) { - ULONG result, magic; + ULONG_PTR magic; + ULONG result; NTSTATUS status; if (!pLdrLockLoaderLock) @@ -1564,12 +1565,12 @@ static void test_LdrLockLoaderLock(void) status = pLdrLockLoaderLock(0x10, &result, &magic); ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); ok(result == 0, "got %d\n", result); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); magic = 0xdeadbeef; status = pLdrLockLoaderLock(0x10, NULL, &magic); ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); result = 10; status = pLdrLockLoaderLock(0x10, &result, NULL); @@ -1580,7 +1581,7 @@ static void test_LdrLockLoaderLock(void) magic = 0xdeadbeef; status = pLdrLockLoaderLock(0x2, NULL, &magic); ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); /* magic pointer is null */ result = 10; @@ -1594,7 +1595,7 @@ static void test_LdrLockLoaderLock(void) status = pLdrLockLoaderLock(0x2, &result, &magic); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ok(result == 1, "got %d\n", result); - ok(magic != 0, "got 0x%08x\n", magic); + ok(magic != 0, "got %lx\n", magic); pLdrUnlockLoaderLock(0, magic); } diff --git a/include/winternl.h b/include/winternl.h index d7f2f50..a95a016 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2020,14 +2020,14 @@ NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); NTSYSAPI void WINAPI LdrInitializeThunk(void*,ULONG_PTR,ULONG_PTR,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); -NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); +NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG_PTR*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR); NTSYSAPI NTSTATUS WINAPI LdrQueryImageFileExecutionOptions(const UNICODE_STRING*,LPCWSTR,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); NTSYSAPI void WINAPI LdrShutdownProcess(void); NTSYSAPI void WINAPI LdrShutdownThread(void); NTSYSAPI NTSTATUS WINAPI LdrUnloadDll(HMODULE); -NTSYSAPI NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN);

1 0

Michael Stefaniuc : dswave/tests: Test some IPersistStream methods of DirectSoundWave.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 0ade62e03c62fb97e37eeec3aae932bec12a1df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ade62e03c62fb97e37eeec3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:43:58 2014 +0200 dswave/tests: Test some IPersistStream methods of DirectSoundWave. --- dlls/dswave/tests/dswave.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 154c899..1a96548 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -86,6 +86,37 @@ static void test_COM(void) while (IDirectMusicObject_Release(dmo)); } +static void test_dswave(void) +{ + IDirectMusicObject *dmo; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectSoundWave), + "Expected class CLSID_DirectSoundWave got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicObject_Release(dmo)); +} + START_TEST(dswave) { CoInitialize(NULL); @@ -97,6 +128,7 @@ START_TEST(dswave) return; } test_COM(); + test_dswave(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmscript/tests: Test unimplemented IPersistStream methods in DMScript.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 41b1dce0e241684d11a31b54be046d3abbd5b08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b1dce0e241684d11a31b54b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:41:10 2014 +0200 dmscript/tests: Test unimplemented IPersistStream methods in DMScript. --- dlls/dmscript/script.c | 2 -- dlls/dmscript/tests/dmscript.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 872b7af..6b9be6f 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -430,8 +430,6 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSIS } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - FIXME("(%p): stub, always S_FALSE\n", This); return S_FALSE; } diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index b2912a4..204cf7c 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -175,6 +175,33 @@ static void test_COM_scripttrack(void) while (IDirectMusicTrack_Release(dmt)); } +static void test_dmscript(void) +{ + IDirectMusicScript *dms; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicScript, (void**)&dms); + ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IDirectMusicScript_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicScript_Release(dms)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -187,6 +214,7 @@ START_TEST(dmscript) } test_COM(); test_COM_scripttrack(); + test_dmscript(); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Added new helper for GetAttribute based getters and use it in IHTMLMetaElement implementation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b79ef6769bb841d34cfdb876e41ed93b14c724b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79ef6769bb841d34cfdb876e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:04 2014 +0200 mshtml: Added new helper for GetAttribute based getters and use it in IHTMLMetaElement implementation. --- dlls/mshtml/htmlelem.c | 17 +++++++++++++++++ dlls/mshtml/htmlmeta.c | 30 +++--------------------------- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6a9d396..8e246fe 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -175,6 +175,23 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsASt return NS_OK; } +HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) +{ + const PRUnichar *val; + nsAString val_str; + nsresult nsres; + + nsres = get_elem_attr_value(elem->nselem, name, &val_str, &val); + if(NS_FAILED(nsres)) + return E_FAIL; + + TRACE("%s: returning %s\n", debugstr_w(name), debugstr_w(val)); + + *p = SysAllocString(val); + nsAString_Finish(&val_str); + return *p ? S_OK : E_OUTOFMEMORY; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index b4ff82e..e9783c8 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -104,19 +104,11 @@ static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BST static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString httpequiv_str, val_str; - nsresult nsres; - static const PRUnichar httpEquivW[] = {'h','t','t','p','-','e','q','u','i','v',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&httpequiv_str, httpEquivW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &httpequiv_str, &val_str); - nsAString_Finish(&httpequiv_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, httpEquivW, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) @@ -129,19 +121,11 @@ static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString content_str, val_str; - nsresult nsres; - static const PRUnichar contentW[] = {'c','o','n','t','e','n','t',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&content_str, contentW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &content_str, &val_str); - nsAString_Finish(&content_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, contentW, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) @@ -154,19 +138,11 @@ static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString name_str, val_str; - nsresult nsres; - static const PRUnichar nameW[] = {'n','a','m','e',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&name_str, nameW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &name_str, &val_str); - nsAString_Finish(&name_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, nameW, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3181ee2..8be7141 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -960,6 +960,7 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOM IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BSTR*) DECLSPEC_HIDDEN; /* commands */ typedef struct {

1 0

Jacek Caban : mshtml: Added new helper for getting element attribute value and use it in script.c.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 39e24713e9f18e1216be7285b1f17fd8b9393364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e24713e9f18e1216be7285b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:56 2014 +0200 mshtml: Added new helper for getting element attribute value and use it in script.c. --- dlls/mshtml/htmlelem.c | 19 +++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/script.c | 18 +++++------------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 04ca05c..6a9d396 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -156,6 +156,25 @@ HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, cons return hres; } +nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsAString *val_str, const PRUnichar **val) +{ + nsAString name_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, name); + nsAString_Init(val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(nselem, &name_str, val_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("GetAttribute(%s) failed: %08x\n", debugstr_w(name), nsres); + nsAString_Finish(val_str); + return nsres; + } + + nsAString_GetData(val_str, val); + return NS_OK; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 068c18e..3181ee2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -959,6 +959,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; + /* commands */ typedef struct { DWORD id; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4d49587..e5f4ab1 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -784,7 +784,7 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script return; } }else { - ERR("GetAttribute(event) failed: %08x\n", nsres); + ERR("GetEvent failed: %08x\n", nsres); } nsAString_Finish(&event_str); @@ -849,7 +849,8 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { - nsAString attr_str, val_str; + const PRUnichar *language; + nsAString val_str; BOOL ret = FALSE; nsresult nsres; @@ -871,26 +872,17 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns ERR("GetType failed: %08x\n", nsres); } - nsAString_InitDepend(&attr_str, languageW); - nsres = nsIDOMHTMLScriptElement_GetAttribute(nsscript, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value((nsIDOMHTMLElement*)nsscript, languageW, &val_str, &language); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *language; - - nsAString_GetData(&val_str, &language); - if(*language) { ret = get_guid_from_language(language, guid); }else { *guid = get_default_script_guid(window); ret = TRUE; } - }else { - ERR("GetAttribute(language) failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); - return ret; }

1 0

Jacek Caban : mshtml: Call unlink from HTMLDOMNode::Release.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 4745fd03d4c246be377214fb6d7d39f599b9439d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4745fd03d4c246be377214fb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:44 2014 +0200 mshtml: Call unlink from HTMLDOMNode::Release. --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlnode.c | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dd4949f..a9db920 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4330,11 +4330,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) This->nsnode_selector = NULL; } - if(This->nsdoc) { - assert(!This->window); - release_document_mutation(This); - nsIDOMHTMLDocument_Release(This->nsdoc); - }else if(This->window) { + if(!This->nsdoc && This->window) { /* document fragments own reference to inner window */ IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); This->window = NULL; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 42e7c6a..a89b0ca 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -492,6 +492,8 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->vtbl->unlink) + This->vtbl->unlink(This); This->vtbl->destructor(This); release_dispex(&This->dispex); heap_free(This);

1 0

Huw Davies : crypt32: Add a new element to SIP_ADD_NEWPROVIDER.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: f4f01301f0007442ae5f40650615f2e00a5fbc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f01301f0007442ae5f40650… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 27 13:25:01 2014 +0100 crypt32: Add a new element to SIP_ADD_NEWPROVIDER. --- dlls/crypt32/sip.c | 2 +- dlls/msisip/main.c | 1 + dlls/wintrust/register.c | 1 + include/mssip.h | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 4a32cad..8b561fd 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -210,7 +210,7 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *psNewProv) TRACE("%p\n", psNewProv); if (!psNewProv || - psNewProv->cbStruct != sizeof(SIP_ADD_NEWPROVIDER) || + psNewProv->cbStruct < FIELD_OFFSET(SIP_ADD_NEWPROVIDER, pwszGetCapFuncName) || !psNewProv->pwszGetFuncName || !psNewProv->pwszPutFuncName || !psNewProv->pwszCreateFuncName || diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 0b4d2c3..882db3d 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -81,6 +81,7 @@ HRESULT WINAPI DllRegisterServer(void) prov.pwszVerifyFuncName = verifyIndirectData; prov.pwszRemoveFuncName = removeSignedDataMsg; prov.pwszIsFunctionNameFmt2 = isMyTypeOfFile; + prov.pwszGetCapFuncName = NULL; return CryptSIPAddProvider(&prov) ? S_OK : S_FALSE; } diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index f039fbd..9981fbc 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -911,6 +911,7 @@ static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData; NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg; NewProv.pwszIsFunctionNameFmt2 = NULL; + NewProv.pwszGetCapFuncName = NULL; Ret = CryptSIPAddProvider(&NewProv); diff --git a/include/mssip.h b/include/mssip.h index b0b21a6..c14f02d 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -156,6 +156,9 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszRemoveFuncName; WCHAR *pwszIsFunctionNameFmt2; + + /* NTDDI_VERSION >= NTDDI_WIN8 */ + WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h>

1 0

Nikolay Sivov : propsys: Implement PSGetPropertySystem().
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d897b32598db0864a2188adc12fb3cca66f648ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d897b32598db0864a2188adc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 26 21:03:54 2014 +0400 propsys: Implement PSGetPropertySystem(). --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index a64d53a..92b6d7c 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -84,7 +84,7 @@ @ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName -@ stub PSGetPropertySystem +@ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID @ stdcall PSPropertyKeyFromString(wstr ptr) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ad96aab..4bb9d26 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -139,6 +139,114 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IPropertySystem) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPropertySystem_AddRef(iface); + return S_OK; + } + + FIXME("%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI propsys_AddRef(IPropertySystem *iface) +{ + return 2; +} + +static ULONG WINAPI propsys_Release(IPropertySystem *iface) +{ + return 1; +} + +static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, + REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, + LPCWSTR canonical_name, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(canonical_name), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, + LPCWSTR proplist, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, + PROPDESC_ENUMFILTER filter, REFIID riid, void **ppv) +{ + FIXME("%d %s %p: stub\n", filter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR dest, DWORD destlen) +{ + FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR *text) +{ + FIXME("%p %p %x %p: stub\n", key, propvar, flags, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) +{ + FIXME("refresh: stub\n"); + return E_NOTIMPL; +} + +static const IPropertySystemVtbl propsysvtbl = { + propsys_QueryInterface, + propsys_AddRef, + propsys_Release, + propsys_GetPropertyDescription, + propsys_GetPropertyDescriptionByName, + propsys_GetPropertyDescriptionListFromString, + propsys_EnumeratePropertyDescriptions, + propsys_FormatForDisplay, + propsys_FormatForDisplayAlloc, + propsys_RegisterPropertySchema, + propsys_UnregisterPropertySchema, + propsys_RefreshPropertySchema +}; + +static IPropertySystem propsys = { &propsysvtbl }; + +HRESULT WINAPI PSGetPropertySystem(REFIID riid, void **obj) +{ + return IPropertySystem_QueryInterface(&propsys, riid, obj); +} + HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { FIXME("%s stub\n", debugstr_w(path));

1 0

Michael Stefaniuc : dmcompos/tests: Test some IPersistStream methods of DMChordMap.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: fa51f080a4fc7e0beb63c87accee134578a9050f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa51f080a4fc7e0beb63c87ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:50:52 2014 +0200 dmcompos/tests: Test some IPersistStream methods of DMChordMap. --- dlls/dmcompos/tests/dmcompos.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ecb7745..aaaa4ac 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -230,6 +230,37 @@ static void test_COM_track(void) } } +static void test_chordmap(void) +{ + IDirectMusicChordMap *dmcm; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void**)&dmcm); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMap), + "Expected class CLSID_DirectMusicChordMap got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicChordMap_Release(dmcm)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -244,6 +275,7 @@ START_TEST(dmcompos) test_COM_chordmap(); test_COM_template(); test_COM_track(); + test_chordmap(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmscript: IPersistStream_GetClassID() is not implemented for DMScript.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 444fff43437cb74e911b7d04c34eb1e0fd1848f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444fff43437cb74e911b7d04c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:12:40 2014 +0200 dmscript: IPersistStream_GetClassID() is not implemented for DMScript. --- dlls/dmscript/script.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index a7f26a6..872b7af 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -424,10 +424,9 @@ static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTRE } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - TRACE("(%p, %p)\n", This, pClassID); - *pClassID = CLSID_DirectMusicScript; - return S_OK; + TRACE("(%p, %p) method not implemented\n", iface, pClassID); + + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {

1 0

Nikolay Sivov : propsys: Forward corresponding methods to exports.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 47de869fda08f564d45bb48ea2983458a1965de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47de869fda08f564d45bb48ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 27 15:13:49 2014 +0400 propsys: Forward corresponding methods to exports. --- dlls/propsys/propsys_main.c | 15 +++++---------- include/propsys.idl | 2 ++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 4bb9d26..6713adf 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -166,8 +166,7 @@ static ULONG WINAPI propsys_Release(IPropertySystem *iface) static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, REFPROPERTYKEY propkey, REFIID riid, void **ppv) { - FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescription(propkey, riid, ppv); } static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, @@ -180,8 +179,7 @@ static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *ifac static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, LPCWSTR proplist, REFIID riid, void **ppv) { - FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescriptionListFromString(proplist, riid, ppv); } static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, @@ -209,20 +207,17 @@ static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSRegisterPropertySchema(path); } static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSUnregisterPropertySchema(path); } static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) { - FIXME("refresh: stub\n"); - return E_NOTIMPL; + return PSRefreshPropertySchema(); } static const IPropertySystemVtbl propsysvtbl = { diff --git a/include/propsys.idl b/include/propsys.idl index 0117090..04d3fbf 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -804,6 +804,8 @@ cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") +cpp_quote("HRESULT WINAPI PSRegisterPropertySchema(LPCWSTR);") +cpp_quote("HRESULT WINAPI PSUnregisterPropertySchema(LPCWSTR);") /* TODO: Add remainder of the C api here */

1 0

Piotr Caban : msvcrt: Return string in _wcslwr and _wcslwr_l.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 28830b4b363111b9f04fbf1a336387ff107ca8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28830b4b363111b9f04fbf1a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 27 11:02:42 2014 +0200 msvcrt: Return string in _wcslwr and _wcslwr_l. --- dlls/msvcrt/wcs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 548c907..7c299a7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -273,17 +273,19 @@ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) /****************************************************************** * _wcslwr_l (MSVCRT.@) */ -int CDECL MSVCRT__wcslwr_l( MSVCRT_wchar_t* str, MSVCRT__locale_t locale ) +MSVCRT_wchar_t* CDECL MSVCRT__wcslwr_l( MSVCRT_wchar_t* str, MSVCRT__locale_t locale ) { - return MSVCRT__wcslwr_s_l(str, -1, locale); + MSVCRT__wcslwr_s_l(str, -1, locale); + return str; } /****************************************************************** * _wcslwr (MSVCRT.@) */ -int CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) +MSVCRT_wchar_t* CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) { - return MSVCRT__wcslwr_s_l(str, -1, NULL); + MSVCRT__wcslwr_s_l(str, -1, NULL); + return str; } /*********************************************************************

1 0

Michael Stefaniuc : dmband/tests: Test some IPersistStream methods of DMBand.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 32699d6f6664cf9532f2961729aedb033239cee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32699d6f6664cf9532f296172… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:43:14 2014 +0200 dmband/tests: Test some IPersistStream methods of DMBand. --- dlls/dmband/tests/dmband.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 60dbaca..cfbf34d 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -146,6 +146,33 @@ static void test_COM_bandtrack(void) while (IDirectMusicTrack_Release(dmbt)); } +static void test_dmband(void) +{ + IDirectMusicBand *dmb; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicBand, (void**)&dmb); + ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicBand_Release(dmb)); +} + START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -159,6 +186,7 @@ START_TEST(dmband) test_COM(); test_COM_bandtrack(); + test_dmband(); CoUninitialize(); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 8c944b0da4919b55e2a1ba5fccfa472076ab2d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c944b0da4919b55e2a1ba5fc… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon May 26 01:36:03 2014 +0200 po: Update German translation. --- po/de.po | 145 ++++++++++++++++++++++---------------------------------------- 1 file changed, 52 insertions(+), 93 deletions(-) diff --git a/po/de.po b/po/de.po index 6291a37..e68ed94 100644 --- a/po/de.po +++ b/po/de.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: 2014-04-17 03:01+0200\n" +"PO-Revision-Date: 2014-05-26 01:33+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -7129,206 +7129,164 @@ msgid "outline button" msgstr "Gliederung Schaltfläche" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Mittel" +msgstr "normal" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Nicht verfügbar" +msgstr "nicht verfügbar" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Auswählen" +msgstr "ausgewählt" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Angehalten" +msgstr "fokussiert" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "&Komprimiert" +msgstr "geklickt" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "angekreuzt" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Mixed" +msgstr "gemischt" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Schreibgeschützt" +msgstr "schreibgeschützt" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Heiß verfolgtes Element" +msgstr "aktiv hervorgehoben" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Standards" +msgstr "standard" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "ausgeklappt" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "eingeklappt" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "beschäftigt" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "schwebend" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "Lauftext" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "Animation" +msgstr "animiert" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "unsichtbar" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "nicht im Bild" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&aktiv" +msgstr "größenänderbar" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&aktiv" +msgstr "verschiebbar" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "selbst sprechend" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Angehalten" +msgstr "fokussierbar" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "Tabelle" +msgstr "auswählbar" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "Link" +msgstr "verknüpft" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "durchlaufen" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "Tabelle" +msgstr "mehrfach auswählbar" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Bitte wählen Sie eine Datei." +msgstr "erweitert auswählbar" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "Warnung" +msgstr "niedrige Priorität" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "Warnung" +msgstr "mittlere Priorität" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "Warnung" +msgstr "hohe Priorität" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Schreibgeschützt.\n" +msgstr "geschützt" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "hat Popup" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -13514,7 +13472,7 @@ msgstr "Alternativer Steuerelementhintergrund" #: winecfg.rc:120 msgid "Hot Tracked Item" -msgstr "Heiß verfolgtes Element" +msgstr "Aktiv hervorgehobenes Element" #: winecfg.rc:121 msgid "Active Title Bar Gradient" @@ -13534,7 +13492,7 @@ msgstr "Menüleiste" #: wineconsole.rc:63 msgid "Cursor size" -msgstr "Cursor Größe" +msgstr "Cursorgröße" #: wineconsole.rc:64 msgid "&Small" @@ -13574,23 +13532,23 @@ msgstr "&aktiv" #: wineconsole.rc:75 msgid "Command history" -msgstr "Befehlsspeicher" +msgstr "Befehlsverlauf" #: wineconsole.rc:76 msgid "&Number of recalled commands:" -msgstr "&Anzahl der Puffer:" +msgstr "Anzahl der gespeicherten &Befehle:" #: wineconsole.rc:79 msgid "&Remove doubles" -msgstr "Alte &Duplikate löschen" +msgstr "&Duplikate entfernen" #: wineconsole.rc:87 msgid "&Font" -msgstr "Schrift&art" +msgstr "&Schriftart" #: wineconsole.rc:89 msgid "&Color" -msgstr "F&arbe" +msgstr "&Farbe" #: wineconsole.rc:100 msgid "Configuration" @@ -13598,7 +13556,7 @@ msgstr "Konfiguration" #: wineconsole.rc:103 msgid "Buffer zone" -msgstr "Fensterpuffergröße" +msgstr "Zeichenpuffer" #: wineconsole.rc:104 msgid "&Width:" @@ -13638,15 +13596,15 @@ msgstr "Konsolenparameter" #: wineconsole.rc:131 msgid "Retain these settings for later sessions" -msgstr "Übernehme diese Einstellungen für spätere Sitzungen" +msgstr "Einstellungen für spätere Sitzungen übernehmen" #: wineconsole.rc:132 msgid "Modify only current session" -msgstr "Verändere nur die aktuelle Sitzung" +msgstr "Nur für aktuelle Sitzung ändern" #: wineconsole.rc:29 msgid "Set &Defaults" -msgstr "Stan&dard" +msgstr "&Standards festlegen" #: wineconsole.rc:31 msgid "&Mark" @@ -13678,11 +13636,12 @@ msgstr "Konfigurationsfehler" #: wineconsole.rc:42 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "Die Bildschirmgröße muss größer oder gleich der des Fensters sein" +msgstr "" +"Die Größe des Zeichenpuffers muss mindestens der Fenstergröße entsprechen" #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" -msgstr "Jeder Buchstabe ist %1!u! Pixel breit und %2!u! Pixel hoch" +msgstr "Jedes Zeichen ist %1!u! Pixel breit und %2!u! Pixel hoch" #: wineconsole.rc:38 msgid "This is a test" @@ -13698,7 +13657,7 @@ msgstr "wineconsole: Ungültiges Backend\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: Nicht erkannte Befehlszeilenoption\n" +msgstr "wineconsole: Unbekannte Befehlszeilenoption\n" #: wineconsole.rc:47 msgid "Starts a program in a Wine console\n" @@ -13758,7 +13717,7 @@ msgstr "" #: winedbg.rc:49 msgid "Program Error" -msgstr "Programm Fehler" +msgstr "Programmfehler" #: winedbg.rc:54 msgid "" @@ -13776,7 +13735,7 @@ msgid "" msgstr "" "Die Ursache kann ein Problem im Programm oder ein Fehler in Wine sein. Sie " "können in der <a href=\"http://appdb.winehq.org\">Anwendungsdatenbank</a> " -"Tipps zum ausführen der Anwendung einholen." +"Tipps zum Ausführen der Anwendung einholen." #: winedbg.rc:61 msgid "Show &Details" @@ -13784,7 +13743,7 @@ msgstr "&Details anzeigen" #: winedbg.rc:66 msgid "Program Error Details" -msgstr "Programm Fehler Details" +msgstr "Programmfehler-Details" #: winedbg.rc:73 msgid "" @@ -13800,7 +13759,7 @@ msgstr "" #: winedbg.rc:38 msgid "Wine program crash" -msgstr "Wine Programm Absturz" +msgstr "Wine Programmabsturz" #: winedbg.rc:39 msgid "Internal errors - invalid parameters received"

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in is_elem_name.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d0898685a686befe0fdcd8d0310f1a9b74906887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0898685a686befe0fdcd8d03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:28 2014 +0200 mshtml: Use get_elem_attr_value helper in is_elem_name. --- dlls/mshtml/htmlelemcol.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index cb7bad1..8fd61ed 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -368,7 +368,7 @@ static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name) static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) { const PRUnichar *str; - nsAString nsstr, nsname; + nsAString nsstr; BOOL ret = FALSE; nsresult nsres; @@ -385,15 +385,12 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return TRUE; } - nsAString_InitDepend(&nsname, nameW); - nsres = nsIDOMHTMLElement_GetAttribute(elem->nselem, &nsname, &nsstr); - nsAString_Finish(&nsname); + nsres = get_elem_attr_value(elem->nselem, nameW, &nsstr, &str); if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&nsstr, &str); ret = !strcmpiW(str, name); + nsAString_Finish(&nsstr); } - nsAString_Finish(&nsstr); return ret; }

1 0

Andrei Slăvoiu : wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don' t support EXT_GPU_SHADER4.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: fbdf618251c7d9c3f01f53bc53266d081089361c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf618251c7d9c3f01f53bc5… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Fri May 23 01:23:30 2014 +0300 wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4. --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 224992d..d6bb3836 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1667,7 +1667,8 @@ static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) level = 9; - if (level == 9 && gl_info->supported[EXT_GPU_SHADER4]) + if (level == 9 && (gl_info->supported[EXT_GPU_SHADER4] + || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))) level = 10; return level;

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in get_font_size.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3efaaacf3c5add5e99c689d40ddeea574c6dfd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3efaaacf3c5add5e99c689d40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:11 2014 +0200 mshtml: Use get_elem_attr_value helper in get_font_size. --- dlls/mshtml/editor.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index cfab2ed..14aab53 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -263,7 +263,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); - nsIDOMElement *elem = NULL; + nsIDOMHTMLElement *elem = NULL; nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; @@ -284,36 +284,29 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) break; if(node_type == ELEMENT_NODE) { - nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); + nsIDOMNode_QueryInterface(node, &IID_nsIDOMHTMLElement, (void**)&elem); nsAString_Init(&tag_str, NULL); - nsIDOMElement_GetTagName(elem, &tag_str); + nsIDOMHTMLElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); if(!strcmpiW(tag, fontW)) { - nsAString size_str, val_str; - LPCWSTR val; + nsAString val_str; + const PRUnichar *val; TRACE("found font tag %p\n", elem); - nsAString_InitDepend(&size_str, sizeW); - nsAString_Init(&val_str, NULL); - - nsIDOMElement_GetAttribute(elem, &size_str, &val_str); - nsAString_GetData(&val_str, &val); - + get_elem_attr_value(elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); } - nsAString_Finish(&size_str); nsAString_Finish(&val_str); } nsAString_Finish(&tag_str); - - nsIDOMElement_Release(elem); + nsIDOMHTMLElement_Release(elem); } if(*ret)

1 0

Michael Stefaniuc : dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty().
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 5d7e93dc54d0b5ad86ad57ad7e8537ad0278d162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e93dc54d0b5ad86ad57ad7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:06:00 2014 +0200 dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty(). --- dlls/dmusic/collection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index acbc2a5..3d09815 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -499,7 +499,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPER static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) { - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream)

1 0

Michael Stefaniuc : dmstyle/tests: Test some IPersistStream methods of DMStyle.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 834bae99359bf122a9d0fa4ac4b034699723162e URL: http://source.winehq.org/git/wine.git/?a=commit;h=834bae99359bf122a9d0fa4ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:10:43 2014 +0200 dmstyle/tests: Test some IPersistStream methods of DMStyle. --- dlls/dmstyle/tests/dmstyle.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 58c15eb..be9de42 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -208,6 +208,37 @@ static void test_COM_track(void) } } +static void test_dmstyle(void) +{ + IDirectMusicStyle *dms; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle, (void**)&dms); + ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicStyle_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicStyle), + "Expected class CLSID_DirectMusicStyle got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods*/ + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicStyle_Release(dms)); +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -221,6 +252,7 @@ START_TEST(dmstyle) test_COM(); test_COM_section(); test_COM_track(); + test_dmstyle(); CoUninitialize(); }

1 0

Huw Davies : crypt32/tests: Fix test failure on win 8.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 54129a5171c7bd9f7f4a29bb6aec71b7d6ba54a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54129a5171c7bd9f7f4a29bb6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 27 13:25:02 2014 +0100 crypt32/tests: Fix test failure on win 8. --- dlls/crypt32/tests/sip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 212c24b..0677903 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -119,6 +119,9 @@ static void test_AddRemoveProvider(void) newprov.pwszRemoveFuncName = dummyfunction; newprov.pwszIsFunctionNameFmt2 = dummyfunction; newprov.pwszIsFunctionName = dummyfunction; + /* If GetCapFuncName set to NULL, then CryptSIPRemoveProvider fails on win 8 */ + newprov.pwszGetCapFuncName = dummyfunction; + SetLastError(0xdeadbeef); ret = CryptSIPAddProvider(&newprov); ok ( ret, "CryptSIPAddProvider should have succeeded, last error %d\n", GetLastError());

1 0

Austin English : include: Add missing EntryInProgress member to _PEB_LDR_DATA struct.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: e63f0bf4b8656c73a26870005cd8694e50c4834a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e63f0bf4b8656c73a26870005… Author: Austin English <austinenglish(a)gmail.com> Date: Mon May 26 23:34:59 2014 -0700 include: Add missing EntryInProgress member to _PEB_LDR_DATA struct. --- include/winternl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winternl.h b/include/winternl.h index 886c2ea..d7f2f50 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -191,6 +191,7 @@ typedef struct _PEB_LDR_DATA LIST_ENTRY InLoadOrderModuleList; LIST_ENTRY InMemoryOrderModuleList; LIST_ENTRY InInitializationOrderModuleList; + PVOID EntryInProgress; } PEB_LDR_DATA, *PPEB_LDR_DATA; typedef struct _GDI_TEB_BATCH

1 0

Michael Stefaniuc : dmusic/tests: Test unimplemented IPersistStream methods in DMCollection.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3115e4901709c6ff9a49fb4bb591c31532e0a1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3115e4901709c6ff9a49fb4bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:08:34 2014 +0200 dmusic/tests: Test unimplemented IPersistStream methods in DMCollection. --- dlls/dmusic/tests/dmusic.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 528d182..b28a187 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -314,7 +314,10 @@ static void test_dmcoll(void) { IDirectMusicCollection *dmc; IDirectMusicObject *dmo; + IPersistStream *ps; DMUS_OBJECTDESC desc; + CLSID class; + ULARGE_INTEGER size; HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicCollection, NULL, CLSCTX_INPROC_SERVER, @@ -347,6 +350,18 @@ static void test_dmcoll(void) ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicCollection), "guidClass changed, should be CLSID_DirectMusicCollection\n"); + /* Unimplemented IPersistStream methods*/ + hr = IDirectMusicCollection_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + while (IDirectMusicCollection_Release(dmc)); }

1 0