wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Piotr Caban : winex11.drv: Don' t resize hidden windows on ConfigureNotify event.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: e7cba8f0dc993914a2cd3657d3909efa81bd2bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cba8f0dc993914a2cd3657d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 8 13:44:42 2015 +0100 winex11.drv: Don't resize hidden windows on ConfigureNotify event. --- dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ea24471..612951d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1124,7 +1124,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if ((data->window_rect.right - data->window_rect.left == cx && data->window_rect.bottom - data->window_rect.top == cy) || - (IsRectEmpty( &data->window_rect ) && event->width == 1 && event->height == 1)) + IsRectEmpty( &data->window_rect )) flags |= SWP_NOSIZE; else TRACE( "%p resizing from (%dx%d) to (%dx%d)\n",

1 0

Nikolay Sivov : dwrite: Set glyph advances and offsets for each run.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: b03d4c7a8f6f1886ef290ed4f53749ec188862ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03d4c7a8f6f1886ef290ed4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 8 13:25:35 2015 +0300 dwrite: Set glyph advances and offsets for each run. --- dlls/dwrite/layout.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ad38177..ea35bfa 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -112,6 +112,8 @@ struct layout_run { DWRITE_SCRIPT_ANALYSIS sa; UINT16 *glyphs; UINT16 *clustermap; + FLOAT *advances; + DWRITE_GLYPH_OFFSET *offsets; }; struct dwrite_textlayout { @@ -225,6 +227,8 @@ static struct layout_run *alloc_layout_run(void) ret->glyphs = NULL; ret->clustermap = NULL; + ret->advances = NULL; + ret->offsets = NULL; return ret; } @@ -238,6 +242,8 @@ static void free_layout_runs(struct dwrite_textlayout *layout) IDWriteFontFace_Release(cur->run.fontFace); heap_free(cur->glyphs); heap_free(cur->clustermap); + heap_free(cur->advances); + heap_free(cur->offsets); heap_free(cur); } } @@ -413,10 +419,9 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) break; } - heap_free(text_props); - heap_free(glyph_props); - if (FAILED(hr)) { + heap_free(text_props); + heap_free(glyph_props); WARN("[%u,%u]: shaping failed 0x%08x\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, hr); continue; } @@ -424,7 +429,25 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphIndices = run->glyphs; run->descr.clusterMap = run->clustermap; - /* FIXME: set advances */ + run->advances = heap_alloc(run->run.glyphCount*sizeof(FLOAT)); + run->offsets = heap_alloc(run->run.glyphCount*sizeof(DWRITE_GLYPH_OFFSET)); + if (!run->advances || !run->offsets) + goto memerr; + + /* now set advances and offsets */ + hr = IDWriteTextAnalyzer_GetGlyphPlacements(analyzer, run->descr.string, run->descr.clusterMap, text_props, + run->descr.stringLength, run->run.glyphIndices, glyph_props, run->run.glyphCount, run->run.fontFace, + run->run.fontEmSize, FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, + NULL, NULL, 0, run->advances, run->offsets); + heap_free(text_props); + heap_free(glyph_props); + if (FAILED(hr)) + WARN("[%u,%u]: failed to get glyph placement info, 0x%08x\n", run->descr.textPosition, + run->descr.textPosition+run->descr.stringLength, hr); + + run->run.glyphAdvances = run->advances; + run->run.glyphOffsets = run->offsets; + continue; memerr: @@ -432,6 +455,10 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) heap_free(glyph_props); heap_free(run->clustermap); heap_free(run->glyphs); + heap_free(run->advances); + heap_free(run->offsets); + run->advances = NULL; + run->offsets = NULL; run->clustermap = run->glyphs = NULL; hr = E_OUTOFMEMORY; break;

1 0

Nikolay Sivov : dwrite: Store cluster map and glyph indices for each run.
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: b49a71416d072e8697b1340ce59a8cd0a8237655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49a71416d072e8697b1340ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 8 12:33:17 2015 +0300 dwrite: Store cluster map and glyph indices for each run. --- dlls/dwrite/layout.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index c430b2a..ad38177 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -110,6 +110,8 @@ struct layout_run { DWRITE_GLYPH_RUN_DESCRIPTION descr; DWRITE_GLYPH_RUN run; DWRITE_SCRIPT_ANALYSIS sa; + UINT16 *glyphs; + UINT16 *clustermap; }; struct dwrite_textlayout { @@ -221,6 +223,9 @@ static struct layout_run *alloc_layout_run(void) ret->sa.script = Script_Unknown; ret->sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + ret->glyphs = NULL; + ret->clustermap = NULL; + return ret; } @@ -231,6 +236,8 @@ static void free_layout_runs(struct dwrite_textlayout *layout) list_remove(&cur->entry); if (cur->run.fontFace) IDWriteFontFace_Release(cur->run.fontFace); + heap_free(cur->glyphs); + heap_free(cur->clustermap); heap_free(cur); } } @@ -338,10 +345,12 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) /* fill run info */ LIST_FOR_EACH_ENTRY(run, &layout->runs, struct layout_run, entry) { + DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props = NULL; + DWRITE_SHAPING_TEXT_PROPERTIES *text_props = NULL; IDWriteFontFamily *family; + UINT32 index, max_count; IDWriteFont *font; BOOL exists = TRUE; - UINT32 index; range = get_layout_range_by_pos(layout, run->descr.textPosition); @@ -370,8 +379,62 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.fontEmSize = range->fontsize; run->descr.localeName = range->locale; + run->clustermap = heap_alloc(run->descr.stringLength*sizeof(UINT16)); + + max_count = 3*run->descr.stringLength/2 + 16; + run->glyphs = heap_alloc(max_count*sizeof(UINT16)); + if (!run->clustermap || !run->glyphs) + goto memerr; + + text_props = heap_alloc(run->descr.stringLength*sizeof(DWRITE_SHAPING_TEXT_PROPERTIES)); + glyph_props = heap_alloc(max_count*sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES)); + if (!text_props || !glyph_props) + goto memerr; + + while (1) { + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, run->descr.string, run->descr.stringLength, + run->run.fontFace, FALSE /* FIXME */, run->run.bidiLevel & 1, &run->sa, run->descr.localeName, + NULL /* FIXME */, NULL, NULL, 0, max_count, run->clustermap, text_props, run->glyphs, glyph_props, + &run->run.glyphCount); + if (hr == E_NOT_SUFFICIENT_BUFFER) { + heap_free(run->glyphs); + heap_free(glyph_props); + + max_count = run->run.glyphCount; + + run->glyphs = heap_alloc(max_count*sizeof(UINT16)); + glyph_props = heap_alloc(max_count*sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES)); + if (!run->glyphs || !glyph_props) + goto memerr; + + continue; + } + + break; + } + + heap_free(text_props); + heap_free(glyph_props); + + if (FAILED(hr)) { + WARN("[%u,%u]: shaping failed 0x%08x\n", run->descr.textPosition, run->descr.textPosition+run->descr.stringLength, hr); + continue; + } + + run->run.glyphIndices = run->glyphs; + run->descr.clusterMap = run->clustermap; - /* FIXME: set glyph indices, cluster map, advances */ + /* FIXME: set advances */ + continue; + + memerr: + heap_free(text_props); + heap_free(glyph_props); + heap_free(run->clustermap); + heap_free(run->glyphs); + run->clustermap = run->glyphs = NULL; + hr = E_OUTOFMEMORY; + break; } IDWriteTextAnalyzer_Release(analyzer);

1 0

Michael Stefaniuc : quartz: Simplify code flow logic (PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 8a42eb55da659ebb7943db699e28c23acec5df36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a42eb55da659ebb7943db699… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:10:52 2015 +0100 quartz: Simplify code flow logic (PVS-Studio). --- dlls/quartz/vmr9.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 53e4942..e950a48 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -476,14 +476,12 @@ static HRESULT WINAPI VMR9_ShouldDrawSampleNow(BaseRenderer *This, IMediaSample static HRESULT WINAPI VMR9_CompleteConnect(BaseRenderer *This, IPin *pReceivePin) { struct quartz_vmr *pVMR9 = (struct quartz_vmr*)This; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p)\n", This); - if (!pVMR9->mode && SUCCEEDED(hr)) - hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed); - - if (SUCCEEDED(hr)) + if (pVMR9->mode || + SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&pVMR9->IVMRFilterConfig9_iface, VMR9Mode_Windowed))) hr = VMR9_maybe_init(pVMR9, FALSE); return hr;

1 0

Michael Stefaniuc : quartz: Remove an unused variable (PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 585f8dfe7e9ca444413b65a19bc855214c1d61cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=585f8dfe7e9ca444413b65a19… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:10:11 2015 +0100 quartz: Remove an unused variable (PVS-Studio). --- dlls/quartz/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 81f9ab8..b45c55b 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -274,11 +274,10 @@ HRESULT __RPC_STUB ICaptureGraphBuilder2_FindInterface_Stub( ICaptureGraphBuilde const char * qzdebugstr_guid( const GUID * id ) { int i; - char * name = NULL; - for (i=0;InterfaceDesc[i].name && !name;i++) { + for (i=0; InterfaceDesc[i].name; i++) if (IsEqualGUID(&InterfaceDesc[i].riid, id)) return InterfaceDesc[i].name; - } + return debugstr_guid(id); }

1 0

Michael Stefaniuc : quartz: Remove always true if subexpression ( PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: b31ef9c80abf5dc21aa937835ff2aa6e58fbfdbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31ef9c80abf5dc21aa937835… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:09:42 2015 +0100 quartz: Remove always true if subexpression (PVS-Studio). --- dlls/quartz/avisplit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 1f57045..ee03e08 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1199,7 +1199,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, indexes = 0; } } - else if (!indexes && pAviSplit->oldindex) + else if (pAviSplit->oldindex) indexes = pAviSplit->Parser.cStreams; if (!indexes && pAviSplit->AviHeader.dwFlags & AVIF_MUSTUSEINDEX)

1 0

Michael Stefaniuc : oledb32/tests: Simplify some ok() checks (PVS-Studio).
by Alexandre Julliard 08 Jan '15

08 Jan '15

Module: wine Branch: master Commit: 6d3c83b86936368e82ad5d2607125275f7f1d675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3c83b86936368e82ad5d260… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 8 11:07:55 2015 +0100 oledb32/tests: Simplify some ok() checks (PVS-Studio). --- dlls/oledb32/tests/convert.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 3e78f24..b039e11 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -303,27 +303,21 @@ static void test_canconvert(void) /* src DBTYPE_VECTOR */ hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type); - expect = FALSE; - ok((hr == S_OK && expect == TRUE) || - (hr == S_FALSE && expect == FALSE), - "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, - simple_convert[dst_idx].type, hr, expect ? "" : "not "); + ok(hr == S_FALSE, + "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, + simple_convert[dst_idx].type, hr); /* dst DBTYPE_VECTOR */ hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type, simple_convert[dst_idx].type | DBTYPE_VECTOR); - expect = FALSE; - ok((hr == S_OK && expect == TRUE) || - (hr == S_FALSE && expect == FALSE), - "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type, - simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not "); + ok(hr == S_FALSE, + "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type, + simple_convert[dst_idx].type | DBTYPE_VECTOR, hr); /* src & dst DBTYPE_VECTOR */ hr = IDataConvert_CanConvert(convert, simple_convert[src_idx].type | DBTYPE_VECTOR, simple_convert[dst_idx].type | DBTYPE_VECTOR); - expect = FALSE; - ok((hr == S_OK && expect == TRUE) || - (hr == S_FALSE && expect == FALSE), - "%04x -> %04x: got %08x expect conversion to be %spossible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, - simple_convert[dst_idx].type | DBTYPE_VECTOR, hr, expect ? "" : "not "); + ok(hr == S_FALSE, + "%04x -> %04x: got %08x expect conversion to not be possible\n", simple_convert[src_idx].type | DBTYPE_VECTOR, + simple_convert[dst_idx].type | DBTYPE_VECTOR, hr); }

1 0

Piotr Caban : msvcp70: Add basic_ifstream(name, mode) constructor implementation.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 6ac25d3d8092bd572140b1900baf7e42b12960ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ac25d3d8092bd572140b1900… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 7 18:02:10 2015 +0100 msvcp70: Add basic_ifstream(name, mode) constructor implementation. --- dlls/msvcp70/msvcp70.spec | 12 ++++++------ dlls/msvcp90/ios.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 7067efa..053f5e7 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -50,16 +50,16 @@ @ cdecl -arch=win64 ??0?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAA@XZ(ptr long) basic_fstream_short_ctor @ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_fstream_wchar_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ(ptr long) basic_fstream_wchar_ctor -@ stub -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_char_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_char_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@XZ(ptr long) basic_ifstream_char_ctor @ cdecl -arch=win64 ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@XZ(ptr long) basic_ifstream_char_ctor -@ stub -arch=win32 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_short_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_short_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@XZ(ptr long) basic_ifstream_short_ctor @ cdecl -arch=win64 ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@XZ(ptr long) basic_ifstream_short_ctor -@ stub -arch=win32 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z -@ stub -arch=win64 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z(ptr str long long) basic_ifstream_wchar_ctor_name_old +@ cdecl -arch=win64 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z(ptr str long long) basic_ifstream_wchar_ctor_name_old @ thiscall -arch=win32 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@XZ(ptr long) basic_ifstream_wchar_ctor @ cdecl -arch=win64 ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@XZ(ptr long) basic_ifstream_wchar_ctor @ thiscall -arch=i386 ??0?$basic_ios@DU?$char_traits@D@std@@@std@@IAE@XZ(ptr) basic_ios_char_ctor diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7308729..39c59b6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11335,6 +11335,15 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha return this; } +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name_old, 16) +basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_old(basic_ifstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_char_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PBGHH@Z */ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QEAA@PEBGHH@Z */ /* ??0?$basic_ifstream@DU?$char_traits@D@std@@@std@@QAE@PB_WHH@Z */ @@ -11588,6 +11597,24 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_w return this; } +/* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_wchar_ctor_name_old, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_wchar_ctor_name_old(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_wchar_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAE@PBDH@Z */ +/* ??0?$basic_ifstream@GU?$char_traits@G@std@@@std@@QEAA@PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_ifstream_short_ctor_name_old, 16) +basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name_old(basic_ifstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_ifstream_short_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PBGHH@Z */ /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QEAA@PEBGHH@Z */ /* ??0?$basic_ifstream@_WU?$char_traits@_W@std@@@std@@QAE@PB_WHH@Z */

1 0

Piotr Caban : user32: Only store dialog focus when window is hidden or inactive.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 91eced0ce5279b59715330466742925d89e8d0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91eced0ce5279b59715330466… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 22 16:36:48 2014 +0100 user32: Only store dialog focus when window is hidden or inactive. --- dlls/user32/defdlg.c | 4 +--- dlls/user32/tests/dialog.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index e4b55f3..00a73c6 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -105,9 +105,7 @@ static void DEFDLG_RestoreFocus( HWND hwnd, BOOL justActivate ) SetFocus( infoPtr->hwndFocus ); else DEFDLG_SetFocus( infoPtr->hwndFocus ); - - /* This used to set infoPtr->hwndFocus to NULL for no apparent reason, - sometimes losing focus when receiving WM_SETFOCUS messages. */ + infoPtr->hwndFocus = NULL; } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index ef72cfe..63e76f7 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1357,6 +1357,24 @@ static void test_SaveRestoreFocus(void) foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); ok (foundId == 1001, "Second edit box should have gained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + /* set focus to the dialog */ + SetFocus(hDlg); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have gained focus on dialog focus. Expected: %d, Found: %ld\n", 1000, foundId); + + /* select second tabbable item */ + SetFocus(GetNextDlgTabItem(hDlg, GetNextDlgTabItem(hDlg, NULL, FALSE), FALSE)); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + + /* send WM_ACTIVATE message to already active dialog */ + SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + /* disable the 2nd box */ EnableWindow(GetFocus(), FALSE);

1 0

Mark Harmstone : dsound: Do not use panning to set sound position.
by Alexandre Julliard 07 Jan '15

07 Jan '15

Module: wine Branch: master Commit: 02f9edfd77302eabc0a8a6e45a9423ebe2b1acef URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f9edfd77302eabc0a8a6e45… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Jan 6 19:27:00 2015 +0000 dsound: Do not use panning to set sound position. --- dlls/dsound/sound3d.c | 52 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 604d19b..329de94 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -114,6 +114,7 @@ static inline D3DVALUE AngleBetweenVectorsRad (const D3DVECTOR *a, const D3DVECT cos = product/(la*lb); angle = acos(cos); + if (cos < 0.0f) { angle -= M_PI; } TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians (%f degrees)\n", a->x, a->y, a->z, b->x, b->y, b->z, angle, RadToDeg(angle)); return angle; @@ -159,8 +160,10 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) D3DVECTOR vDistance; D3DVALUE flDistance = 0; /* panning related stuff */ - D3DVALUE flAngle; + D3DVALUE flAngle, flAngle2; D3DVECTOR vLeft; + int i; + float a, ingain; /* doppler shift related stuff */ TRACE("(%p)\n",dsb); @@ -241,21 +244,35 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume); } dsb->volpan.lVolume = lVolume; + + ingain = pow(2.0, dsb->volpan.lVolume / 600.0) * 0xffff; + + if (dsb->device->pwfx->nChannels == 1) + { + dsb->volpan.dwTotalAmpFactor[0] = ingain; + return; + } /* panning */ if (dsb->device->ds3dl.vPosition.x == dsb->ds3db_ds3db.vPosition.x && dsb->device->ds3dl.vPosition.y == dsb->ds3db_ds3db.vPosition.y && dsb->device->ds3dl.vPosition.z == dsb->ds3db_ds3db.vPosition.z) { - dsb->volpan.lPan = 0; flAngle = 0.0; } else { vDistance = VectorBetweenTwoPoints(&dsb->device->ds3dl.vPosition, &dsb->ds3db_ds3db.vPosition); vLeft = VectorProduct(&dsb->device->ds3dl.vOrientFront, &dsb->device->ds3dl.vOrientTop); - flAngle = AngleBetweenVectorsRad(&vLeft, &vDistance); - /* for now, we'll use "linear formula" (which is probably incorrect); if someone has it in book, correct it */ - dsb->volpan.lPan = 10000*2*flAngle/M_PI - 10000; + flAngle = AngleBetweenVectorsRad(&dsb->device->ds3dl.vOrientFront, &vDistance); + flAngle2 = AngleBetweenVectorsRad(&vLeft, &vDistance); + + /* AngleBetweenVectorsRad performs a dot product, which gives us the cosine of the angle + * between two vectors. Unfortunately, because cos(theta) = cos(-theta), we've no idea from + * this whether the sound is to our left or to our right. We have to perform another dot + * product, with a vector at right angles to the initial one, to get the correct angle. + * The angle should be between -180 degrees and 180 degrees. */ + if (flAngle < 0.0f) { flAngle += M_PI; } + if (flAngle2 > 0.0f) { flAngle = -flAngle; } } TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan); @@ -290,9 +307,28 @@ if(0) DSOUND_RecalcFormat(dsb); } } - - /* time for remix */ - DSOUND_RecalcVolPan(&dsb->volpan); + + for (i = 0; i < dsb->device->pwfx->nChannels; i++) + dsb->volpan.dwTotalAmpFactor[i] = 0; + + /* adapted from OpenAL's Alc/panning.c */ + for (i = 0; i < dsb->device->pwfx->nChannels - 1; i++) + { + if(flAngle >= dsb->device->speaker_angles[i] && flAngle < dsb->device->speaker_angles[i+1]) + { + /* Sound is between speakers i and i+1 */ + a = (flAngle-dsb->device->speaker_angles[i]) / (dsb->device->speaker_angles[i+1]-dsb->device->speaker_angles[i]); + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[i]] = sqrtf(1.0f-a) * ingain; + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[i+1]] = sqrtf(a) * ingain; + return; + } + } + + /* Sound is between last and first speakers */ + if (flAngle < dsb->device->speaker_angles[0]) { flAngle += M_PI*2.0f; } + a = (flAngle-dsb->device->speaker_angles[i]) / (M_PI*2.0f + dsb->device->speaker_angles[0]-dsb->device->speaker_angles[i]); + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[i]] = sqrtf(1.0f-a) * ingain; + dsb->volpan.dwTotalAmpFactor[dsb->device->speaker_num[0]] = sqrtf(a) * ingain; } static void DSOUND_Mix3DBuffer(IDirectSoundBufferImpl *dsb)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2015