September 2011 - Wine-Commits

Frédéric Delanoy : cmd/tests: Don' t convert lines with DOS endings in convert_input_data.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: f00aafae856c430a1663c8f27dca2f2ee3b4ca84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00aafae856c430a1663c8f27… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 12:53:49 2011 +0200 cmd/tests: Don't convert lines with DOS endings in convert_input_data. --- programs/cmd/tests/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 58d75c3..8347c03 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -47,7 +47,8 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s for (i = 0; i < size; i++) { switch (data[i]) { case '\n': - *ptr++ = '\r'; + if (data[i-1] != '\r') + *ptr++ = '\r'; *ptr++ = '\n'; break; case '@':

1 0

Huw Davies : gdi32: Use a separate variable to indicate the default has been retrieved.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: b4430319f16753270397e11310ac327736d438a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4430319f16753270397e1131… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 28 13:46:48 2011 +0100 gdi32: Use a separate variable to indicate the default has been retrieved. --- dlls/gdi32/freetype.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d71b0c5..81c704b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4602,16 +4602,21 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags) { int i; - int default_char = -1; + WORD default_char; + BOOL got_default = FALSE; - if (flags & GGI_MARK_NONEXISTING_GLYPHS) default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + if (flags & GGI_MARK_NONEXISTING_GLYPHS) + { + default_char = 0xffff; /* XP would use 0x1f for bitmap fonts */ + got_default = TRUE; + } for(i = 0; i < count; i++) { pgi[i] = get_glyph_index(font, lpstr[i]); if (pgi[i] == 0) { - if (default_char == -1) + if (!got_default) { if (FT_IS_SFNT(font->ft_face)) { @@ -4624,6 +4629,7 @@ DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, WineEngGetTextMetrics(font, &textm); default_char = textm.tmDefaultChar; } + got_default = TRUE; } pgi[i] = default_char; }

1 0

Alistair Leslie-Hughes : mscoree: Add ICorDebug interface support.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: bef72c48846b0bab3bb91f1bbe34afc41bc68573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bef72c48846b0bab3bb91f1bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 27 09:06:18 2011 +1000 mscoree: Add ICorDebug interface support. --- dlls/mscoree/Makefile.in | 1 + dlls/mscoree/assembly.c | 2 + dlls/mscoree/config.c | 3 + dlls/mscoree/cordebug.c | 177 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/corruntimehost.c | 22 ++--- dlls/mscoree/metadata.c | 4 +- dlls/mscoree/metahost.c | 7 +- dlls/mscoree/mscoree_main.c | 45 +++++++++- dlls/mscoree/mscoree_private.h | 44 +++++++--- dlls/mscoree/tests/Makefile.in | 1 + dlls/mscoree/tests/debugging.c | 106 ++++++++++++++++++++++++ include/cordebug.idl | 5 + include/metahost.idl | 1 + 13 files changed, 385 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bef72c48846b0bab3bb91…

1 0

Alexandre Julliard : winex11: Get rid of the client-side DIB optimization in StretchBlt.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 6e80c49fc916acd6a534de990dc97968839dc7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e80c49fc916acd6a534de990… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 11:12:14 2011 +0200 winex11: Get rid of the client-side DIB optimization in StretchBlt. --- dlls/winex11.drv/bitblt.c | 23 ++--------------------- dlls/winex11.drv/xrender.c | 17 ++--------------- 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 4c7246e..34d4c05 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1315,7 +1315,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, X11DRV_PDEVICE *physDevSrc = get_x11drv_dev( src_dev ); BOOL fStretch; INT width, height; - INT sDst, sSrc = DIB_Status_None; const BYTE *opcode; Pixmap src_pixmap; GC tmpGC; @@ -1328,25 +1327,11 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, fStretch = (src->width != dst->width) || (src->height != dst->height); - if (physDevDst != physDevSrc) - sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None ); - width = dst->visrect.right - dst->visrect.left; height = dst->visrect.bottom - dst->visrect.top; - sDst = X11DRV_LockDIBSection( physDevDst, DIB_Status_None ); - if (physDevDst == physDevSrc) sSrc = sDst; - - /* try client-side DIB copy */ - if (!fStretch && sSrc == DIB_Status_AppMod) - { - if (physDevDst != physDevSrc) X11DRV_UnlockDIBSection( physDevSrc, FALSE ); - X11DRV_UnlockDIBSection( physDevDst, TRUE ); - dst_dev = GET_NEXT_PHYSDEV( dst_dev, pStretchBlt ); - return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); - } - - X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod ); + X11DRV_LockDIBSection( physDevDst, DIB_Status_GdiMod ); + if (physDevDst != physDevSrc) X11DRV_LockDIBSection( physDevSrc, DIB_Status_GdiMod ); opcode = BITBLT_Opcodes[(rop >> 16) & 0xff]; @@ -1359,7 +1344,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); wine_tsx11_unlock(); - if (physDevSrc != physDevDst) X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); wine_tsx11_lock(); XCopyArea( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, @@ -1376,7 +1360,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { int fg, bg; - X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); get_colors(physDevDst, physDevSrc, &fg, &bg); wine_tsx11_lock(); XSetBackground( gdi_display, physDevDst->gc, fg ); @@ -1402,8 +1385,6 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, src_pixmap = XCreatePixmap( gdi_display, root_window, width, height, physDevDst->depth ); wine_tsx11_unlock(); - if (physDevDst != physDevSrc) X11DRV_CoerceDIBSection( physDevSrc, DIB_Status_GdiMod ); - if (fStretch) BITBLT_GetSrcAreaStretch( physDevSrc, physDevDst, src_pixmap, tmpGC, src, dst ); else diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a51543b..e37ddc2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2609,7 +2609,6 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, { struct xrender_physdev *physdev_dst = get_xrender_dev( dst_dev ); struct xrender_physdev *physdev_src = get_xrender_dev( src_dev ); - INT sSrc, sDst; BOOL stretch = (src->width != dst->width) || (src->height != dst->height); if (src_dev->funcs != dst_dev->funcs) @@ -2627,20 +2626,8 @@ static BOOL xrenderdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, /* if not stretching, we only need to handle format conversion */ if (!stretch && physdev_dst->format == physdev_src->format) goto x11drv_fallback; - sSrc = sDst = X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_None ); - if (physdev_dst != physdev_src) sSrc = X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_None ); - - /* try client-side DIB copy */ - if (!stretch && sSrc == DIB_Status_AppMod) - { - if (physdev_dst != physdev_src) X11DRV_UnlockDIBSection( physdev_src->x11dev, FALSE ); - X11DRV_UnlockDIBSection( physdev_dst->x11dev, TRUE ); - dst_dev = GET_NEXT_PHYSDEV( dst_dev, pStretchBlt ); - return dst_dev->funcs->pStretchBlt( dst_dev, dst, src_dev, src, rop ); - } - - X11DRV_CoerceDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); - if (physdev_dst != physdev_src) X11DRV_CoerceDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); + X11DRV_LockDIBSection( physdev_dst->x11dev, DIB_Status_GdiMod ); + if (physdev_dst != physdev_src) X11DRV_LockDIBSection( physdev_src->x11dev, DIB_Status_GdiMod ); if (rop != SRCCOPY) {

1 0

Andrew Eikum : wineoss.drv: Use a temporary OSS device to check format support.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: fdda702acd1a9ace6925845ec50edcf5e1023c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdda702acd1a9ace6925845ec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 28 13:32:03 2011 -0500 wineoss.drv: Use a temporary OSS device to check format support. --- dlls/wineoss.drv/mmdevdrv.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8d1a997..5de0a15 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -667,7 +667,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) return ret; } -static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, +static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, WAVEFORMATEX **out, BOOL query) { int tmp, oss_format; @@ -682,7 +682,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, tmp = oss_format = get_oss_format(fmt); if(oss_format < 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; - if(ioctl(This->fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ WARN("SETFMT failed: %d (%s)\n", errno, strerror(errno)); return E_FAIL; } @@ -696,7 +696,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, return E_OUTOFMEMORY; tmp = fmt->nSamplesPerSec; - if(ioctl(This->fd, SNDCTL_DSP_SPEED, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0){ WARN("SPEED failed: %d (%s)\n", errno, strerror(errno)); CoTaskMemFree(closest); return E_FAIL; @@ -708,7 +708,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, } tmp = fmt->nChannels; - if(ioctl(This->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ WARN("CHANNELS failed: %d (%s)\n", errno, strerror(errno)); CoTaskMemFree(closest); return E_FAIL; @@ -862,7 +862,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This, fmt, NULL, FALSE); + hr = setup_oss_device(This->fd, fmt, NULL, FALSE); if(hr == S_FALSE){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -1082,6 +1082,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); + int fd = -1; HRESULT ret; TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); @@ -1098,11 +1099,20 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - EnterCriticalSection(&This->lock); + if(This->dataflow == eRender) + fd = open(This->ai.devnode, O_WRONLY, 0); + else if(This->dataflow == eCapture) + fd = open(This->ai.devnode, O_RDONLY, 0); + + if(fd < 0){ + ERR("Unable to open device %s: %d (%s)\n", This->ai.devnode, errno, + strerror(errno)); + return AUDCLNT_E_DEVICE_INVALIDATED; + } - ret = setup_oss_device(This, pwfx, outpwfx, TRUE); + ret = setup_oss_device(fd, pwfx, outpwfx, TRUE); - LeaveCriticalSection(&This->lock); + close(fd); return ret; }

1 0

Andrew Eikum : mmdevapi: Don't fail if dwChannelMask is not set correctly.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: f7364dfb4b203b74700eead1836e208a49872244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7364dfb4b203b74700eead18… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 28 13:31:40 2011 -0500 mmdevapi: Don't fail if dwChannelMask is not set correctly. --- dlls/mmdevapi/tests/render.c | 41 +++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 1 + dlls/winecoreaudio.drv/mmdevdrv.c | 6 +++++ dlls/wineoss.drv/mmdevdrv.c | 9 ++++--- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index ce5247d..494c00d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -220,6 +220,47 @@ static void test_audioclient(void) NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; + WAVEFORMATEX *fmt2 = NULL; + + ok(fmtex->dwChannelMask != 0, "Got empty dwChannelMask\n"); + + fmtex->dwChannelMask = 0xffff; + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + + IAudioClient_Release(ac); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + fmtex->dwChannelMask = 0; + + hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &fmt2); + ok(hr == S_OK, "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); + ok(fmtex->dwChannelMask == 0, "Passed format was modified\n"); + + CoTaskMemFree(fmt2); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize(dwChannelMask = 0) returns %08x\n", hr); + + IAudioClient_Release(ac); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + CoTaskMemFree(pwfx); + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + }else + skip("Skipping dwChannelMask tests\n"); + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index af367ba..e1f1a49 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1383,6 +1383,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != mask) hr = S_FALSE; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index be4ae84..26c154f 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1118,6 +1118,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; AudioQueueRef aqueue; HRESULT hr; @@ -1135,6 +1136,11 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && + fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + OSSpinLockLock(&This->lock); hr = ca_setup_aqueue(This->adevid, This->dataflow, pwfx, NULL, &aqueue); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c34d809..8d1a997 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -668,7 +668,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) } static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, - WAVEFORMATEX **out) + WAVEFORMATEX **out, BOOL query) { int tmp, oss_format; double tenth; @@ -723,7 +723,8 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + if(query && fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != mask) ret = S_FALSE; } @@ -861,7 +862,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This, fmt, NULL); + hr = setup_oss_device(This, fmt, NULL, FALSE); if(hr == S_FALSE){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -1099,7 +1100,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, EnterCriticalSection(&This->lock); - ret = setup_oss_device(This, pwfx, outpwfx); + ret = setup_oss_device(This, pwfx, outpwfx, TRUE); LeaveCriticalSection(&This->lock);

1 0

Francois Gouget : browseui/tests: Skip some tests if IEnumACString is not supported.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 80d8275f814ac44f974e96dc805c896f795becb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d8275f814ac44f974e96dc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 28 17:37:24 2011 +0200 browseui/tests: Skip some tests if IEnumACString is not supported. --- dlls/browseui/tests/autocomplete.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index bd2117e..120a5b0 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -238,6 +238,7 @@ static void test_ACLMulti(void) WCHAR exp[] = {'A','B','C',0}; IEnumString *obj; IEnumACString *unk; + HRESULT hr; TestACL *acl1, *acl2; IACList *acl; IObjMgr *mgr; @@ -252,9 +253,15 @@ static void test_ACLMulti(void) "Unexpected interface IACList2 in ACLMulti\n"); stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr)); - todo_wine ole_ok(obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk)); - if (unk != NULL) - unk->lpVtbl->Release(unk); + hr = obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); + if (hr == E_NOINTERFACE) + todo_wine win_skip("IEnumACString is not supported, skipping tests\n"); + else + { + ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr); + if (unk != NULL) + unk->lpVtbl->Release(unk); + } ok(obj->lpVtbl->Next(obj, 1, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); ok(i == 0, "Unexpected fetched value %d\n", i);

1 0

Frédéric Delanoy : cmd: Avoid reading char by char from console.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: a7e1c22a485fb7b87e2c344b472f7e6778d5eafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e1c22a485fb7b87e2c344b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:20 2011 +0200 cmd: Avoid reading char by char from console. --- programs/cmd/batch.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index c5e73c6..5007db3 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -181,13 +181,23 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { * the LF (or CRLF) from the line. */ -WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) { - - DWORD bytes; +WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) +{ + DWORD bytes, charsRead; BOOL status; WCHAR *p; p = s; + if ((status = ReadConsoleW(h, s, noChars, &charsRead, NULL))) { + s[charsRead-2] = '\0'; /* Strip \r\n */ + return p; + } + + /* Continue only if we have no console (i.e. a file) handle */ + if (GetLastError() != ERROR_INVALID_HANDLE) + return NULL; + + /* TODO: More intelligent buffering for reading lines from files */ do { status = WCMD_ReadFile (h, s, 1, &bytes, NULL); if ((status == 0) || ((bytes == 0) && (s == p))) return NULL;

1 0

Frédéric Delanoy : msvcrt/tests: Remove dead assignments (Clang).
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 3274475299252a414b7abfefc7653ab55682a9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3274475299252a414b7abfefc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 26 15:52:36 2011 +0200 msvcrt/tests: Remove dead assignments (Clang). --- dlls/msvcrt/tests/file.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 09a88c8..e7b7353 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -130,15 +130,15 @@ static void test_fileops( void ) ok(buffer[0] == outbuffer[strlen(outbuffer)-1],"fgets exchanged chars for bufmode=%x\n", bufmodes[bufmode]); rewind(file); - for (i = 0, c = EOF; i < sizeof(outbuffer); i++) + for (i = 0; i < sizeof(outbuffer); i++) { - ok((c = fgetc(file)) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == outbuffer[i], "fgetc returned wrong data for bufmode=%x\n", bufmodes[bufmode]); } ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(ungetc(c, file) == EOF, "ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof after ungetc(EOF) did not return EOF for bufmode=%x\n", bufmodes[bufmode]); - ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); c = outbuffer[sizeof(outbuffer) - 1]; ok(ungetc(c, file) == c, "ungetc did not return its input for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after ungetc returned EOF for bufmode=%x\n", bufmodes[bufmode]); @@ -146,7 +146,7 @@ static void test_fileops( void ) ok(c == outbuffer[sizeof(outbuffer) - 1], "getc did not return ungetc'd data for bufmode=%x\n", bufmodes[bufmode]); ok(!feof(file), "feof after getc returned EOF prematurely for bufmode=%x\n", bufmodes[bufmode]); - ok((c = fgetc(file)) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); + ok(fgetc(file) == EOF, "getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); ok(feof(file), "feof after getc did not return EOF for bufmode=%x\n", bufmodes[bufmode]); rewind(file);

1 0

Erich Hoover : hhctrl.ocx: Default to the correct tab for different HH_DISPLAY_* values.
by Alexandre Julliard Sept. 28, 2011

Sept. 28, 2011

Module: wine Branch: master Commit: 973237996b6d4573b2469b5c4951bb31a239fd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=973237996b6d4573b2469b5c4… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 20:01:38 2011 -0600 hhctrl.ocx: Default to the correct tab for different HH_DISPLAY_* values. --- dlls/hhctrl.ocx/hhctrl.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 02d3b7d..2747dcb 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -159,12 +159,13 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat { case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: + case HH_DISPLAY_INDEX: case HH_DISPLAY_SEARCH:{ HHInfo *info; BOOL res; + NMHDR nmhdr; const WCHAR *index = NULL; - - FIXME("Not all HH cases handled correctly\n"); + int tab_index = TAB_CONTENTS; if (!filename) return NULL; @@ -192,6 +193,32 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat ReleaseHelpViewer(info); return NULL; } + + switch(command) + { + case HH_DISPLAY_TOPIC: + case HH_DISPLAY_TOC: + tab_index = TAB_CONTENTS; + if (data) + FIXME("Should jump to topic '%s'.\n", debugstr_w((WCHAR *)data)); + break; + case HH_DISPLAY_INDEX: + tab_index = TAB_INDEX; + if (data) + FIXME("Should select keyword '%s'.\n", debugstr_w((WCHAR *)data)); + break; + case HH_DISPLAY_SEARCH: + tab_index = TAB_SEARCH; + if (data) + FIXME("Should display search specified by HH_FTS_QUERY structure.\n"); + break; + } + /* open the requested tab */ + memset(&nmhdr, 0, sizeof(nmhdr)); + nmhdr.code = TCN_SELCHANGE; + SendMessageW(info->hwndTabCtrl, TCM_SETCURSEL, (WPARAM)info->tabs[tab_index].id, 0); + SendMessageW(info->WinType.hwndNavigation, WM_NOTIFY, 0, (LPARAM)&nmhdr); + return info->WinType.hwndHelp; } case HH_HELP_CONTEXT: {

1 0