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

Andrew Eikum : qcap: Search the whole graph for an unconnected pin.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: af05ff4b152cf3e3cd4544ffbfa6576a9bd856b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af05ff4b152cf3e3cd4544ffb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 16 08:28:32 2016 -0500 qcap: Search the whole graph for an unconnected pin. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 89 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 68 insertions(+), 21 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 372e16f..546b1f8 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -360,6 +360,66 @@ end: return hr; } +static HRESULT find_unconnected_pin(CaptureGraphImpl *This, + const GUID *pCategory, const GUID *pType, IUnknown *pSource, IPin **out_pin) +{ + int index = 0; + IPin *source_out; + HRESULT hr; + BOOL usedSmartTeePreviewPin = FALSE; + + /* depth-first search the graph for the first unconnected pin that matches + * the given category and type */ + for(;;){ + IPin *nextpin; + + if (pCategory && (IsEqualIID(pCategory, &PIN_CATEGORY_CAPTURE) || IsEqualIID(pCategory, &PIN_CATEGORY_PREVIEW))){ + IBaseFilter *sourceFilter = NULL; + hr = IUnknown_QueryInterface(pSource, &IID_IBaseFilter, (void**)&sourceFilter); + if (SUCCEEDED(hr)) { + hr = match_smart_tee_pin(This, pCategory, pType, pSource, &source_out); + if (hr == VFW_S_NOPREVIEWPIN) + usedSmartTeePreviewPin = TRUE; + IBaseFilter_Release(sourceFilter); + } else { + hr = ICaptureGraphBuilder2_FindPin(&This->ICaptureGraphBuilder2_iface, pSource, PINDIR_OUTPUT, pCategory, pType, FALSE, index, &source_out); + } + if (FAILED(hr)) + return E_INVALIDARG; + } else { + hr = ICaptureGraphBuilder2_FindPin(&This->ICaptureGraphBuilder2_iface, pSource, PINDIR_OUTPUT, pCategory, pType, FALSE, index, &source_out); + if (FAILED(hr)) + return E_INVALIDARG; + } + + hr = IPin_ConnectedTo(source_out, &nextpin); + if(SUCCEEDED(hr)){ + PIN_INFO info; + + IPin_Release(source_out); + + hr = IPin_QueryPinInfo(nextpin, &info); + if(FAILED(hr) || !info.pFilter){ + WARN("QueryPinInfo failed: %08x\n", hr); + return hr; + } + + hr = find_unconnected_pin(This, pCategory, pType, (IUnknown*)info.pFilter, out_pin); + + IBaseFilter_Release(info.pFilter); + + if(SUCCEEDED(hr)) + return hr; + }else{ + *out_pin = source_out; + if(usedSmartTeePreviewPin) + return VFW_S_NOPREVIEWPIN; + return S_OK; + } + + index++; + } +} static HRESULT WINAPI fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, @@ -372,8 +432,7 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); IPin *source_out = NULL, *renderer_in; BOOL rendererNeedsRelease = FALSE; - BOOL usedSmartTeePreviewPin = FALSE; - HRESULT hr; + HRESULT hr, return_hr = S_OK; FIXME("(%p/%p)->(%s, %s, %p, %p, %p) semi-stub!\n", This, iface, debugstr_guid(pCategory), debugstr_guid(pType), @@ -388,25 +447,13 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, if (pCategory && IsEqualIID(pCategory, &PIN_CATEGORY_VBI)) { FIXME("Tee/Sink-to-Sink filter not supported\n"); return E_NOTIMPL; - } else if (pCategory && (IsEqualIID(pCategory, &PIN_CATEGORY_CAPTURE) || IsEqualIID(pCategory, &PIN_CATEGORY_PREVIEW))){ - IBaseFilter *sourceFilter = NULL; - hr = IUnknown_QueryInterface(pSource, &IID_IBaseFilter, (void**)&sourceFilter); - if (SUCCEEDED(hr)) { - hr = match_smart_tee_pin(This, pCategory, pType, pSource, &source_out); - if (hr == VFW_S_NOPREVIEWPIN) - usedSmartTeePreviewPin = TRUE; - IBaseFilter_Release(sourceFilter); - } else { - hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, pCategory, pType, TRUE, 0, &source_out); - } - if (FAILED(hr)) - return E_INVALIDARG; - } else { - hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, pCategory, pType, TRUE, 0, &source_out); - if (FAILED(hr)) - return E_INVALIDARG; } + hr = find_unconnected_pin(This, pCategory, pType, pSource, &source_out); + if (FAILED(hr)) + return hr; + return_hr = hr; + if (!pfRenderer) { IEnumMediaTypes *enumMedia = NULL; @@ -480,8 +527,8 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, IPin_Release(renderer_in); if (rendererNeedsRelease) IBaseFilter_Release(pfRenderer); - if (SUCCEEDED(hr) && usedSmartTeePreviewPin) - hr = VFW_S_NOPREVIEWPIN; + if (SUCCEEDED(hr)) + return return_hr; return hr; }

1 0

Andrew Eikum : qedit: Don' t require SampleGrabber to be playing to call callback.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 3104b17f86379035132a2579ea485512d0a17af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3104b17f86379035132a2579e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 16 08:28:38 2016 -0500 qedit: Don't require SampleGrabber to be playing to call callback. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 2 +- dlls/qedit/tests/mediadet.c | 197 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index e3f387b..151827e 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -765,7 +765,7 @@ SampleGrabber_IMemInputPin_Receive(IMemInputPin *iface, IMediaSample *sample) TRACE("(%p)->(%p) output = %p, grabber = %p\n", This, sample, This->memOutput, This->grabberIface); if (!sample) return E_POINTER; - if ((This->filter.state != State_Running) || (This->oneShot == OneShot_Past)) + if (This->oneShot == OneShot_Past) return S_FALSE; SampleGrabber_callback(This, sample); hr = This->memOutput ? IMemInputPin_Receive(This->memOutput, sample) : S_OK; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index d5efe43..6bc20e5 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -353,6 +353,174 @@ static void test_mediadet(void) DeleteFileW(test_sound_avi_filename); } +static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, + void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI ms_AddRef(IMediaSample *iface) +{ + return 2; +} + +static ULONG WINAPI ms_Release(IMediaSample *iface) +{ + return 1; +} + +static HRESULT WINAPI ms_GetPointer(IMediaSample *iface, BYTE **ppBuffer) +{ + return E_NOTIMPL; +} + +static LONG WINAPI ms_GetSize(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetTime(IMediaSample *iface, REFERENCE_TIME *pTimeStart, + REFERENCE_TIME *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetTime(IMediaSample *iface, REFERENCE_TIME *pTimeStart, + REFERENCE_TIME *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsSyncPoint(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetSyncPoint(IMediaSample *iface, BOOL bIsSyncPoint) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsPreroll(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetPreroll(IMediaSample *iface, BOOL bIsPreroll) +{ + return E_NOTIMPL; +} + +static LONG WINAPI ms_GetActualDataLength(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetActualDataLength(IMediaSample *iface, LONG length) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetMediaType(IMediaSample *iface, AM_MEDIA_TYPE + **ppMediaType) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetMediaType(IMediaSample *iface, AM_MEDIA_TYPE *pMediaType) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_IsDiscontinuity(IMediaSample *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetDiscontinuity(IMediaSample *iface, BOOL bDiscontinuity) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_GetMediaTime(IMediaSample *iface, LONGLONG *pTimeStart, + LONGLONG *pTimeEnd) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI ms_SetMediaTime(IMediaSample *iface, LONGLONG *pTimeStart, + LONGLONG *pTimeEnd) +{ + return E_NOTIMPL; +} + +static const IMediaSampleVtbl my_sample_vt = { + ms_QueryInterface, + ms_AddRef, + ms_Release, + ms_GetPointer, + ms_GetSize, + ms_GetTime, + ms_SetTime, + ms_IsSyncPoint, + ms_SetSyncPoint, + ms_IsPreroll, + ms_SetPreroll, + ms_GetActualDataLength, + ms_SetActualDataLength, + ms_GetMediaType, + ms_SetMediaType, + ms_IsDiscontinuity, + ms_SetDiscontinuity, + ms_GetMediaTime, + ms_SetMediaTime +}; + +static IMediaSample my_sample = { &my_sample_vt }; + +static BOOL samplecb_called = FALSE; + +static HRESULT WINAPI sgcb_QueryInterface(ISampleGrabberCB *iface, REFIID riid, + void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI sgcb_AddRef(ISampleGrabberCB *iface) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI sgcb_Release(ISampleGrabberCB *iface) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI sgcb_SampleCB(ISampleGrabberCB *iface, double SampleTime, + IMediaSample *pSample) +{ + ok(pSample == &my_sample, "Got wrong IMediaSample: %p, expected %p\n", pSample, &my_sample); + samplecb_called = TRUE; + return E_NOTIMPL; +} + +static HRESULT WINAPI sgcb_BufferCB(ISampleGrabberCB *iface, double SampleTime, + BYTE *pBuffer, LONG BufferLen) +{ + ok(0, "BufferCB should not have been called\n"); + return E_NOTIMPL; +} + +static const ISampleGrabberCBVtbl sgcb_vt = { + sgcb_QueryInterface, + sgcb_AddRef, + sgcb_Release, + sgcb_SampleCB, + sgcb_BufferCB +}; + +static ISampleGrabberCB my_sg_cb = { &sgcb_vt }; + static void test_samplegrabber(void) { struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; @@ -361,8 +529,12 @@ static void test_samplegrabber(void) IMediaFilter *mf; IPersist *persist; IUnknown *unk; + IPin *pin; + IMemInputPin *inpin; + IEnumPins *pins; ULONG refcount; HRESULT hr; + FILTER_STATE fstate; /* COM aggregation */ hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, @@ -415,6 +587,31 @@ static void test_samplegrabber(void) ok(refcount == 7, "refcount == %u, expected 7\n", refcount); refcount = IUnknown_Release(unk); + hr = ISampleGrabber_SetCallback(sg, &my_sg_cb, 0); + ok(hr == S_OK, "SetCallback failed: %08x\n", hr); + + hr = IBaseFilter_GetState(bf, 100, &fstate); + ok(hr == S_OK, "Failed to get filter state: %08x\n", hr); + ok(fstate == State_Stopped, "Got wrong filter state: %u\n", fstate); + + hr = IBaseFilter_EnumPins(bf, &pins); + ok(hr == S_OK, "EnumPins create failed: %08x, expected S_OK\n", hr); + + hr = IEnumPins_Next(pins, 1, &pin, NULL); + ok(hr == S_OK, "Next failed: %08x\n", hr); + + IEnumPins_Release(pins); + + hr = IPin_QueryInterface(pin, &IID_IMemInputPin, (void**)&inpin); + ok(hr == S_OK, "QueryInterface(IMemInputPin) failed: %08x\n", hr); + + hr = IMemInputPin_Receive(inpin, &my_sample); + ok(hr == S_OK, "Receive failed: %08x\n", hr); + ok(samplecb_called == TRUE, "SampleCB should have been called\n"); + + IMemInputPin_Release(inpin); + IPin_Release(pin); + /* Interfaces that native does not support */ hr = ISampleGrabber_QueryInterface(sg, &IID_IMediaPosition, (void**)&unk); todo_wine ok(hr == E_NOINTERFACE, "QueryInterface for IID_IMediaPosition failed: %08x\n", hr);

1 0

Alexandre Julliard : Release 1.9.10.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: f7ac364b0c06bbe7a1ef5b715f2be46b5e6c04d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ac364b0c06bbe7a1ef5b715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 00:34:41 2016 +0900 Release 1.9.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 720 ++++++++++++++++++++++++-------------------------------------- VERSION | 2 +- configure | 18 +- 4 files changed, 283 insertions(+), 458 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7ac364b0c06bbe7a1ef5…

1 0

Tag wine-1.9.10 : Alexandre Julliard : Release 1.9.10
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: refs/tags/wine-1.9.10 Tag: bc964cab79161c2f63c8eca6436654af74912753 URL: http://source.winehq.org/git/wine.git/?a=tag;h=bc964cab79161c2f63c8eca64366… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 00:34:41 2016 +0900 Release 1.9.10

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 9f5a9509956747f04f640dda1486c178bcf80ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5a9509956747f04f640dda1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat May 14 14:44:19 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fi.po b/po/fi.po index 2bd5dcc..2f66e59 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11628,7 +11628,7 @@ msgstr "" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Haku on valmis. Osumia: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : kernel32: Handle NULL locale name in IsValidLocaleName().
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 73f7bf57cb74dedc19070192ed9fd577dc0ff7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f7bf57cb74dedc19070192e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 15 10:29:43 2016 +0300 kernel32: Handle NULL locale name in IsValidLocaleName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 3 +++ dlls/kernel32/tests/locale.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index a2f369a..14b2ba7 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2656,6 +2656,9 @@ BOOL WINAPI IsValidLocaleName( LPCWSTR locale ) { struct locale_name locale_name; + if (!locale) + return FALSE; + /* string parsing */ parse_locale_name( locale, &locale_name ); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 20f52d2..70944a2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4179,6 +4179,8 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); ret = pIsValidLocaleName(LOCALE_NAME_INVARIANT); ok(ret, "IsValidLocaleName failed\n"); + ret = pIsValidLocaleName(NULL); + ok(!ret, "IsValidLocaleName should have failed\n"); } static void test_CompareStringOrdinal(void)

1 0

Nikolay Sivov : kernel32: Set C3_KASHIDA only for kashida character.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 632266e5b589232fbb2866fdf810087d9e8d1e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632266e5b589232fbb2866fdf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 15 10:30:33 2016 +0300 kernel32: Set C3_KASHIDA only for kashida character. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 14b2ba7..b5a8680 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2864,7 +2864,7 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype if ((c>=0x30A0)&&(c<=0x30FF)) type3 |= C3_KATAKANA; if ((c>=0x3040)&&(c<=0x309F)) type3 |= C3_HIRAGANA; if ((c>=0x4E00)&&(c<=0x9FAF)) type3 |= C3_IDEOGRAPH; - if ((c>=0x0600)&&(c<=0x06FF)) type3 |= C3_KASHIDA; + if (c == 0x0640) type3 |= C3_KASHIDA; if ((c>=0x3000)&&(c<=0x303F)) type3 |= C3_SYMBOL; if ((c>=0xD800)&&(c<=0xDBFF)) type3 |= C3_HIGHSURROGATE; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 70944a2..d677836 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3766,6 +3766,18 @@ static void test_GetStringTypeW(void) GetStringTypeW(CT_CTYPE1, ch, 2, types); ok(types[0] == (C1_DEFINED|C1_SPACE), "got %x\n", types[0]); ok(types[1] == (C1_DEFINED|C1_SPACE), "got %x\n", types[1]); + + /* check Arabic range for kashida flag */ + for (ch[0] = 0x600; ch[0] <= 0x6ff; ch[0] += 1) + { + types[0] = 0; + ret = GetStringTypeW(CT_CTYPE3, ch, 1, types); + ok(ret, "%#x: failed %d\n", ch[0], ret); + if (ch[0] == 0x640) /* ARABIC TATWEEL (Kashida) */ + ok(types[0] & C3_KASHIDA, "%#x: type %#x\n", ch[0], types[0]); + else + ok(!(types[0] & C3_KASHIDA), "%#x: type %#x\n", ch[0], types[0]); + } } static void test_IdnToNameprepUnicode(void)

1 0

Akihiro Sagawa : imm32/tests: Add tests for life cycle of default IME window.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 5152f4141ad03e9c05f6d0cf67eec20d3367ccfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5152f4141ad03e9c05f6d0cf6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun May 15 21:08:43 2016 +0900 imm32/tests: Add tests for life cycle of default IME window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index eb544bb..bb27853 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -853,6 +853,64 @@ static void test_ImmDefaultHwnd(void) DestroyWindow(hwnd); } +static BOOL CALLBACK is_ime_window_proc(HWND hWnd, LPARAM param) +{ + static const WCHAR imeW[] = {'I','M','E',0}; + WCHAR class_nameW[16]; + HWND *ime_window = (HWND *)param; + if (GetClassNameW(hWnd, class_nameW, sizeof(class_nameW)/sizeof(class_nameW[0])) && + !lstrcmpW(class_nameW, imeW)) { + *ime_window = hWnd; + return FALSE; + } + return TRUE; +} + +static HWND get_ime_window(void) +{ + HWND ime_window = NULL; + EnumThreadWindows(GetCurrentThreadId(), is_ime_window_proc, (LPARAM)&ime_window); + return ime_window; +} + +static DWORD WINAPI test_default_ime_window_cb(void *arg) +{ + DWORD visible = arg ? WS_VISIBLE : 0; + HWND hwnd1, hwnd2, default_ime_wnd, ime_wnd; + + ok(!get_ime_window(), "Expected no IME windows\n"); + hwnd1 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + ime_wnd = get_ime_window(); + todo_wine ok(ime_wnd != NULL, "Expected IME window existence\n"); + default_ime_wnd = ImmGetDefaultIMEWnd(hwnd1); + todo_wine ok(ime_wnd == default_ime_wnd, "Expected %p, got %p\n", ime_wnd, default_ime_wnd); + hwnd2 = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW | visible, + CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); + DestroyWindow(hwnd2); + todo_wine ok(IsWindow(ime_wnd) || broken(/* Vista */ !visible), "Expected IME window existence\n"); + DestroyWindow(hwnd1); + ok(!IsWindow(ime_wnd), "Expected no IME windows\n"); + return 1; +} + +static void test_default_ime_window_creation(void) +{ + HANDLE thread; + + thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)FALSE, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, test_default_ime_window_cb, (LPVOID)TRUE, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); +} + static void test_ImmGetIMCLockCount(void) { HIMC imc; @@ -1594,6 +1652,7 @@ START_TEST(imm32) { test_ImmGetContext(); test_ImmGetDescription(); test_ImmDefaultHwnd(); + test_default_ime_window_creation(); test_ImmGetIMCLockCount(); test_ImmGetIMCCLockCount(); test_ImmDestroyContext();

1 0

Francois Gouget : qmgr: Fix a spelling error in a TRACE().
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 4d6cba1bda556cf7d328c74e3fd88d2566227809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d6cba1bda556cf7d328c74e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:32:42 2016 +0200 qmgr: Fix a spelling error in a TRACE(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index 8563597..e856408 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -148,7 +148,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) WaitForSingleObject(fileTxThread, INFINITE); UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); CloseHandle(stop_event); - TRACE("service stoped\n"); + TRACE("service stopped\n"); CoUninitialize(); }

1 0

Francois Gouget : dwrite: Fix a typo in dwrite_3.idl.
by Alexandre Julliard 16 May '16

16 May '16

Module: wine Branch: master Commit: 53e2fd2b958f7e58aa0e6f1a88311652d59fdfc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e2fd2b958f7e58aa0e6f1a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:33:10 2016 +0200 dwrite: Fix a typo in dwrite_3.idl. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 0d1dc40..e312d5e 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -138,7 +138,7 @@ interface IDWriteFontSet : IUnknown WCHAR const *preferred_locales, IDWriteStringList **values); HRESULT GetPropertyValues(UINT32 index, DWRITE_FONT_PROPERTY_ID id, BOOL *exists, IDWriteLocalizedStrings **values); - HRESULT GetPropertyOccurenceCount(DWRITE_FONT_PROPERTY const *property, UINT32 *count); + HRESULT GetPropertyOccurrenceCount(DWRITE_FONT_PROPERTY const *property, UINT32 *count); HRESULT GetMatchingFonts_(WCHAR const *family, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STRETCH stretch, DWRITE_FONT_STYLE style, IDWriteFontSet **fontset); HRESULT GetMatchingFonts(DWRITE_FONT_PROPERTY const *props, UINT32 count, IDWriteFontSet **fontset);

1 0