August 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_blt_fbo().
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: 2437c77ebd5df99b8c408ff782d364ed4d60a26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2437c77ebd5df99b8c408ff78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 15:25:27 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8ae4b73..68a6f7d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -502,6 +502,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect_in) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; @@ -545,9 +546,9 @@ static void surface_blt_fbo(const struct wined3d_device *device, * surface isn't required if the entire surface is overwritten. (And is * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ - surface_load_location(src_surface, old_ctx, src_location); + wined3d_texture_load_location(src_texture, src_sub_resource_idx, old_ctx, src_location); if (!surface_is_full_rect(dst_surface, &dst_rect)) - surface_load_location(dst_surface, old_ctx, dst_location); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location);

1 0

Iván Matellanes : msvcirt: Implement istream:: operator>> for integers.
by Alexandre Julliard Aug. 3, 2016

Aug. 3, 2016

Module: wine Branch: master Commit: d8bb77d84223d57fcf0d6f23a3d11a01c2c42206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8bb77d84223d57fcf0d6f23a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 3 10:34:26 2016 +0100 msvcirt: Implement istream::operator>> for integers. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 78 ++++++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 128 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8bb77d84223d57fcf0d6…

1 0

Nikolay Sivov : comctl32/tests: Test that callback mask is stored as is, check more message results.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: 9ef65cf3d6af2e488d7efcb94fe61aa7e8540351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef65cf3d6af2e488d7efcb94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 21:03:47 2016 +0300 comctl32/tests: Test that callback mask is stored as is, check more message results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 73 +++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 97f611f..811800c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1179,7 +1179,8 @@ static void test_items(void) r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_SELECTED, "Expected LVIS_SELECTED\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* LVIS_SELECTED with zero stateMask */ /* set */ @@ -1201,7 +1202,8 @@ static void test_items(void) r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_FOCUSED, "Expected LVIS_FOCUSED\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* LVIS_CUT with LVIS_FOCUSED stateMask */ /* set */ @@ -1223,7 +1225,8 @@ static void test_items(void) r = SendMessageA(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); expect(1, r); ok(item.state & LVIS_CUT, "Expected LVIS_CUT\n"); - SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + r = SendMessageA(hwnd, LVM_DELETEITEM, 0, 0); + ok(r, "got %d\n", r); /* Insert an item with just a param */ memset (&item, 0xcc, sizeof (item)); @@ -2294,15 +2297,18 @@ static void test_multiselect(void) /* deselect all items */ item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); /* set initial position */ - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, (task.initPos == -1 ? item_count -1 : task.initPos)); + ok(r, "got %d\n", r); item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, task.initPos == -1 ? item_count-1 : task.initPos, (LPARAM)&item); + ok(r, "got %d\n", r); selected_count = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); ok(selected_count == 1, "expected 1, got %d\n", selected_count); @@ -2347,7 +2353,8 @@ static void test_multiselect(void) /* select all, check notifications */ item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2381,7 +2388,8 @@ static void test_multiselect(void) item.state = 0; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + ok(r, "got %d\n", r); ok_sequence(sequences, PARENT_SEQ_INDEX, change_all_parent_seq, "deselect all notification", FALSE); @@ -2410,11 +2418,13 @@ static void test_multiselect(void) ok_sequence(sequences, PARENT_SEQ_INDEX, changing_all_parent_seq, "set state all notification 3", FALSE); - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r, "got %d\n", r); for (i = 0; i < 3; i++) { item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, i, (LPARAM)&item); + ok(r, "got %d\n", r); } r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); @@ -2435,13 +2445,14 @@ static void test_multiselect(void) } r = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(3, r); - SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); - expect(3, r); + r = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(r == -1, "got %d\n", r); /* select one more */ item.state = LVIS_SELECTED; item.stateMask = LVIS_SELECTED; - SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_SETITEMSTATE, 3, (LPARAM)&item); + ok(r, "got %d\n", r); for (i=0;i<3;i++) { r = SendMessageA(hwnd, LVM_GETITEMSTATE, i, LVIS_SELECTED); @@ -2461,7 +2472,8 @@ static void test_multiselect(void) item.stateMask = LVIS_SELECTED; r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); expect(TRUE, r); - SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + r = SendMessageA(hwnd, LVM_SETSELECTIONMARK, 0, -1); + ok(r == -1, "got %d\n", r); item.stateMask = LVIS_SELECTED; item.state = LVIS_SELECTED; @@ -2681,7 +2693,8 @@ static void test_subitem_rect(void) expect(100, rect.left); expect(250, rect.right); - SendMessageA(hwnd, LVM_SCROLL, 10, 0); + r = SendMessageA(hwnd, LVM_SCROLL, 10, 0); + ok(r, "got %d\n", r); SetRect(&rect, LVIR_BOUNDS, 1, 0, 0); r = SendMessageA(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); @@ -3798,7 +3811,8 @@ static void test_getviewrect(void) memset(&item, 0, sizeof(item)); item.iItem = 0; item.iSubItem = 0; - SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(!r, "got %d\n", r); r = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); expect(TRUE, r); @@ -3860,7 +3874,8 @@ static void test_getitemposition(void) ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq2, "get item position 2", TRUE); SetRectEmpty(&rect); - SendMessageA(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + r = SendMessageA(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + ok(r, "got %d\n", r); /* some padding? */ expect(2, pt.x); /* offset by header height */ @@ -4859,7 +4874,8 @@ static void test_getcolumnwidth(void) /* default column width with item added */ hwnd = create_listview_control(LVS_LIST); memset(&itema, 0, sizeof(itema)); - SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&itema); + ok(!ret, "got %d\n", ret); ret = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); height = get_current_font_height(hwnd); ok((ret / height) >= 6, "got width %d, height %d\n", ret, height); @@ -5798,6 +5814,26 @@ static void test_oneclickactivate(void) DestroyWindow(hwnd); } +static void test_callback_mask(void) +{ + DWORD mask; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, ~0u, 0); + ok(ret, "got %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, ~0u, 1); + ok(ret, "got %d\n", ret); + + mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); + ok(mask == ~0u, "got 0x%08x\n", mask); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -5868,6 +5904,7 @@ START_TEST(listview) test_insertitem(); test_header_proc(); test_oneclickactivate(); + test_callback_mask(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Michael Stefaniuc : uxtheme: Use straight assignments instead of CopyRect( ).
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: 74a03b1adc0fe080225b6b491c1d18f62f61f566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a03b1adc0fe080225b6b491… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 2 19:11:09 2016 +0200 uxtheme: Use straight assignments instead of CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 730a26c..753ac36 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -98,9 +98,9 @@ HRESULT WINAPI DrawThemeParentBackground(HWND hwnd, HDC hdc, RECT *prc) if(!hParent) hParent = hwnd; if(prc) { - CopyRect(&rt, prc); + rt = *prc; MapWindowPoints(hwnd, hParent, (LPPOINT)&rt, 2); - + clip = CreateRectRgn(0,0,1,1); hasClip = GetClipRgn(hdc, clip); if(hasClip == -1) @@ -142,7 +142,7 @@ HRESULT WINAPI DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, opts.dwFlags = 0; if(pClipRect) { opts.dwFlags |= DTBG_CLIPRECT; - CopyRect(&opts.rcClip, pClipRect); + opts.rcClip = *pClipRect; } return DrawThemeBackgroundEx(hTheme, hdc, iPartId, iStateId, pRect, &opts); } @@ -578,7 +578,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, int sizingtype = ST_STRETCH; BOOL uniformsizing = FALSE; - CopyRect(&rcDst, prc); + rcDst = *prc; dstSize.x = rcDst.right-rcDst.left; dstSize.y = rcDst.bottom-rcDst.top; @@ -2021,8 +2021,8 @@ HRESULT WINAPI GetThemeTextExtent(HTHEME hTheme, HDC hdc, int iPartId, return E_HANDLE; if(pBoundingRect) - CopyRect(&rt, pBoundingRect); - + rt = *pBoundingRect; + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); if(SUCCEEDED(hr)) { hFont = CreateFontIndirectW(&logfont);

1 0

Michael Stefaniuc : user32: Use straight assignments instead of CopyRect() .
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: 07f9f71278c880713f2692966c3a6483a8765beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f9f71278c880713f2692966… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 2 19:09:01 2016 +0200 user32: Use straight assignments instead of CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 2 +- dlls/user32/edit.c | 2 +- dlls/user32/sysparams.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index c744ee5..a2e8b3c 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -777,7 +777,7 @@ static void CBPaintBorder( } else { - CopyRect(&clientRect, &lphc->textRect); + clientRect = lphc->textRect; InflateRect(&clientRect, EDIT_CONTROL_PADDING(), EDIT_CONTROL_PADDING()); InflateRect(&clientRect, COMBO_XBORDERSIZE(), COMBO_YBORDERSIZE()); diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 23139e9..46fda41 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4665,7 +4665,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case EM_GETRECT: if (lParam) - CopyRect((LPRECT)lParam, &es->format_rect); + *((LPRECT)lParam) = es->format_rect; break; case EM_SETRECT: diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index a42a302..63c4ffe 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1683,7 +1683,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, if (!pvParam) return FALSE; spi_idx = SPI_SETWORKAREA_IDX; - CopyRect( &work_area, pvParam ); + work_area = *(RECT*)pvParam; spi_loaded[spi_idx] = TRUE; ret = TRUE; break; @@ -1702,7 +1702,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } - CopyRect( pvParam, &work_area ); + *(RECT*)pvParam = work_area; ret = TRUE; TRACE("work area %s\n", wine_dbgstr_rect( &work_area )); break;

1 0

Jacek Caban : jscript: Store exception code in exprval_t.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: 7af8330e932e9e04bad194b1af0f99cd8ef03046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af8330e932e9e04bad194b1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 17:40:42 2016 +0200 jscript: Store exception code in exprval_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2c44112..ba408b8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -58,6 +58,7 @@ typedef struct { IDispatch *disp; DISPID id; } idref; + HRESULT hres; } u; } exprval_t; @@ -221,6 +222,12 @@ static void exprval_release(exprval_t *val) } } +static inline void exprval_set_exception(exprval_t *val, HRESULT hres) +{ + val->type = EXPRVAL_INVALID; + val->u.hres = hres; +} + /* ECMA-262 3rd Edition 8.7.1 */ static HRESULT exprval_to_value(script_ctx_t *ctx, exprval_t *val, jsval_t *ret) { @@ -537,7 +544,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(lookup_global_members(ctx, identifier, ret)) return S_OK; - ret->type = EXPRVAL_INVALID; + exprval_set_exception(ret, JS_E_UNDEFINED_VARIABLE); return S_OK; } @@ -1060,7 +1067,7 @@ static HRESULT interp_ident(script_ctx_t *ctx) return hres; if(exprval.type == EXPRVAL_INVALID) - return throw_type_error(ctx, JS_E_UNDEFINED_VARIABLE, arg); + return throw_type_error(ctx, exprval.u.hres, arg); hres = exprval_to_value(ctx, &exprval, &v); exprval_release(&exprval);

1 0

Anton Baskanov : amstream: Implement AMAudioData::GetFormat.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: fa542355e97b943f6d58faf68e78c9b1c46df3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa542355e97b943f6d58faf68… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:55 2016 +0600 amstream: Implement AMAudioData::GetFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 21 +++++++++++++++++++-- dlls/amstream/tests/amstream.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 78a4fc7..1c729fc 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -34,6 +34,7 @@ typedef struct { BYTE *data; BOOL data_owned; DWORD actual_data; + WAVEFORMATEX wave_format; } AMAudioDataImpl; static inline AMAudioDataImpl *impl_from_IAudioData(IAudioData *iface) @@ -168,9 +169,18 @@ static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_val /*** IAudioData methods ***/ static HRESULT WINAPI IAudioDataImpl_GetFormat(IAudioData* iface, WAVEFORMATEX *wave_format_current) { - FIXME("(%p)->(%p): stub\n", iface, wave_format_current); + AMAudioDataImpl *This = impl_from_IAudioData(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, wave_format_current); + + if (!wave_format_current) + { + return E_POINTER; + } + + *wave_format_current = This->wave_format; + + return S_OK; } static HRESULT WINAPI IAudioDataImpl_SetFormat(IAudioData* iface, const WAVEFORMATEX *wave_format) @@ -211,6 +221,13 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; object->ref = 1; + object->wave_format.wFormatTag = WAVE_FORMAT_PCM; + object->wave_format.nChannels = 1; + object->wave_format.nSamplesPerSec = 11025; + object->wave_format.wBitsPerSample = 16; + object->wave_format.nBlockAlign = object->wave_format.wBitsPerSample * object->wave_format.nChannels / 8; + object->wave_format.nAvgBytesPerSec = object->wave_format.nBlockAlign * object->wave_format.nSamplesPerSec; + *ppObj = &object->IAudioData_iface; return S_OK; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 893894c..513d98a 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -745,6 +745,48 @@ out_unknown: IUnknown_Release(unknown); } +static void test_audiodata_get_format(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_data = NULL; + WAVEFORMATEX wave_format = {0}; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + if (FAILED(result)) + { + /* test_audiodata_query_interface handles this case */ + skip("No IAudioData\n"); + goto out_unknown; + } + + result = IAudioData_GetFormat(audio_data, NULL); + ok(E_POINTER == result, "got 0x%08x\n", result); + + wave_format.wFormatTag = 0xdead; + wave_format.nChannels = 0xdead; + wave_format.nSamplesPerSec = 0xdeadbeef; + wave_format.nAvgBytesPerSec = 0xdeadbeef; + wave_format.nBlockAlign = 0xdead; + wave_format.wBitsPerSample = 0xdead; + wave_format.cbSize = 0xdead; + result = IAudioData_GetFormat(audio_data, &wave_format); + ok(S_OK == result, "got 0x%08x\n", result); + ok(WAVE_FORMAT_PCM == wave_format.wFormatTag, "got %u\n", wave_format.wFormatTag); + ok(1 == wave_format.nChannels, "got %u\n", wave_format.nChannels); + ok(11025 == wave_format.nSamplesPerSec, "got %u\n", wave_format.nSamplesPerSec); + ok(22050 == wave_format.nAvgBytesPerSec, "got %u\n", wave_format.nAvgBytesPerSec); + ok(2 == wave_format.nBlockAlign, "got %u\n", wave_format.nBlockAlign); + ok(16 == wave_format.wBitsPerSample, "got %u\n", wave_format.wBitsPerSample); + ok(0 == wave_format.cbSize, "got %u\n", wave_format.cbSize); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -767,6 +809,7 @@ START_TEST(amstream) test_audiodata_get_info(); test_audiodata_set_buffer(); test_audiodata_set_actual(); + test_audiodata_get_format(); CoUninitialize(); }

1 0

Jacek Caban : jscript: Allow accessing arguments values directly from stack.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: da02140b43e8cf12246b5879bfbbf696fcccdb86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da02140b43e8cf12246b5879b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 17:41:40 2016 +0200 jscript: Allow accessing arguments values directly from stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 132 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 107 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 99eacb1..11b5618 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -50,6 +50,7 @@ typedef struct { enum { EXPRVAL_JSVAL, EXPRVAL_IDREF, + EXPRVAL_STACK_REF, EXPRVAL_INVALID } type; union { @@ -58,6 +59,7 @@ typedef struct { IDispatch *disp; DISPID id; } idref; + unsigned off; HRESULT hres; } u; } exprval_t; @@ -103,10 +105,15 @@ static inline jsval_t stack_top(script_ctx_t *ctx) return ctx->stack[ctx->stack_top-1]; } -static inline jsval_t stack_topn(script_ctx_t *ctx, unsigned n) +static inline jsval_t *stack_top_ref(script_ctx_t *ctx, unsigned n) { assert(ctx->stack_top > ctx->call_ctx->stack_base+n); - return ctx->stack[ctx->stack_top-1-n]; + return ctx->stack+ctx->stack_top-1-n; +} + +static inline jsval_t stack_topn(script_ctx_t *ctx, unsigned n) +{ + return *stack_top_ref(ctx, n); } static inline jsval_t *stack_args(script_ctx_t *ctx, unsigned n) @@ -183,6 +190,11 @@ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) else IDispatch_Release(val->u.idref.disp); return hres; + case EXPRVAL_STACK_REF: + hres = stack_push(ctx, jsval_number(val->u.off)); + if(SUCCEEDED(hres)) + hres = stack_push(ctx, jsval_undefined()); + return hres; case EXPRVAL_INVALID: hres = stack_push(ctx, jsval_undefined()); if(SUCCEEDED(hres)) @@ -194,19 +206,50 @@ static HRESULT stack_push_exprval(script_ctx_t *ctx, exprval_t *val) return E_FAIL; } -static BOOL exprval_from_stack(jsval_t v1, jsval_t v2, exprval_t *r) +static BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) { - switch(jsval_type(v1)) { + jsval_t v = stack_topn(ctx, n+1); + + switch(jsval_type(v)) { + case JSV_NUMBER: { + call_frame_t *frame = ctx->call_ctx; + unsigned off = get_number(v); + + if(!frame->base_scope->frame && off >= frame->arguments_off) { + DISPID id; + HRESULT hres; + + /* Got stack reference in deoptimized code. Need to convert it back to variable object reference. */ + + hres = jsdisp_get_id(ctx->call_ctx->base_scope->jsobj, frame->function->params[off - frame->arguments_off], 0, &id); + if(FAILED(hres)) { + r->type = EXPRVAL_INVALID; + r->u.hres = hres; + return FALSE; + } + + *stack_top_ref(ctx, n+1) = jsval_obj(jsdisp_addref(frame->base_scope->jsobj)); + *stack_top_ref(ctx, n) = jsval_number(id); + r->type = EXPRVAL_IDREF; + r->u.idref.disp = frame->base_scope->obj; + r->u.idref.id = id; + return TRUE; + } + + r->type = EXPRVAL_STACK_REF; + r->u.off = off; + return TRUE; + } case JSV_OBJECT: r->type = EXPRVAL_IDREF; - r->u.idref.disp = get_object(v1); - assert(is_number(v2)); - r->u.idref.id = get_number(v2); + r->u.idref.disp = get_object(v); + assert(is_number(stack_topn(ctx, n))); + r->u.idref.id = get_number(stack_topn(ctx, n)); return TRUE; case JSV_UNDEFINED: r->type = EXPRVAL_INVALID; - assert(is_number(v2)); - r->u.hres = get_number(v2); + assert(is_number(stack_topn(ctx, n))); + r->u.hres = get_number(stack_topn(ctx, n)); return FALSE; default: assert(0); @@ -216,31 +259,59 @@ static BOOL exprval_from_stack(jsval_t v1, jsval_t v2, exprval_t *r) static inline BOOL stack_pop_exprval(script_ctx_t *ctx, exprval_t *r) { - jsval_t v = stack_pop(ctx); - return exprval_from_stack(stack_pop(ctx), v, r); -} - -static inline BOOL stack_topn_exprval(script_ctx_t *ctx, unsigned n, exprval_t *r) -{ - return exprval_from_stack(stack_topn(ctx, n+1), stack_topn(ctx, n), r); + BOOL ret = stack_topn_exprval(ctx, 0, r); + ctx->stack_top -= 2; + return ret; } static HRESULT exprval_propput(script_ctx_t *ctx, exprval_t *ref, jsval_t v) { - assert(ref->type == EXPRVAL_IDREF); - return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v); + switch(ref->type) { + case EXPRVAL_STACK_REF: { + jsval_t *r = ctx->stack + ref->u.off; + jsval_release(*r); + return jsval_copy(v, r); + } + case EXPRVAL_IDREF: + return disp_propput(ctx, ref->u.idref.disp, ref->u.idref.id, v); + default: + assert(0); + return E_FAIL; + } } static HRESULT exprval_propget(script_ctx_t *ctx, exprval_t *ref, jsval_t *r) { - assert(ref->type == EXPRVAL_IDREF); - return disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, r); + switch(ref->type) { + case EXPRVAL_STACK_REF: + return jsval_copy(ctx->stack[ref->u.off], r); + case EXPRVAL_IDREF: + return disp_propget(ctx, ref->u.idref.disp, ref->u.idref.id, r); + default: + assert(0); + return E_FAIL; + } } static HRESULT exprval_call(script_ctx_t *ctx, exprval_t *ref, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - assert(ref->type == EXPRVAL_IDREF); - return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); + switch(ref->type) { + case EXPRVAL_STACK_REF: { + jsval_t v = ctx->stack[ref->u.off]; + + if(!is_object_instance(v)) { + FIXME("invoke %s\n", debugstr_jsval(v)); + return E_FAIL; + } + + return disp_call_value(ctx, get_object(v), NULL, flags, argc, argv, r); + } + case EXPRVAL_IDREF: + return disp_call(ctx, ref->u.idref.disp, ref->u.idref.id, flags, argc, argv, r); + default: + assert(0); + return E_FAIL; + } } /* ECMA-262 3rd Edition 8.7.1 */ @@ -271,6 +342,7 @@ static void exprval_release(exprval_t *val) if(val->u.idref.disp) IDispatch_Release(val->u.idref.disp); return; + case EXPRVAL_STACK_REF: case EXPRVAL_INVALID: return; } @@ -530,9 +602,16 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re if(ctx->call_ctx) { for(scope = ctx->call_ctx->scope; scope; scope = scope->next) { if(scope->frame) { - hres = detach_variable_object(ctx, scope->frame); - if(FAILED(hres)) - return hres; + function_code_t *func = scope->frame->function; + int i; + + for(i = 0; i < func->param_cnt; i++) { + if(!strcmpW(identifier, func->params[i])) { + ret->type = EXPRVAL_STACK_REF; + ret->u.off = scope->frame->arguments_off+i; + return S_OK; + } + } } if(scope->jsobj) hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); @@ -1677,6 +1756,9 @@ static HRESULT interp_delete_ident(script_ctx_t *ctx) return hres; switch(exprval.type) { + case EXPRVAL_STACK_REF: + ret = FALSE; + break; case EXPRVAL_IDREF: hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); IDispatch_Release(exprval.u.idref.disp);

1 0

Jacek Caban : jscript: Use exprval_t to represent property references passed on JS stack.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: abba963006a7f6ac8f70887b2d97431eb128925c URL: http://source.winehq.org/git/wine.git/?a=commit;h=abba963006a7f6ac8f70887b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 2 17:40:54 2016 +0200 jscript: Use exprval_t to represent property references passed on JS stack. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 1 + dlls/jscript/engine.c | 261 +++++++++++++++++++++++++++----------------------- 2 files changed, 144 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abba963006a7f6ac8f708…

1 0

Anton Baskanov : amstream: Implement AMAudioData::SetFormat.
by Alexandre Julliard Aug. 2, 2016

Aug. 2, 2016

Module: wine Branch: master Commit: d283051b6b9a30cee7f726780faa1b2cd8fec83a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d283051b6b9a30cee7f726780… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Jul 28 21:59:56 2016 +0600 amstream: Implement AMAudioData::SetFormat. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 18 +++++++++-- dlls/amstream/tests/amstream.c | 69 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 1c729fc..06ed932 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -185,9 +185,23 @@ static HRESULT WINAPI IAudioDataImpl_GetFormat(IAudioData* iface, WAVEFORMATEX * static HRESULT WINAPI IAudioDataImpl_SetFormat(IAudioData* iface, const WAVEFORMATEX *wave_format) { - FIXME("(%p)->(%p): stub\n", iface, wave_format); + AMAudioDataImpl *This = impl_from_IAudioData(iface); + + TRACE("(%p)->(%p)\n", iface, wave_format); + + if (!wave_format) + { + return E_POINTER; + } - return E_NOTIMPL; + if (WAVE_FORMAT_PCM != wave_format->wFormatTag) + { + return E_INVALIDARG; + } + + This->wave_format = *wave_format; + + return S_OK; } static const struct IAudioDataVtbl AudioData_Vtbl = diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 513d98a..a7999be 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -25,6 +25,9 @@ #include "uuids.h" #include "amstream.h" #include "vfwmsgs.h" +#include "mmreg.h" +#include "ks.h" +#include "ksmedia.h" #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) @@ -787,6 +790,71 @@ out_unknown: IUnknown_Release(unknown); } +static void test_audiodata_set_format(void) +{ + IUnknown *unknown = create_audio_data(); + IAudioData *audio_data = NULL; + WAVEFORMATPCMEX wave_format = {{0}}; + + HRESULT result; + + result = IUnknown_QueryInterface(unknown, &IID_IAudioData, (void **)&audio_data); + if (FAILED(result)) + { + /* test_audiodata_query_interface handles this case */ + skip("No IAudioData\n"); + goto out_unknown; + } + + result = IAudioData_SetFormat(audio_data, NULL); + ok(E_POINTER == result, "got 0x%08x\n", result); + + wave_format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + wave_format.Format.nChannels = 2; + wave_format.Format.nSamplesPerSec = 44100; + wave_format.Format.nAvgBytesPerSec = 176400; + wave_format.Format.nBlockAlign = 4; + wave_format.Format.wBitsPerSample = 16; + wave_format.Format.cbSize = 22; + wave_format.Samples.wValidBitsPerSample = 16; + wave_format.dwChannelMask = KSAUDIO_SPEAKER_STEREO; + wave_format.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + result = IAudioData_SetFormat(audio_data, &wave_format.Format); + ok(E_INVALIDARG == result, "got 0x%08x\n", result); + + wave_format.Format.wFormatTag = WAVE_FORMAT_PCM; + wave_format.Format.nChannels = 2; + wave_format.Format.nSamplesPerSec = 44100; + wave_format.Format.nAvgBytesPerSec = 176400; + wave_format.Format.nBlockAlign = 4; + wave_format.Format.wBitsPerSample = 16; + wave_format.Format.cbSize = 0; + result = IAudioData_SetFormat(audio_data, &wave_format.Format); + ok(S_OK == result, "got 0x%08x\n", result); + + wave_format.Format.wFormatTag = 0xdead; + wave_format.Format.nChannels = 0xdead; + wave_format.Format.nSamplesPerSec = 0xdeadbeef; + wave_format.Format.nAvgBytesPerSec = 0xdeadbeef; + wave_format.Format.nBlockAlign = 0xdead; + wave_format.Format.wBitsPerSample = 0xdead; + wave_format.Format.cbSize = 0xdead; + result = IAudioData_GetFormat(audio_data, &wave_format.Format); + ok(S_OK == result, "got 0x%08x\n", result); + ok(WAVE_FORMAT_PCM == wave_format.Format.wFormatTag, "got %u\n", wave_format.Format.wFormatTag); + ok(2 == wave_format.Format.nChannels, "got %u\n", wave_format.Format.nChannels); + ok(44100 == wave_format.Format.nSamplesPerSec, "got %u\n", wave_format.Format.nSamplesPerSec); + ok(176400 == wave_format.Format.nAvgBytesPerSec, "got %u\n", wave_format.Format.nAvgBytesPerSec); + ok(4 == wave_format.Format.nBlockAlign, "got %u\n", wave_format.Format.nBlockAlign); + ok(16 == wave_format.Format.wBitsPerSample, "got %u\n", wave_format.Format.wBitsPerSample); + ok(0 == wave_format.Format.cbSize, "got %u\n", wave_format.Format.cbSize); + + IAudioData_Release(audio_data); + +out_unknown: + IUnknown_Release(unknown); +} + START_TEST(amstream) { HANDLE file; @@ -810,6 +878,7 @@ START_TEST(amstream) test_audiodata_set_buffer(); test_audiodata_set_actual(); test_audiodata_get_format(); + test_audiodata_set_format(); CoUninitialize(); }

1 0