October 2011 - Wine-Commits

Huw Davies : gdi32: Move to a more scalable mechanism for picking the default fonts.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 230b42055cd87d0cd27b50af108d9ba7a7fe5541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230b42055cd87d0cd27b50af1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 11:55:12 2011 +0100 gdi32: Move to a more scalable mechanism for picking the default fonts. --- dlls/gdi32/freetype.c | 56 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fd00d0f..6bd49ed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -415,6 +415,35 @@ static const WCHAR Gulim[] = {'G','u','l','i','m',0}; static const WCHAR PMingLiU[] = {'P','M','i','n','g','L','i','U',0}; static const WCHAR Batang[] = {'B','a','t','a','n','g',0}; +static const WCHAR arial[] = {'A','r','i','a','l',0}; +static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; +static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; +static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; +static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; +static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; + +static const WCHAR *default_serif_list[] = +{ + times_new_roman, + bitstream_vera_serif, + NULL +}; + +static const WCHAR *default_fixed_list[] = +{ + courier_new, + bitstream_vera_sans_mono, + NULL +}; + +static const WCHAR *default_sans_list[] = +{ + arial, + bitstream_vera_sans, + NULL +}; + + static const WCHAR ArabicW[] = {'A','r','a','b','i','c','\0'}; static const WCHAR BalticW[] = {'B','a','l','t','i','c','\0'}; static const WCHAR CHINESE_BIG5W[] = {'C','H','I','N','E','S','E','_','B','I','G','5','\0'}; @@ -3092,23 +3121,22 @@ static BOOL move_to_front(const WCHAR *name) return FALSE; } -static const WCHAR arial[] = {'A','r','i','a','l',0}; -static const WCHAR bitstream_vera_sans[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',0}; -static const WCHAR bitstream_vera_sans_mono[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','a','n','s',' ','M','o','n','o',0}; -static const WCHAR bitstream_vera_serif[] = {'B','i','t','s','t','r','e','a','m',' ','V','e','r','a',' ','S','e','r','i','f',0}; -static const WCHAR courier_new[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; -static const WCHAR times_new_roman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n',0}; - -static void reorder_font_list(void) +static BOOL set_default(const WCHAR **name_list) { - if(!move_to_front(times_new_roman)) - move_to_front(bitstream_vera_serif); + while (*name_list) + { + if (move_to_front(*name_list)) return TRUE; + name_list++; + } - if(!move_to_front(courier_new)) - move_to_front(bitstream_vera_sans_mono); + return FALSE; +} - if(!move_to_front(arial)) - move_to_front(bitstream_vera_sans); +static void reorder_font_list(void) +{ + set_default( default_serif_list ); + set_default( default_fixed_list ); + set_default( default_sans_list ); } /*************************************************************

1 0

Louis Lenders : kernel32: Add stub for GetThreadPreferredUILanguages.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: e24438c1d1f68ae84f7570b53b8d5e7c24680fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24438c1d1f68ae84f7570b53… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Oct 11 22:31:04 2011 +0200 kernel32: Add stub for GetThreadPreferredUILanguages. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/thread.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index eb6e1e6..96b43b3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -653,6 +653,7 @@ @ stdcall GetThreadId(ptr) @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadLocale() +@ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) @ stdcall GetThreadPriority(long) @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index d41eb38..67277ea 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -814,3 +814,14 @@ BOOL WINAPI SetThreadPreferredUILanguages( DWORD flags, PCZZWSTR buffer, PULONG FIXME( "%u, %p, %p\n", flags, buffer, count ); return TRUE; } + +/*********************************************************************** + * GetThreadPreferredUILanguages (KERNEL32.@) + */ +BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR buffer, PULONG buffersize ) +{ + FIXME( "%u, %p, %p %p\n", flags, count, buffer, buffersize ); + *count = 0; + *buffersize = 0; + return TRUE; +}

1 0

André Hentschel : mshtml: Add stub for QUERY_IS_CACHED_AND_USABLE_OFFLINE.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 296b79565502d83930da9d885d6df3eeb3e56fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296b79565502d83930da9d885… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 11 19:14:20 2011 +0200 mshtml: Add stub for QUERY_IS_CACHED_AND_USABLE_OFFLINE. --- dlls/mshtml/protocol.c | 3 +++ dlls/mshtml/tests/protocol.c | 1 + include/urlmon.idl | 3 ++- 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 4304740..d9a008c 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -478,6 +478,9 @@ static HRESULT WINAPI AboutProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, case QUERY_USES_HISTORYFOLDER: FIXME("Unsupported option QUERY_USES_HISTORYFOLDER\n"); return E_FAIL; + case QUERY_IS_CACHED_AND_USABLE_OFFLINE: + FIXME("Unsupported option QUERY_IS_CACHED_AND_USABLE_OFFLINE\n"); + return E_NOTIMPL; default: return E_FAIL; } diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 07f424f..5825015 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -755,6 +755,7 @@ static void test_about_protocol(void) case QUERY_IS_SECURE: case QUERY_IS_SAFE: case QUERY_USES_HISTORYFOLDER: + case QUERY_IS_CACHED_AND_USABLE_OFFLINE: break; default: hres = IInternetProtocolInfo_QueryInfo(protocol_info, about_blank_url, i, 0, diff --git a/include/urlmon.idl b/include/urlmon.idl index a9d0791..a278be5 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -881,7 +881,8 @@ interface IInternetProtocolInfo : IUnknown QUERY_USES_CACHE, QUERY_IS_SECURE, QUERY_IS_SAFE, - QUERY_USES_HISTORYFOLDER + QUERY_USES_HISTORYFOLDER, + QUERY_IS_CACHED_AND_USABLE_OFFLINE } QUERYOPTION; HRESULT ParseUrl(

1 0

Andrew Eikum : winmm: Also track input device position.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 0d567ff9f8479fcb7afce7c74afb1b33aabc766d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d567ff9f8479fcb7afce7c74… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 11 15:32:10 2011 -0500 winmm: Also track input device position. --- dlls/winmm/tests/capture.c | 7 +++++++ dlls/winmm/waveform.c | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 2860b00..b43bb71 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -133,6 +133,7 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, WAVEHDR frag; MMRESULT rc; DWORD res; + MMTIME mmt; WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; @@ -224,6 +225,12 @@ static void wave_in_test_deviceIn(int device, LPWAVEFORMATEX pwfx, DWORD format, "frag.dwBytesRecorded=%d, should=%d\n", frag.dwBytesRecorded,pwfx->nAvgBytesPerSec); + mmt.wType = TIME_SAMPLES; + rc=waveInGetPosition(win, &mmt, sizeof(mmt)); + ok(rc==MMSYSERR_NOERROR,"waveInGetPosition(%s): rc=%s\n", + dev_name(device),wave_in_error(rc)); + ok(mmt.u.cb == frag.dwBytesRecorded, "Got wrong position: %u\n", mmt.u.cb); + /* stop playing on error */ if (res!=WAIT_OBJECT_0) { rc=waveInStop(win); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 658fd24..372501c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1495,6 +1495,8 @@ static void WID_PullACMData(WINMM_Device *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet); if(FAILED(hr)) ERR("ReleaseBuffer failed: %08x\n", hr); + + device->played_frames += packet; } queue = device->first; @@ -1602,6 +1604,8 @@ static void WID_PullData(WINMM_Device *device) hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_len); if(FAILED(hr)) ERR("ReleaseBuffer failed: %08x\n", hr); + + device->played_frames += packet_len; } exit:

1 0

Andrew Eikum : winmm: Use buffer offset when recording.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 82f486a1a860e3a589d6769fbac91e07927ab2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f486a1a860e3a589d6769fb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 11 15:32:17 2011 -0500 winmm: Use buffer offset when recording. --- dlls/winmm/waveform.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 372501c..7110f25 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1587,7 +1587,8 @@ static void WID_PullData(WINMM_Device *device) to_copy_bytes = min(packet * device->bytes_per_frame, queue->dwBufferLength - queue->dwBytesRecorded); - memcpy(queue->lpData + queue->dwBytesRecorded, data, + memcpy(queue->lpData + queue->dwBytesRecorded, + data + (packet_len - packet) * device->bytes_per_frame, to_copy_bytes); queue->dwBytesRecorded += to_copy_bytes;

1 0

Andrew Eikum : wineoss.drv: Only write as much data as will fit into the OSS buffer.
by Alexandre Julliard Oct. 12, 2011

Oct. 12, 2011

Module: wine Branch: master Commit: 1ed42313a91dab5c0ceb98a0735db97d6cff060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed42313a91dab5c0ceb98a07… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 11 15:31:28 2011 -0500 wineoss.drv: Only write as much data as will fit into the OSS buffer. --- dlls/wineoss.drv/mmdevdrv.c | 45 ++++++++++++++++++++++++++++-------------- 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 6f8e2d2..f8316ee 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1253,51 +1253,66 @@ static void oss_silence_buffer(ACImpl *This, BYTE *buf, UINT32 frames) static void oss_write_data(ACImpl *This) { - ssize_t written; + ssize_t written_bytes; UINT32 written_frames; - size_t to_write; + size_t to_write_frames, to_write_bytes; + audio_buf_info bi; BYTE *buf = This->local_buffer + (This->lcl_offs_frames * This->fmt->nBlockAlign); if(This->lcl_offs_frames + This->held_frames > This->bufsize_frames) - to_write = This->bufsize_frames - This->lcl_offs_frames; + to_write_frames = This->bufsize_frames - This->lcl_offs_frames; else - to_write = This->held_frames; + to_write_frames = This->held_frames; + to_write_bytes = to_write_frames * This->fmt->nBlockAlign; + + if(ioctl(This->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ + WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); + return; + } + + if(bi.bytes < to_write_bytes){ + to_write_frames = bi.bytes / This->fmt->nBlockAlign; + to_write_bytes = to_write_frames * This->fmt->nBlockAlign; + } if(This->session->mute) - oss_silence_buffer(This, buf, to_write); + oss_silence_buffer(This, buf, to_write_frames); - written = write(This->fd, buf, to_write * This->fmt->nBlockAlign); - if(written < 0){ + written_bytes = write(This->fd, buf, to_write_bytes); + if(written_bytes < 0){ /* EAGAIN is OSS buffer full, log that too */ WARN("write failed: %d (%s)\n", errno, strerror(errno)); return; } - written_frames = written / This->fmt->nBlockAlign; + written_frames = written_bytes / This->fmt->nBlockAlign; This->lcl_offs_frames += written_frames; This->lcl_offs_frames %= This->bufsize_frames; This->held_frames -= written_frames; This->inbuf_frames += written_frames; - if(written_frames < to_write){ + if(written_frames < to_write_frames){ /* OSS buffer probably full */ return; } - if(This->held_frames){ + bi.bytes -= written_bytes; + if(This->held_frames && bi.bytes >= This->fmt->nBlockAlign){ /* wrapped and have some data back at the start to write */ + to_write_frames = bi.bytes / This->fmt->nBlockAlign; + to_write_bytes = to_write_frames * This->fmt->nBlockAlign; + if(This->session->mute) - oss_silence_buffer(This, This->local_buffer, This->held_frames); + oss_silence_buffer(This, This->local_buffer, to_write_frames); - written = write(This->fd, This->local_buffer, - This->held_frames * This->fmt->nBlockAlign); - if(written < 0){ + written_bytes = write(This->fd, This->local_buffer, to_write_bytes); + if(written_bytes < 0){ WARN("write failed: %d (%s)\n", errno, strerror(errno)); return; } - written_frames = written / This->fmt->nBlockAlign; + written_frames = written_bytes / This->fmt->nBlockAlign; This->lcl_offs_frames += written_frames; This->lcl_offs_frames %= This->bufsize_frames;

1 0

Jeremy Newman : remove DB passwords
by Jeremy Newman Oct. 11, 2011

Oct. 11, 2011

Module: appdb Branch: master Commit: bab77733a167a08a20b48f991a30eb2d3e45b8a7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bab77733a167a08a20b48f99… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Oct 11 20:41:14 2011 -0500 remove DB passwords --- include/config.php.sample | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index f58b49b..0eb1fc3 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -40,18 +40,18 @@ define("STABLE_BRANCHES", "1.0.,1.2."); /* * apps database info */ -define("APPS_DBUSER","wineowner"); -define("APPS_DBPASS","lemonade"); -define("APPS_DBHOST","localhost"); -define("APPS_DB","apidb"); +define("APPS_DBUSER",""); +define("APPS_DBPASS",""); +define("APPS_DBHOST",""); +define("APPS_DB",""); /* * bugzilla database info */ -define("BUGZILLA_DBUSER","root"); +define("BUGZILLA_DBUSER",""); define("BUGZILLA_DBPASS",""); -define("BUGZILLA_DBHOST","localhost"); -define("BUGZILLA_DB","bugs"); +define("BUGZILLA_DBHOST",""); +define("BUGZILLA_DB",""); define("BUGZILLA_PRODUCT_ID","1"); ?>

1 0

Octavian Voicu : ddraw: Be consistent about param and local var naming across AddAttachedSurface implementations .
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: a843acef5567bc30901612ce5013da543259b21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a843acef5567bc30901612ce5… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Mon Oct 10 13:15:22 2011 +0300 ddraw: Be consistent about param and local var naming across AddAttachedSurface implementations. --- dlls/ddraw/surface.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7c70f0f..6140ee0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1426,29 +1426,29 @@ static HRESULT ddraw_surface_attach_surface(IDirectDrawSurfaceImpl *This, IDirec return DD_OK; } -static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *Attach) +static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *attachment) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); - IDirectDrawSurfaceImpl *Surf = unsafe_impl_from_IDirectDrawSurface7(Attach); + IDirectDrawSurfaceImpl *attachment_impl = unsafe_impl_from_IDirectDrawSurface7(attachment); HRESULT hr; - TRACE("iface %p, attachment %p.\n", iface, Attach); + TRACE("iface %p, attachment %p.\n", iface, attachment); /* Version 7 of this interface seems to refuse everything except z buffers, as per msdn */ - if(!(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) + if(!(attachment_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) { WARN("Application tries to attach a non Z buffer surface. caps %08x\n", - Surf->surface_desc.ddsCaps.dwCaps); + attachment_impl->surface_desc.ddsCaps.dwCaps); return DDERR_CANNOTATTACHSURFACE; } - hr = ddraw_surface_attach_surface(This, Surf); + hr = ddraw_surface_attach_surface(This, attachment_impl); if (FAILED(hr)) { return hr; } - ddraw_surface7_AddRef(Attach); + ddraw_surface7_AddRef(attachment); return hr; } @@ -1473,7 +1473,7 @@ static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *ifa static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); - IDirectDrawSurfaceImpl *attach_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); + IDirectDrawSurfaceImpl *attachment_impl = unsafe_impl_from_IDirectDrawSurface3(attachment); HRESULT hr; TRACE("iface %p, attachment %p.\n", iface, attachment); @@ -1484,11 +1484,11 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa * -> primaries can be attached to offscreen plain surfaces * -> z buffers can be attached to primaries */ if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN) - && attach_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN)) + && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_OFFSCREENPLAIN)) { /* Sizes have to match */ - if (attach_impl->surface_desc.dwWidth != This->surface_desc.dwWidth - || attach_impl->surface_desc.dwHeight != This->surface_desc.dwHeight) + if (attachment_impl->surface_desc.dwWidth != This->surface_desc.dwWidth + || attachment_impl->surface_desc.dwHeight != This->surface_desc.dwHeight) { WARN("Surface sizes do not match.\n"); return DDERR_CANNOTATTACHSURFACE; @@ -1496,7 +1496,7 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa /* OK */ } else if (This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE) - && attach_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER)) + && attachment_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_ZBUFFER)) { /* OK */ } @@ -1506,7 +1506,7 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa return DDERR_CANNOTATTACHSURFACE; } - hr = ddraw_surface_attach_surface(This, attach_impl); + hr = ddraw_surface_attach_surface(This, attachment_impl); if (FAILED(hr)) { return hr;

1 0

Huw Davies : gdi32: The text extents functions fail if passed a negative count.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 5bd304bd0e78a0ea8cd37cedb0b1ed39683f4509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd304bd0e78a0ea8cd37cedb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 11 15:46:19 2011 +0100 gdi32: The text extents functions fail if passed a negative count. --- dlls/gdi32/font.c | 37 ++++++++++++++++++++++++++----------- dlls/gdi32/tests/font.c | 9 +++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 6f5e479..263d064 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -920,9 +920,14 @@ BOOL WINAPI GetTextExtentPoint32A( HDC hdc, LPCSTR str, INT count, { BOOL ret = FALSE; INT wlen; - LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen, NULL); + LPWSTR p; + + if (count < 0) return FALSE; - if (p) { + p = FONT_mbtowc(hdc, str, count, &wlen, NULL); + + if (p) + { ret = GetTextExtentPoint32W( hdc, p, wlen, size ); HeapFree( GetProcessHeap(), 0, p ); } @@ -975,10 +980,15 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT LPINT nfit, LPINT dxs, LPSIZE size ) { BOOL ret = FALSE; - DC * dc = get_dc_ptr( hdc ); + DC *dc; + + if (count < 0) return FALSE; + + dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if(dc->gdiFont) { + if(dc->gdiFont) + { ret = WineEngGetTextExtentExPointI(dc->gdiFont, indices, count, max_ext, nfit, dxs, size); size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); @@ -1051,11 +1061,15 @@ BOOL WINAPI GetTextExtentExPointA( HDC hdc, LPCSTR str, INT count, INT wlen; INT *walpDx = NULL; LPWSTR p = NULL; - - if (alpDx && - NULL == (walpDx = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)))) - return FALSE; - + + if (count < 0) return FALSE; + + if (alpDx) + { + walpDx = HeapAlloc( GetProcessHeap(), 0, count * sizeof(INT) ); + if (!walpDx) return FALSE; + } + p = FONT_mbtowc(hdc, str, count, &wlen, NULL); ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, walpDx, size); if (walpDx) @@ -1118,9 +1132,10 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count, TRACE("(%p, %s, %d)\n",hdc,debugstr_wn(str,count),maxExt); + if (count < 0) return FALSE; + dc = get_dc_ptr(hdc); - if (! dc) - return FALSE; + if (!dc) return FALSE; GetTextMetricsW(hdc, &tm); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 097a6c3..f127743 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1054,6 +1054,7 @@ static void test_text_extents(void) HFONT hfont; SIZE sz; SIZE sz1, sz2; + BOOL ret; memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Arial"); @@ -1110,6 +1111,14 @@ static void test_text_extents(void) "GetTextExtentExPointW with lpnFit and alpDx both NULL returns incorrect results\n"); HeapFree(GetProcessHeap(), 0, extents); + /* extents functions fail with -ve counts (the interesting case being -1) */ + ret = GetTextExtentPointA(hdc, "o", -1, &sz); + ok(ret == FALSE, "got %d\n", ret); + ret = GetTextExtentExPointA(hdc, "o", -1, 0, NULL, NULL, &sz); + ok(ret == FALSE, "got %d\n", ret); + ret = GetTextExtentExPointW(hdc, wt, -1, 0, NULL, NULL, &sz1); + ok(ret == FALSE, "got %d\n", ret); + hfont = SelectObject(hdc, hfont); DeleteObject(hfont); ReleaseDC(NULL, hdc);

1 0

Henri Verbeet : gameux/tests: Run the game explorer tests in a multithreaded apartment as well.
by Alexandre Julliard Oct. 11, 2011

Oct. 11, 2011

Module: wine Branch: master Commit: 7679d96c86176d43d85ef303e19cdb6a50355e5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7679d96c86176d43d85ef303e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 11 17:24:52 2011 +0200 gameux/tests: Run the game explorer tests in a multithreaded apartment as well. --- dlls/gameux/tests/gameexplorer.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 7be9c69..462fb8f 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -656,30 +656,42 @@ static void test_install_uninstall_game(void) } } -START_TEST(gameexplorer) +static void run_tests(void) { - HRESULT r; BOOL gameExplorerAvailable = FALSE; BOOL gameExplorer2Available = FALSE; + test_create(&gameExplorerAvailable, &gameExplorer2Available); + + if(gameExplorerAvailable) + test_add_remove_game(); + + if(gameExplorer2Available) + test_install_uninstall_game(); +} + +START_TEST(gameexplorer) +{ if(_loadDynamicRoutines()) { - r = CoInitialize( NULL ); - ok( r == S_OK, "failed to init COM\n"); - - test_create(&gameExplorerAvailable, &gameExplorer2Available); + HRESULT hr; - if(gameExplorerAvailable) - test_add_remove_game(); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + trace("Running apartment threaded tests.\n"); + run_tests(); + if(SUCCEEDED(hr)) + CoUninitialize(); - if(gameExplorer2Available) - test_install_uninstall_game(); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); + trace("Running multithreaded tests.\n"); + run_tests(); + if(SUCCEEDED(hr)) + CoUninitialize(); } else /* this is not a failure, because both procedures loaded by address * are always available on systems which has gameux.dll */ win_skip("too old system, cannot load required dynamic procedures\n"); - - - CoUninitialize(); }

1 0