October 2016 - Wine-Commits

Huw Davies : riched20: Set the format of the final eop to be that of the last char.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: e1f943863b9124b4eb40daf83fe16cf4a12849e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f943863b9124b4eb40daf83… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:27 2016 +0100 riched20: Set the format of the final eop to be that of the last char. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 12 +++++++++++- dlls/riched20/tests/editor.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 78cb50c..d7abaa2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1648,7 +1648,17 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (newto > to + (editor->bEmulateVersion10 ? 1 : 0)) { WCHAR lastchar[3] = {'\0', '\0'}; int linebreakSize = editor->bEmulateVersion10 ? 2 : 1; - ME_Cursor linebreakCursor = *selEnd; + ME_Cursor linebreakCursor = *selEnd, lastcharCursor = *selEnd; + CHARFORMAT2W cf; + + /* Set the final eop to the char fmt of the last char */ + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_ALL2; + ME_MoveCursorChars(editor, &lastcharCursor, -1, FALSE); + ME_GetCharFormat(editor, &lastcharCursor, &linebreakCursor, &cf); + ME_SetSelection(editor, newto, -1); + ME_SetSelectionCharFormat(editor, &cf); + ME_SetSelection(editor, newto, newto); ME_MoveCursorChars(editor, &linebreakCursor, -linebreakSize, FALSE); ME_GetTextW(editor, lastchar, 2, &linebreakCursor, linebreakSize, FALSE, FALSE); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 218e20e..351695a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8372,6 +8372,42 @@ static void test_background(void) DestroyWindow(hwndRichEdit); } +static void test_eop_char_fmt(void) +{ + HWND edit = new_richedit( NULL ); + const char *rtf = "{\\rtf1{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 Arial;}{\\f1\\fnil\\fcharset2 Symbol;}}" + "{\\fs10{\\pard\\fs16\\fi200\\li360\\f0 First\\par" + "\\f0\\fs25 Second\\par" + "{\\f0\\fs26 Third}\\par" + "{\\f0\\fs22 Fourth}\\par}}}"; + EDITSTREAM es; + CHARFORMAT2W cf; + int i, num, expect_height; + + es.dwCookie = (DWORD_PTR)&rtf; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + num = SendMessageA( edit, EM_STREAMIN, SF_RTF, (LPARAM)&es ); + ok( num == 25, "got %d\n", num ); + + for (i = 0; i <= num; i++) + { + SendMessageW( edit, EM_SETSEL, i, i + 1 ); + cf.cbSize = sizeof(cf); + cf.dwMask = CFM_SIZE; + SendMessageW( edit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf ); + ok( cf.dwMask & CFM_SIZE, "%d: got %08x\n", i, cf.dwMask ); + if (i < 6) expect_height = 160; + else if (i < 13) expect_height = 250; + else if (i < 18) expect_height = 260; + else if (i == 18 || i == 25) expect_height = 250; + else expect_height = 220; + ok( cf.yHeight == expect_height, "%d: got %d\n", i, cf.yHeight ); + } + + DestroyWindow( edit ); +} + START_TEST( editor ) { BOOL ret; @@ -8443,6 +8479,7 @@ START_TEST( editor ) test_alignment_style(); test_rtf_specials(); test_background(); + test_eop_char_fmt(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Huw Davies : riched20: Alter ME_SaveTempStyle() to accept the new style.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: ac6a0d8923068ef99ccdb626fd2f2264ac2d198d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6a0d8923068ef99ccdb626f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:25 2016 +0100 riched20: Alter ME_SaveTempStyle() to accept the new style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/style.c | 9 +++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4adc74f..7b934fe 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2392,7 +2392,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) } style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor); + ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); if (shift_is_down) ME_InsertEndRowFromCursor(editor, 0); @@ -2566,7 +2566,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) { ME_Style *style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor); + ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); @@ -4538,7 +4538,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = ME_GetInsertStyle(editor, 0); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); - ME_SaveTempStyle(editor); + ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { LPWSTR lpCompStr = NULL; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index c62b3a4..b0a8a1a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -76,7 +76,7 @@ ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) DECLSPEC_HIDDEN; void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; -void ME_SaveTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; +void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) DECLSPEC_HIDDEN; void ME_ClearTempStyle(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) DECLSPEC_HIDDEN; void ME_DumpStyle(ME_Style *s) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 06c0e6f..0d2c16a 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -513,12 +513,13 @@ ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) } } -void ME_SaveTempStyle(ME_TextEditor *editor) +void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) { ME_Style *old_style = editor->pBuffer->pCharStyle; - editor->pBuffer->pCharStyle = ME_GetInsertStyle(editor, 0); - if (old_style) - ME_ReleaseStyle(old_style); + + if (style) ME_AddRefStyle( style ); + editor->pBuffer->pCharStyle = style; + if (old_style) ME_ReleaseStyle( old_style ); } void ME_ClearTempStyle(ME_TextEditor *editor)

1 0

Michael Stefaniuc : dmusic: Support the IKsControl interface for the synth port.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 883fe110ea5225c515c38bdd1e67f65cdeca4609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=883fe110ea5225c515c38bdd1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:36:59 2016 +0200 dmusic: Support the IKsControl interface for the synth port. Based on a patch by Michael Müller. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic_private.h | 1 + dlls/dmusic/port.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dmusic/tests/dmusic.c | 12 +++---- 3 files changed, 84 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 07f5f1d..cfe03fc 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -41,6 +41,7 @@ #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" +#include "dmksctrl.h" /***************************************************************************** * Interfaces diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index b694ef7..07da1ae 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -28,6 +28,7 @@ typedef struct SynthPortImpl { IDirectMusicPort IDirectMusicPort_iface; IDirectMusicPortDownload IDirectMusicPortDownload_iface; IDirectMusicThru IDirectMusicThru_iface; + IKsControl IKsControl_iface; LONG ref; IDirectSound *pDirectSound; IReferenceClock *pLatencyClock; @@ -60,6 +61,11 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface); } +static inline SynthPortImpl *impl_from_IKsControl(IKsControl *iface) +{ + return CONTAINING_RECORD(iface, SynthPortImpl, IKsControl_iface); +} + /* IDirectMusicDownloadedInstrument IUnknown part follows: */ static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirectMusicDownloadedInstrument *iface, REFIID riid, VOID **ret_iface) { @@ -152,6 +158,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI *ret_iface = &This->IDirectMusicPortDownload_iface; else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) *ret_iface = &This->IDirectMusicThru_iface; + else if (IsEqualGUID(riid, &IID_IKsControl)) + *ret_iface = &This->IKsControl_iface; else { WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); *ret_iface = NULL; @@ -686,6 +694,75 @@ static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = { SynthPortImpl_IDirectMusicThru_ThruChannel }; +static HRESULT WINAPI IKsControlImpl_QueryInterface(IKsControl *iface, REFIID riid, + void **ret_iface) +{ + SynthPortImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); +} + +static ULONG WINAPI IKsControlImpl_AddRef(IKsControl *iface) +{ + SynthPortImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); +} + +static ULONG WINAPI IKsControlImpl_Release(IKsControl *iface) +{ + SynthPortImpl *This = impl_from_IKsControl(iface); + + return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); +} + +static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *prop, + ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len) +{ + TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len); + TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags); + + if (prop->Flags != KSPROPERTY_TYPE_GET) + { + FIXME("prop flags %u not yet supported\n", prop->Flags); + return S_FALSE; + } + + if (data_len < sizeof(DWORD)) + return E_NOT_SUFFICIENT_BUFFER; + + FIXME("Unknown property %s\n", debugstr_guid(&prop->Set)); + *(DWORD*)data = FALSE; + *ret_len = sizeof(DWORD); + + return S_OK; +} + +static HRESULT WINAPI IKsControlImpl_KsMethod(IKsControl *iface, KSMETHOD *method, + ULONG method_len, void *data, ULONG data_len, ULONG *ret_len) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, method, method_len, data, data_len, ret_len); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IKsControlImpl_KsEvent(IKsControl *iface, KSEVENT *event, ULONG event_len, + void *data, ULONG data_len, ULONG *ret_len) +{ + FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, event, event_len, data, data_len, ret_len); + + return E_NOTIMPL; +} + +static const IKsControlVtbl ikscontrol_vtbl = { + IKsControlImpl_QueryInterface, + IKsControlImpl_AddRef, + IKsControlImpl_Release, + IKsControlImpl_KsProperty, + IKsControlImpl_KsMethod, + IKsControlImpl_KsEvent +}; + HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { SynthPortImpl *obj; @@ -704,6 +781,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; + obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl; obj->ref = 0; /* Will be inited by QueryInterface */ obj->fActive = FALSE; obj->params = *port_params; diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 69df51d..b56bba4 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -416,17 +416,15 @@ static void test_COM_synthport(void) IDirectMusicPortDownload_Release(dmpd); hr = IDirectMusicPort_QueryInterface(port, &IID_IKsControl, (void**)&iksc); - todo_wine ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); - if (hr == S_OK) { - refcount = IKsControl_AddRef(iksc); - ok(refcount == 5, "refcount == %u, expected 5\n", refcount); - IKsControl_Release(iksc); - } + ok(hr == S_OK, "QueryInterface for IID_IKsControl failed: %08x\n", hr); + refcount = IKsControl_AddRef(iksc); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + IKsControl_Release(iksc); hr = IDirectMusicPort_QueryInterface(port, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); - todo_wine ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); IUnknown_Release(unk); /* Unsupported interface */

1 0

Michael Stefaniuc : dmusic: Move the SynthPortImpl struct to where it is used.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 845bf2ff5994ba7208885c06b2b9863aa1d38dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=845bf2ff5994ba7208885c06b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:28:54 2016 +0200 dmusic: Move the SynthPortImpl struct to where it is used. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic_private.h | 24 ------------------------ dlls/dmusic/port.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 44d5d57..07f5f1d 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -53,8 +53,6 @@ typedef struct IReferenceClockImpl IReferenceClockImpl; typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; -typedef struct SynthPortImpl SynthPortImpl; - /***************************************************************************** * Some stuff to make my life easier :=) */ @@ -159,28 +157,6 @@ struct IDirectMusicDownloadImpl { /* IDirectMusicDownloadImpl fields */ }; -/***************************************************************************** - * SynthPortImpl implementation structure - */ -struct SynthPortImpl { - /* IUnknown fields */ - IDirectMusicPort IDirectMusicPort_iface; - IDirectMusicPortDownload IDirectMusicPortDownload_iface; - IDirectMusicThru IDirectMusicThru_iface; - LONG ref; - - /* IDirectMusicPort fields */ - IDirectSound* pDirectSound; - IReferenceClock* pLatencyClock; - IDirectMusicSynth* synth; - IDirectMusicSynthSink* synth_sink; - BOOL fActive; - DMUS_PORTCAPS caps; - DMUS_PORTPARAMS params; - int nrofgroups; - DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; -}; - /** Internal factory */ extern HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; extern HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) DECLSPEC_HIDDEN; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 95db9e0..b694ef7 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -24,6 +24,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +typedef struct SynthPortImpl { + IDirectMusicPort IDirectMusicPort_iface; + IDirectMusicPortDownload IDirectMusicPortDownload_iface; + IDirectMusicThru IDirectMusicThru_iface; + LONG ref; + IDirectSound *pDirectSound; + IReferenceClock *pLatencyClock; + IDirectMusicSynth *synth; + IDirectMusicSynthSink *synth_sink; + BOOL fActive; + DMUS_PORTCAPS caps; + DMUS_PORTPARAMS params; + int nrofgroups; + DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; +} SynthPortImpl; + static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) { return CONTAINING_RECORD(iface, IDirectMusicDownloadedInstrumentImpl, IDirectMusicDownloadedInstrument_iface);

1 0

Michael Stefaniuc : dmusic: Simplify the IDirectMusicPort_QueryInterface implementation.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: ca87c493902e2e1fe18d1711bd3783fc75c445cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca87c493902e2e1fe18d1711b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 5 10:28:22 2016 +0200 dmusic: Simplify the IDirectMusicPort_QueryInterface implementation. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/port.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index d919c10..95db9e0 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -130,23 +130,21 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) { + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) *ret_iface = &This->IDirectMusicPort_iface; - IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface); - return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) { + else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) *ret_iface = &This->IDirectMusicPortDownload_iface; - IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface); - return S_OK; - } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) { + else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) *ret_iface = &This->IDirectMusicThru_iface; - IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface); - return S_OK; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + *ret_iface = NULL; + return E_NOINTERFACE; } - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + IUnknown_AddRef((IUnknown*)*ret_iface); - return E_NOINTERFACE; + return S_OK; } static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface)

1 0

Huw Davies : riched20: Remove an unnecessary call to ME_SaveTempStyle().
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: beffb6f671a5d420805a05511d812d2fef353bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beffb6f671a5d420805a05511… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 10:08:28 2016 +0100 riched20: Remove an unnecessary call to ME_SaveTempStyle(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d7abaa2..e2a44d3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2576,7 +2576,6 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) { ME_Style *style = ME_GetInsertStyle(editor, 0); - ME_SaveTempStyle(editor, style); ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style);

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 3911780a8bafd3f4b4e71c5d9cf9706d189a34b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3911780a8bafd3f4b4e71c5d9… Author: Kim Malmo <berencamlost(a)msn.com> Date: Wed Oct 5 13:45:53 2016 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index def5854..f547e05 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8108,7 +8108,7 @@ msgstr "Min datamaskin" #: shell32.rc:159 msgid "Control Panel" -msgstr "Control Panel" +msgstr "Kontrollpanel" #: shell32.rc:166 msgid "Select" @@ -8462,7 +8462,7 @@ msgstr "%d byte" #: shlwapi.rc:31 msgctxt "time unit: hours" msgid " hr" -msgstr " hr" +msgstr " t" #: shlwapi.rc:32 msgctxt "time unit: minutes" @@ -8472,7 +8472,7 @@ msgstr " min" #: shlwapi.rc:33 msgctxt "time unit: seconds" msgid " sec" -msgstr " sec" +msgstr " sek" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10217,7 +10217,7 @@ msgstr "" "XCOPY\t\tKopierer kildefiler eller et katalogtre til et mål\n" "EXIT\t\tAvslutter CMD\n" "\n" -"Skriv HELP <kommando> for mer informasjon om kommandoene ovenfor\n" +"Skriv HELP <kommando> for mer informasjon om kommandoene ovenfor.\n" #: cmd.rc:353 msgid "Are you sure?" @@ -11936,8 +11936,8 @@ msgstr "" " /? Vis denne informasjonen og avslutt.\n" " [filnavn] Plasseringen til filen som inneholder registerinformasjonen " "som\n" -" skal importeres. Når brukt med [/E], spesifiserer dette \n" -" alternativet plasseringen hvor registerinformasjonen vil \n" +" skal importeres. Når brukt med [/E], spesifiserer dette\n" +" alternativet plasseringen hvor registerinformasjonen vil\n" " bli eksportert.\n" " [reg_key] Registernøkkelen som skal modifiseres.\n" "\n" @@ -11987,8 +11987,8 @@ msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" -"regedit: Kan ikke konvertere heksadesimale data. En ugyldig verdi " -"inntraffved \"%1\".\n" +"regedit: Kan ikke konvertere heksadesimale data. En ugyldig verdi inntraff " +"ved \"%1\".\n" #: regedit.rc:370 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" @@ -12206,7 +12206,9 @@ msgstr "" msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" -msgstr "regsvr32: Ugyldig eller ukjent bryter [%1]\n" +msgstr "" +"regsvr32: Ugyldig eller ukjent bryter [%1]\n" +"\n" #: regsvr32.rc:42 msgid "regsvr32: Failed to load DLL '%1'\n"

1 0

Hans Leidekker : wbemprox: Fix the variant type for Win32_SystemEnclosure.ChassisTypes.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: 1e32ae8bddb87a93a93ec34eedd35ba8c208f027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e32ae8bddb87a93a93ec34ee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 5 09:46:26 2016 +0200 wbemprox: Fix the variant type for Win32_SystemEnclosure.ChassisTypes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 +- dlls/wbemprox/tests/query.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 13f708f..4beac36 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -629,7 +629,7 @@ static const struct column col_stdregprov[] = static const struct column col_systemenclosure[] = { { prop_captionW, CIM_STRING }, - { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY }, + { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY, VT_I4|VT_ARRAY }, { prop_descriptionW, CIM_STRING }, { prop_lockpresentW, CIM_BOOLEAN }, { prop_manufacturerW, CIM_STRING }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index c0889f9..aab819d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -590,7 +590,6 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantInit( &val ); hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); - todo_wine ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data );

1 0

Hans Leidekker : wbemprox: Return NULL for Win32_BIOS.IdentificationCode.
by Alexandre Julliard Oct. 5, 2016

Oct. 5, 2016

Module: wine Branch: master Commit: f2f57152b22312aa50a5d055f04db2e6d49b4e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f57152b22312aa50a5d055f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 5 09:46:27 2016 +0200 wbemprox: Return NULL for Win32_BIOS.IdentificationCode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 +- dlls/wbemprox/tests/query.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 4beac36..436a351 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1066,7 +1066,7 @@ static const struct record_baseboard data_baseboard[] = }; static const struct record_bios data_bios[] = { - { bios_descriptionW, bios_descriptionW, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, + { bios_descriptionW, NULL, bios_manufacturerW, bios_nameW, bios_releasedateW, bios_serialnumberW, bios_smbiosbiosversionW, bios_versionW } }; static const struct record_computersystemproduct data_compsysproduct[] = diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index aab819d..c31fce0 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -310,7 +310,6 @@ static void test_Win32_Bios( IWbemServices *services ) VariantInit( &val ); hr = IWbemClassObject_Get( obj, identificationcodeW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get identication code %08x\n", hr ); - todo_wine ok( V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); VariantClear( &val );

1 0

Frédéric Delanoy : French translation for release 1.9.20
by Jeremy Newman Oct. 5, 2016

Oct. 5, 2016

Module: website Branch: master Commit: 28798c10dc9d17f5db805cbb96baadfea4f24203 URL: http://source.winehq.org/git/website.git/?a=commit;h=28798c10dc9d17f5db805c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Oct 5 18:57:13 2016 +0200 French translation for release 1.9.20 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016100101.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2016100101.xml b/news/fr/2016100101.xml new file mode 100644 index 0000000..79160bd --- /dev/null +++ b/news/fr/2016100101.xml @@ -0,0 +1,14 @@ +<news> +<date>1er octobre 2016</date> +<title>Sortie de Wine 1.9.20</title> +<body> +La version de développement 1.9.20 de Wine est disponible. +<a href="{$root}/announce/1.9.20">Nouveautés</a> de cette version : +<ul> + <li>Réimplementation de l'API du presse-papiers.</li> + <li>Traitement des messages dans WebServices.</li> + <li>Beaucoup de bibliothèques de jeux d'API supplémentaires.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.20.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0