October 2011 - Wine-commits

Marko Nikolic : comctl32/tests: Removed sign comparison warning in datetime tests.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 154d088eb99e7a31e9f365fc88278a001c96a063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=154d088eb99e7a31e9f365fc8… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Thu Oct 6 12:18:02 2011 +0200 comctl32/tests: Removed sign comparison warning in datetime tests. --- dlls/comctl32/tests/datetime.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index d60ad54..171da5c 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -204,22 +204,21 @@ static void test_dtm_set_format(void) static void test_mccolor_types(HWND hWndDateTime, int mccolor_type, const char* mccolor_name) { - LRESULT r; - COLORREF theColor, prevColor; + COLORREF theColor, prevColor, crColor; theColor=RGB(0,0,0); - r = SendMessage(hWndDateTime, DTM_SETMCCOLOR, mccolor_type, theColor); - ok(r != -1, "%s: Set RGB(0,0,0): Expected COLORREF of previous value, got %ld\n", mccolor_name, r); + crColor = SendMessage(hWndDateTime, DTM_SETMCCOLOR, mccolor_type, theColor); + ok(crColor != ~0u, "%s: Set RGB(0,0,0): Expected COLORREF of previous value, got %d\n", mccolor_name, crColor); prevColor=theColor; theColor=RGB(255,255,255); - r = SendMessage(hWndDateTime, DTM_SETMCCOLOR, mccolor_type, theColor); - ok(r==prevColor, "%s: Set RGB(255,255,255): Expected COLORREF of previous value, got %ld\n", mccolor_name, r); + crColor = SendMessage(hWndDateTime, DTM_SETMCCOLOR, mccolor_type, theColor); + ok(crColor==prevColor, "%s: Set RGB(255,255,255): Expected COLORREF of previous value, got %d\n", mccolor_name, crColor); prevColor=theColor; theColor=RGB(100,180,220); - r = SendMessage(hWndDateTime, DTM_SETMCCOLOR, mccolor_type, theColor); - ok(r==prevColor, "%s: Set RGB(100,180,220): Expected COLORREF of previous value, got %ld\n", mccolor_name, r); - r = SendMessage(hWndDateTime, DTM_GETMCCOLOR, mccolor_type, 0); - ok(r==theColor, "%s: GETMCCOLOR: Expected %d, got %ld\n", mccolor_name, theColor, r); + crColor = SendMessage(hWndDateTime, DTM_SETMCCOLOR, mccolor_type, theColor); + ok(crColor==prevColor, "%s: Set RGB(100,180,220): Expected COLORREF of previous value, got %d\n", mccolor_name, crColor); + crColor = SendMessage(hWndDateTime, DTM_GETMCCOLOR, mccolor_type, 0); + ok(crColor==theColor, "%s: GETMCCOLOR: Expected %d, got %d\n", mccolor_name, theColor, crColor); } static void test_dtm_set_and_get_mccolor(void)

1 0

Hwang YunSong : winecfg: Updated Korean translation.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 750404ee8d8a2f5bacc4cf1a65fe35daaaf026a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750404ee8d8a2f5bacc4cf1a6… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Oct 6 17:34:49 2011 +0900 winecfg: Updated Korean translation. --- programs/winecfg/Ko.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 9a4ee02..c5cdaea 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -168,13 +168,13 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Diagnostics ",IDC_STATIC,8,4,244,27 + GROUPBOX " 드라이버 진단 ",IDC_STATIC,8,4,244,27 LTEXT "",IDC_AUDIO_DRIVER,18,16,230,8 - GROUPBOX " Defaults ",IDC_STATIC,8,33,244,76 - LTEXT "Output device:",IDC_STATIC,18,45,230,8 - LTEXT "Voice output device:",IDC_STATIC,18,61,230,8 - LTEXT "Input device:",IDC_STATIC,18,77,230,8 - LTEXT "Voice input device:",IDC_STATIC,18,93,230,8 + GROUPBOX " 기본 ",IDC_STATIC,8,33,244,76 + LTEXT "출력 장치:",IDC_STATIC,18,45,230,8 + LTEXT "음성 출력 장치:",IDC_STATIC,18,61,230,8 + LTEXT "입력 장치:",IDC_STATIC,18,77,230,8 + LTEXT "음성 입력 장치:",IDC_STATIC,18,93,230,8 COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

1 0

Aric Stewart : usp10: Correct ScriptStringGetLogicalWidths to be based on char not glyph.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 63490ce03837b467e33457469ab55a26f9b4e120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63490ce03837b467e33457469… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 6 08:35:59 2011 -0500 usp10: Correct ScriptStringGetLogicalWidths to be based on char not glyph. --- dlls/usp10/usp10.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b8eee22..14f523f 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2287,9 +2287,12 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD for (i = 0; i < analysis->numItems; i++) { - for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) + int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; + for (j = 0; j < cChar; j++) { - piDx[next] = analysis->glyphs[i].piAdvance[j]; + + int glyph = analysis->glyphs[i].pwLogClust[j]; + piDx[next] = analysis->glyphs[i].piAdvance[glyph]; next++; } }

1 0

Andrew Eikum : dsound: Fix fragment position calculations.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: ecd13dcbef16ccee9ae7785cc60ec63f5772ae19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd13dcbef16ccee9ae7785cc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 6 09:35:07 2011 -0500 dsound: Fix fragment position calculations. --- dlls/dsound/mixer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 936ea3e..8adbdff 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -788,7 +788,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) device->pwqueue += prebuf_frags; prebuf_frames = ((prebuf_frags + wave_fragpos > device->helfrags) ? - (prebuf_frags + wave_fragpos - device->helfrags) : + (device->helfrags - wave_fragpos) : (prebuf_frags)) * device->fraglen / device->pwfx->nBlockAlign; hr = IAudioRenderClient_GetBuffer(device->render, prebuf_frames, &buffer); @@ -859,8 +859,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) return; } - pos_bytes = (clock_pos / (double)clock_freq) * device->pwfx->nSamplesPerSec * - device->pwfx->nBlockAlign; + pos_bytes = ceil(clock_pos * device->pwfx->nBlockAlign * + (clock_freq / (double)device->pwfx->nSamplesPerSec)); delta_frags = (pos_bytes - device->last_pos_bytes) / device->fraglen; if(delta_frags > 0){

1 0

Nikolay Sivov : msxml3: Add some useful traces and demangle some parameter names.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: d65f29881708aa487fd223811dea01f6f9c24c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65f29881708aa487fd223811… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 14:19:29 2011 -0500 msxml3: Add some useful traces and demangle some parameter names. --- dlls/msxml3/saxreader.c | 64 +++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index d3f2ec0..0be595c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -824,18 +824,20 @@ static HRESULT WINAPI isaxattributes_getLength( static HRESULT WINAPI isaxattributes_getURI( ISAXAttributes* iface, - int nIndex, - const WCHAR **pUrl, - int *pUriSize) + int index, + const WCHAR **url, + int *size) { saxattributes *This = impl_from_ISAXAttributes( iface ); - TRACE("(%p)->(%d)\n", This, nIndex); + TRACE("(%p)->(%d)\n", This, index); - if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; - if(!pUrl || !pUriSize) return E_POINTER; + if(index >= This->nb_attributes || index < 0) return E_INVALIDARG; + if(!url || !size) return E_POINTER; - *pUriSize = SysStringLen(This->szURI[nIndex]); - *pUrl = This->szURI[nIndex]; + *size = SysStringLen(This->szURI[index]); + *url = This->szURI[index]; + + TRACE("(%s:%d)\n", debugstr_w(This->szURI[index]), *size); return S_OK; } @@ -878,27 +880,29 @@ static HRESULT WINAPI isaxattributes_getQName( static HRESULT WINAPI isaxattributes_getName( ISAXAttributes* iface, - int nIndex, - const WCHAR **pUri, + int index, + const WCHAR **uri, int *pUriLength, - const WCHAR **pLocalName, + const WCHAR **localName, int *pLocalNameSize, - const WCHAR **pQName, + const WCHAR **QName, int *pQNameLength) { saxattributes *This = impl_from_ISAXAttributes( iface ); - TRACE("(%p)->(%d)\n", This, nIndex); + TRACE("(%p)->(%d)\n", This, index); - if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; - if(!pUri || !pUriLength || !pLocalName || !pLocalNameSize - || !pQName || !pQNameLength) return E_POINTER; + if(index>=This->nb_attributes || index<0) return E_INVALIDARG; + if(!uri || !pUriLength || !localName || !pLocalNameSize + || !QName || !pQNameLength) return E_POINTER; - *pUriLength = SysStringLen(This->szURI[nIndex]); - *pUri = This->szURI[nIndex]; - *pLocalNameSize = SysStringLen(This->szLocalname[nIndex]); - *pLocalName = This->szLocalname[nIndex]; - *pQNameLength = SysStringLen(This->szQName[nIndex]); - *pQName = This->szQName[nIndex]; + *pUriLength = SysStringLen(This->szURI[index]); + *uri = This->szURI[index]; + *pLocalNameSize = SysStringLen(This->szLocalname[index]); + *localName = This->szLocalname[index]; + *pQNameLength = SysStringLen(This->szQName[index]); + *QName = This->szQName[index]; + + TRACE("(%s, %s, %s)\n", debugstr_w(*uri), debugstr_w(*localName), debugstr_w(*QName)); return S_OK; } @@ -1005,18 +1009,20 @@ static HRESULT WINAPI isaxattributes_getTypeFromQName( static HRESULT WINAPI isaxattributes_getValue( ISAXAttributes* iface, - int nIndex, - const WCHAR **pValue, + int index, + const WCHAR **value, int *nValue) { saxattributes *This = impl_from_ISAXAttributes( iface ); - TRACE("(%p)->(%d)\n", This, nIndex); + TRACE("(%p)->(%d)\n", This, index); - if(nIndex>=This->nb_attributes || nIndex<0) return E_INVALIDARG; - if(!pValue || !nValue) return E_POINTER; + if(index>=This->nb_attributes || index<0) return E_INVALIDARG; + if(!value || !nValue) return E_POINTER; + + *nValue = SysStringLen(This->szValue[index]); + *value = This->szValue[index]; - *nValue = SysStringLen(This->szValue[nIndex]); - *pValue = This->szValue[nIndex]; + TRACE("(%s:%d)\n", debugstr_w(*value), *nValue); return S_OK; }

1 0

Nikolay Sivov : msxml3: Use helper to set properties.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 5931af0283c7426f2d19f7d1ae5f73cdef6e57ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5931af0283c7426f2d19f7d1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 6 10:22:00 2011 -0500 msxml3: Use helper to set properties. --- dlls/msxml3/mxwriter.c | 32 ++++++++++++-------------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a863336..0214d80 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -179,6 +179,13 @@ static inline void reset_output_buffer(mxwriter *This) This->dest_written = 0; } +static HRESULT writer_set_property(mxwriter *writer, MXWRITER_PROPS property, VARIANT_BOOL value) +{ + writer->props[property] = value; + writer->prop_changed = TRUE; + return S_OK; +} + static inline mxwriter *impl_from_IMXWriter(IMXWriter *iface) { return CONTAINING_RECORD(iface, mxwriter, IMXWriter_iface); @@ -454,10 +461,7 @@ static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%d)\n", This, value); - This->props[MXWriter_BOM] = value; - This->prop_changed = TRUE; - - return S_OK; + return writer_set_property(This, MXWriter_BOM, value); } static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL *value) @@ -478,10 +482,7 @@ static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL value) mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%d)\n", This, value); - This->props[MXWriter_Indent] = value; - This->prop_changed = TRUE; - - return S_OK; + return writer_set_property(This, MXWriter_Indent, value); } static HRESULT WINAPI mxwriter_get_indent(IMXWriter *iface, VARIANT_BOOL *value) @@ -502,10 +503,7 @@ static HRESULT WINAPI mxwriter_put_standalone(IMXWriter *iface, VARIANT_BOOL val mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%d)\n", This, value); - This->props[MXWriter_Standalone] = value; - This->prop_changed = TRUE; - - return S_OK; + return writer_set_property(This, MXWriter_Standalone, value); } static HRESULT WINAPI mxwriter_get_standalone(IMXWriter *iface, VARIANT_BOOL *value) @@ -526,10 +524,7 @@ static HRESULT WINAPI mxwriter_put_omitXMLDeclaration(IMXWriter *iface, VARIANT_ mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%d)\n", This, value); - This->props[MXWriter_OmitXmlDecl] = value; - This->prop_changed = TRUE; - - return S_OK; + return writer_set_property(This, MXWriter_OmitXmlDecl, value); } static HRESULT WINAPI mxwriter_get_omitXMLDeclaration(IMXWriter *iface, VARIANT_BOOL *value) @@ -575,10 +570,7 @@ static HRESULT WINAPI mxwriter_put_disableOutputEscaping(IMXWriter *iface, VARIA mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%d)\n", This, value); - This->props[MXWriter_DisableEscaping] = value; - This->prop_changed = TRUE; - - return S_OK; + return writer_set_property(This, MXWriter_DisableEscaping, value); } static HRESULT WINAPI mxwriter_get_disableOutputEscaping(IMXWriter *iface, VARIANT_BOOL *value)

1 0

Nikolay Sivov : msxml3: Use a helper to get property values.
by Alexandre Julliard 06 Oct '11

06 Oct '11

Module: wine Branch: master Commit: 35b59556064e773ee3e51c7b0cdb98caf2970c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b59556064e773ee3e51c7b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 6 10:35:07 2011 -0500 msxml3: Use a helper to get property values. --- dlls/msxml3/mxwriter.c | 42 ++++++++++++------------------------------ 1 files changed, 12 insertions(+), 30 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 0214d80..cc75d1d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -186,6 +186,13 @@ static HRESULT writer_set_property(mxwriter *writer, MXWRITER_PROPS property, VA return S_OK; } +static HRESULT writer_get_property(const mxwriter *writer, MXWRITER_PROPS property, VARIANT_BOOL *value) +{ + if (!value) return E_POINTER; + *value = writer->props[property]; + return S_OK; +} + static inline mxwriter *impl_from_IMXWriter(IMXWriter *iface) { return CONTAINING_RECORD(iface, mxwriter, IMXWriter_iface); @@ -469,12 +476,7 @@ static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%p)\n", This, value); - - if (!value) return E_POINTER; - - *value = This->props[MXWriter_BOM]; - - return S_OK; + return writer_get_property(This, MXWriter_BOM, value); } static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL value) @@ -490,12 +492,7 @@ static HRESULT WINAPI mxwriter_get_indent(IMXWriter *iface, VARIANT_BOOL *value) mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%p)\n", This, value); - - if (!value) return E_POINTER; - - *value = This->props[MXWriter_Indent]; - - return S_OK; + return writer_get_property(This, MXWriter_Indent, value); } static HRESULT WINAPI mxwriter_put_standalone(IMXWriter *iface, VARIANT_BOOL value) @@ -511,12 +508,7 @@ static HRESULT WINAPI mxwriter_get_standalone(IMXWriter *iface, VARIANT_BOOL *va mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%p)\n", This, value); - - if (!value) return E_POINTER; - - *value = This->props[MXWriter_Standalone]; - - return S_OK; + return writer_get_property(This, MXWriter_Standalone, value); } static HRESULT WINAPI mxwriter_put_omitXMLDeclaration(IMXWriter *iface, VARIANT_BOOL value) @@ -532,12 +524,7 @@ static HRESULT WINAPI mxwriter_get_omitXMLDeclaration(IMXWriter *iface, VARIANT_ mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%p)\n", This, value); - - if (!value) return E_POINTER; - - *value = This->props[MXWriter_OmitXmlDecl]; - - return S_OK; + return writer_get_property(This, MXWriter_OmitXmlDecl, value); } static HRESULT WINAPI mxwriter_put_version(IMXWriter *iface, BSTR version) @@ -578,12 +565,7 @@ static HRESULT WINAPI mxwriter_get_disableOutputEscaping(IMXWriter *iface, VARIA mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%p)\n", This, value); - - if (!value) return E_POINTER; - - *value = This->props[MXWriter_DisableEscaping]; - - return S_OK; + return writer_get_property(This, MXWriter_DisableEscaping, value); } static HRESULT WINAPI mxwriter_flush(IMXWriter *iface)

1 0

Eric Pouech : winedbg: Don't assert() on unsupported v-packets, but rather report an error.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: a971d8657c8b2953f9c51434bfc8ac6653fb8373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a971d8657c8b2953f9c51434b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Oct 5 22:41:10 2011 +0200 winedbg: Don't assert() on unsupported v-packets, but rather report an error. --- programs/winedbg/gdbproxy.c | 64 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 54 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index e81f72c..1a30947 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -999,7 +999,7 @@ static enum packet_return packet_continue(struct gdb_context* gdbctx) return packet_reply_status(gdbctx); } -static enum packet_return packet_verbose(struct gdb_context* gdbctx) +static enum packet_return packet_verbose_cont(struct gdb_context* gdbctx) { int i; int defaultAction = -1; /* magic non action */ @@ -1012,9 +1012,6 @@ static enum packet_return packet_verbose(struct gdb_context* gdbctx) unsigned int threadID = 0; struct dbg_thread* thd; - /* basic check */ - assert(gdbctx->in_packet_len >= 4); - /* OK we have vCont followed by.. * ? for query * c for packet_continue @@ -1024,11 +1021,6 @@ static enum packet_return packet_verbose(struct gdb_context* gdbctx) * and then an optional thread ID at the end.. * *******************************************/ - if (gdbctx->trace & GDBPXY_TRC_COMMAND) - fprintf(stderr, "trying to process a verbose packet\n"); - /* now check that we've got Cont */ - assert(strncmp(gdbctx->in_packet, "Cont", 4) == 0); - /* Query */ if (gdbctx->in_packet[4] == '?') { @@ -1095,7 +1087,7 @@ static enum packet_return packet_verbose(struct gdb_context* gdbctx) * (they're running winedbg, so I'm sure they can fix the problem from the error message!) */ if (threadCount == 100) { - fprintf(stderr, "Wow, that's a lot of threads, change threadIDs in wine/programms/winedgb/gdbproxy.c to be higher\n"); + fprintf(stderr, "Wow, that's a lot of threads, change threadIDs in wine/programms/winedbg/gdbproxy.c to be higher\n"); break; } } @@ -1198,6 +1190,58 @@ static enum packet_return packet_verbose(struct gdb_context* gdbctx) return packet_reply_status(gdbctx); } +struct verbose_defail +{ + const char* name; + unsigned len; + enum packet_return (*handler)(struct gdb_context*); +} verbose_details[] = +{ + /* {"Attach", 6}, */ + {"Cont", 4, packet_verbose_cont}, + /* {"File", 4}, + {"FlashErase", 10}, + {"FlashWrite", 10}, + {"FlashDone", 9}, + {"Kill", 4}, + {"Run", 3}, + {"Stopped", 7},*/ +}; + +static enum packet_return packet_verbose(struct gdb_context* gdbctx) +{ + unsigned i; + unsigned klen; + + for (klen = 0; ; klen++) + { + if (klen == gdbctx->in_packet_len || + gdbctx->in_packet[klen] == ';' || + gdbctx->in_packet[klen] == ':' || + gdbctx->in_packet[klen] == '?') + { + if (gdbctx->trace & GDBPXY_TRC_COMMAND) + fprintf(stderr, "trying to process a verbose packet %*.*s\n", + gdbctx->in_packet_len, gdbctx->in_packet_len, gdbctx->in_packet); + for (i = 0; i < sizeof(verbose_details)/sizeof(verbose_details[0]); i++) + { + if (klen == verbose_details[i].len && + !memcmp(gdbctx->in_packet, verbose_details[i].name, verbose_details[i].len)) + { + return verbose_details[i].handler(gdbctx); + } + } + /* no matching handler found, abort */ + break; + } + } + + if (gdbctx->trace & GDBPXY_TRC_COMMAND_FIXME) + fprintf(stderr, "No support for verbose packet %*.*s\n", + gdbctx->in_packet_len, gdbctx->in_packet_len, gdbctx->in_packet); + return packet_error; + } + static enum packet_return packet_continue_signal(struct gdb_context* gdbctx) { unsigned char sig;

1 0

Andrew Eikum : dsound: Remove a few unused variables.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: cec8e0d73af0095aa6b497ee69066f6c483cfe8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec8e0d73af0095aa6b497ee6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 5 15:53:16 2011 -0500 dsound: Remove a few unused variables. --- dlls/dsound/dsound_main.c | 15 --------------- dlls/dsound/dsound_private.h | 1 - 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 65728e2..02edf88 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -108,14 +108,11 @@ HRESULT mmErr(UINT err) } /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ -int ds_emuldriver = 0; int ds_hel_buflen = 32768 * 2; int ds_snd_queue_max = 10; int ds_snd_shadow_maxsize = 2; int ds_default_sample_rate = 44100; int ds_default_bits_per_sample = 16; -static int ds_default_playback; -static int ds_default_capture; static HINSTANCE instance; /* @@ -165,24 +162,15 @@ void setup_dsound_options(void) /* get options */ - if (!get_config_key( hkey, appkey, "EmulDriver", buffer, MAX_PATH )) - ds_emuldriver = strcmp(buffer, "N"); - if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH )) ds_hel_buflen = atoi(buffer); if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) ds_snd_queue_max = atoi(buffer); - if (!get_config_key( hkey, appkey, "DefaultPlayback", buffer, MAX_PATH )) - ds_default_playback = atoi(buffer); - if (!get_config_key( hkey, appkey, "MaxShadowSize", buffer, MAX_PATH )) ds_snd_shadow_maxsize = atoi(buffer); - if (!get_config_key( hkey, appkey, "DefaultCapture", buffer, MAX_PATH )) - ds_default_capture = atoi(buffer); - if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH )) ds_default_sample_rate = atoi(buffer); @@ -192,11 +180,8 @@ void setup_dsound_options(void) if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); - TRACE("ds_emuldriver = %d\n", ds_emuldriver); TRACE("ds_hel_buflen = %d\n", ds_hel_buflen); TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max); - TRACE("ds_default_playback = %d\n", ds_default_playback); - TRACE("ds_default_capture = %d\n", ds_default_capture); TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate); TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample); TRACE("ds_snd_shadow_maxsize = %d\n", ds_snd_shadow_maxsize); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 075f914..3abfb97 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -30,7 +30,6 @@ #include "wine/list.h" -extern int ds_emuldriver DECLSPEC_HIDDEN; extern int ds_hel_buflen DECLSPEC_HIDDEN; extern int ds_snd_queue_max DECLSPEC_HIDDEN; extern int ds_snd_shadow_maxsize DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : msxml3: Use provided qualified name length while writing end element tag.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 54326116da3b0f439baef39db34607038d28a39d URL: http://source.winehq.org/git/wine.git/?a=commit;h=54326116da3b0f439baef39db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 16:04:04 2011 -0500 msxml3: Use provided qualified name length while writing end element tag. --- dlls/msxml3/mxwriter.c | 14 +++++++------- dlls/msxml3/tests/saxreader.c | 13 ++++++++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b08fd0b..a863336 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -822,28 +822,28 @@ static HRESULT WINAPI mxwriter_saxcontent_endElement( int nQName) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - xmlChar *s; - TRACE("(%p)->(%s %s %s)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), - debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName)); + TRACE("(%p)->(%s:%d %s:%d %s:%d)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), nnamespaceUri, + debugstr_wn(local_name, nlocal_name), nlocal_name, debugstr_wn(QName, nQName), nQName); if ((!namespaceUri || !local_name || !QName) && This->class_version != MSXML6) return E_INVALIDARG; - s = xmlchar_from_wchar(QName); - - if (This->element && QName && !strcmpW(This->element, QName)) + if (This->element && QName && !strncmpW(This->element, QName, nQName)) { xmlOutputBufferWriteString(This->buffer, "/>"); } else { + xmlChar *s = xmlchar_from_wcharn(QName, nQName); + xmlOutputBufferWriteString(This->buffer, "</"); xmlOutputBufferWriteString(This->buffer, (char*)s); xmlOutputBufferWriteString(This->buffer, ">"); + + heap_free(s); } - heap_free(s); set_element_name(This, NULL, 0); return S_OK; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 6493776..c52e03b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2069,9 +2069,20 @@ static void test_mxwriter_startendelement(void) ok(!lstrcmpW(_bstr_("<abc>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + ISAXContentHandler_endDocument(content); + IMXWriter_flush(writer); + + hr = ISAXContentHandler_endElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("abdcdef"), 3); + EXPECT_HR(hr, S_OK); + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<abc></abd>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); IMXWriter_Release(writer); - free_bstrs(); }

1 0