December 2008 - Wine-Commits

Christian Costa : d3dxof: Increase some buffer and array sizes.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 3310c72d29cbe4de2c19829f4f156575122e705f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3310c72d29cbe4de2c19829f4… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 30 12:18:08 2008 +0100 d3dxof: Increase some buffer and array sizes. --- dlls/d3dxof/d3dxof.c | 2 +- dlls/d3dxof/d3dxof_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index f7c8738..69060ed 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -81,7 +81,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define CLSIDFMT "<%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X>" #define MAX_INPUT_SIZE 2000000 -#define MAX_DATA_SIZE 200000 +#define MAX_DATA_SIZE 400000 static const struct IDirectXFileVtbl IDirectXFile_Vtbl; static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index b2f5b41..6feeb13 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -36,10 +36,10 @@ #define MAX_NAME_LEN 32 #define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 -#define MAX_CHILDS 20 +#define MAX_CHILDS 100 #define MAX_TEMPLATES 200 #define MAX_OBJECTS 500 -#define MAX_SUBOBJECTS 120 +#define MAX_SUBOBJECTS 500 #define MAX_STRINGS_BUFFER 200 typedef struct {

1 0

Christian Costa : quartz: Avoid leaking penummt and mt on error.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 14485c365b9a624fb3785ff027adc6c5596719a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14485c365b9a624fb3785ff02… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 30 15:52:58 2008 +0100 quartz: Avoid leaking penummt and mt on error. --- dlls/quartz/filtergraph.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index ff185ce..8480d25 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -867,8 +867,8 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, { ICOM_THIS_MULTI(IFilterGraphImpl, IFilterGraph2_vtbl, iface); HRESULT hr; - AM_MEDIA_TYPE* mt; - IEnumMediaTypes* penummt; + AM_MEDIA_TYPE* mt = NULL; + IEnumMediaTypes* penummt = NULL; ULONG nbmt; IEnumPins* penumpins; IEnumMoniker* pEnumMoniker; @@ -1095,10 +1095,11 @@ error: } } - IEnumMediaTypes_Release(penummt); - DeleteMediaType(mt); - out: + if (penummt) + IEnumMediaTypes_Release(penummt); + if (mt) + DeleteMediaType(mt); --This->recursioncount; LeaveCriticalSection(&This->cs); TRACE("--> %08x\n", hr);

1 0

Reece Dunn : winealsa.drv: Correct the period_time value for pulseaudio.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 7926eba0d5dd4e8b6360bafcb675e34867641629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7926eba0d5dd4e8b6360bafcb… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Nov 30 18:56:57 2008 +0000 winealsa.drv: Correct the period_time value for pulseaudio. --- dlls/winealsa.drv/waveout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 90c23b3..d73d165 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -588,7 +588,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) snd_pcm_format_t format = -1; unsigned int rate; unsigned int buffer_time = 120000; - unsigned int period_time = 20000; + unsigned int period_time = 22000; snd_pcm_uframes_t buffer_size; snd_pcm_uframes_t period_size; int flags;

1 0

Christian Costa : d3dxof: Handle comments when going to next template or object.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: b5158497a6ebb3a393336d360701af7ba643ab32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5158497a6ebb3a393336d360… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 30 12:18:46 2008 +0100 d3dxof: Handle comments when going to next template or object. --- dlls/d3dxof/d3dxof.c | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 69060ed..eb80cdc 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1177,6 +1177,40 @@ static BOOL parse_template_parts(parse_buffer * buf) return TRUE; } +static void go_to_next_definition(parse_buffer * buf) +{ + while (buf->rem_bytes) + { + char c = *buf->buffer; + if ((c == '#') || (c == '/')) + { + read_bytes(buf, &c, 1); + /* Handle comment (# or //) */ + if (c == '/') + { + if (!read_bytes(buf, &c, 1)) + return; + if (c != '/') + return; + } + c = 0; + while (c != 0x0A) + { + if (!read_bytes(buf, &c, 1)) + return; + } + continue; + } + else if (is_space(*buf->buffer)) + { + buf->buffer++; + buf->rem_bytes--; + } + else + break; + } +} + static BOOL parse_template(parse_buffer * buf) { if (get_TOKEN(buf) != TOKEN_TEMPLATE) @@ -1196,11 +1230,7 @@ static BOOL parse_template(parse_buffer * buf) if (buf->txt) { /* Go to the next template */ - while (buf->rem_bytes && is_space(*buf->buffer)) - { - buf->buffer++; - buf->rem_bytes--; - } + go_to_next_definition(buf); } TRACE("%d - %s - %s\n", buf->pdxf->nb_xtemplates, buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].name, debugstr_guid(&buf->pdxf->xtemplates[buf->pdxf->nb_xtemplates].class_id)); @@ -2136,11 +2166,7 @@ static BOOL parse_object(parse_buffer * buf) if (buf->txt) { /* Go to the next object */ - while (buf->rem_bytes && is_space(*buf->buffer)) - { - buf->buffer++; - buf->rem_bytes--; - } + go_to_next_definition(buf); } return TRUE;

1 0

Maarten Lankhorst : loader: Implement setting %gs for amd64.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 0a393d7eb412cf840d225537cb75ba7fe6ea99ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a393d7eb412cf840d225537c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 25 08:50:37 2008 +0100 loader: Implement setting %gs for amd64. --- loader/pthread.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/loader/pthread.c b/loader/pthread.c index 4951d97..4c0c892 100644 --- a/loader/pthread.c +++ b/loader/pthread.c @@ -48,10 +48,15 @@ static int init_done; static int nb_threads = 1; -#ifndef __i386__ +#if !defined(__i386__) && !defined(__x86_64__) static pthread_key_t teb_key; #endif +#if defined(__x86_64__) && defined(__linux__) +#include <asm/prctl.h> +extern int arch_prctl(int func, void *ptr); +#endif + /*********************************************************************** * init_process * @@ -141,6 +146,13 @@ static void init_current_teb( struct wine_pthread_thread_info *info ) wine_ldt_set_limit( &fs_entry, info->teb_size - 1 ); wine_ldt_set_flags( &fs_entry, WINE_LDT_FLAGS_DATA|WINE_LDT_FLAGS_32BIT ); wine_ldt_init_fs( info->teb_sel, &fs_entry ); +#elif defined(__x86_64__) + /* On x86_64, it's in %gs */ +# ifdef __linux__ + arch_prctl(ARCH_SET_GS, info->teb_base); +# else +# error Please define setting %gs for your architecture +# endif #else if (!init_done) /* first thread */ pthread_key_create( &teb_key, NULL ); @@ -174,6 +186,10 @@ static void *get_current_teb(void) void *ret; __asm__( ".byte 0x64\n\tmovl 0x18,%0" : "=r" (ret) ); return ret; +#elif defined(__x86_64__) + void *ret; + __asm__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (ret) ); + return ret; #else return pthread_getspecific( teb_key ); #endif

1 0

Maarten Lankhorst : include: Add NtCurrentTeb assembly for win64.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: e32bd2896b836effc35bdcb9d469815294ddb820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e32bd2896b836effc35bdcb9d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Nov 26 14:42:48 2008 +0100 include: Add NtCurrentTeb assembly for win64. --- include/winnt.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index a1e9fe0..90c4d3b 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2007,6 +2007,21 @@ extern inline struct _TEB * WINAPI NtCurrentTeb(void) __asm mov teb, eax; return teb; } +#elif defined(__x86_64__) && defined(__GNUC__) +extern inline struct _TEB * WINAPI NtCurrentTeb(void) +{ + struct _TEB *teb; + __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); + return teb; +} +#elif defined(__x86_64__) && defined (_MSC_VER) +extern inline struct _TEB * WINAPI NtCurrentTeb(void) +{ + struct _TEB *teb; + __asm mov rax, gs:[0x30]; + __asm mov teb, rax; + return teb; +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Christian Costa : d3dxof: Make parsing more permissive about semicolon and comma in objects.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: d535205864df15185c097c720f99fa00ab4e10bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d535205864df15185c097c720… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 30 12:17:20 2008 +0100 d3dxof: Make parsing more permissive about semicolon and comma in objects. --- dlls/d3dxof/d3dxof.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index dbafcc6..f7c8738 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -1874,7 +1874,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) else { /* Allow comma omission */ - if (!((token == TOKEN_FLOAT))) + if (!((token == TOKEN_FLOAT) || (token == TOKEN_INTEGER))) return FALSE; } } @@ -1996,10 +1996,10 @@ static BOOL parse_object_members_list(parse_buffer * buf) } } - if (buf->txt) + if (buf->txt && (check_TOKEN(buf) != TOKEN_CBRACE)) { token = get_TOKEN(buf); - if (token != TOKEN_SEMICOLON) + if ((token != TOKEN_SEMICOLON) && (token != TOKEN_COMMA)) { /* Allow comma instead of semicolon in some specific cases */ if (!((token == TOKEN_COMMA) && ((i+1) < pt->nb_members) && (pt->members[i].type == pt->members[i+1].type)

1 0

Michael Karcher : msvcrt: Out strings should be ptr instead of wstr in . spec file.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 023c227399ecb85c0d895546fea90e7d0685c51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=023c227399ecb85c0d895546f… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 18:04:54 2008 +0100 msvcrt: Out strings should be ptr instead of wstr in .spec file. --- dlls/msvcrt/msvcrt.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 658c775..3104069 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -570,7 +570,7 @@ @ cdecl _wspawnve(long wstr ptr ptr) @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) -@ cdecl _wsplitpath(wstr wstr wstr wstr wstr) +@ cdecl _wsplitpath(wstr ptr ptr ptr ptr) @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) _wsplitpath_s @ cdecl _wstat(wstr ptr) MSVCRT__wstat @ cdecl _wstati64(wstr ptr) MSVCRT__wstati64

1 0

Hans Leidekker : gdiplus: Better implementation of GdipGetFontHeightGivenDPI.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 8656f6db50d3e1a3fe30b1b700272b17fe5d8da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8656f6db50d3e1a3fe30b1b70… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 28 17:30:48 2008 +0100 gdiplus: Better implementation of GdipGetFontHeightGivenDPI. --- dlls/gdiplus/font.c | 23 ++++++++++++++++++++++- dlls/gdiplus/gdiplus_private.h | 2 ++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ba2f1d8..2366823 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -153,6 +153,8 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->unit = unit; (*font)->emSize = emSize; + (*font)->height = tmw->ntmSizeEM; + (*font)->line_spacing = tmw->tmAscent + tmw->tmDescent + tmw->tmExternalLeading; return Ok; } @@ -194,6 +196,9 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfHeight = -textmet.tmHeight; (*font)->lfw.lfWeight = textmet.tmWeight; + (*font)->height = 1; /* FIXME: need NEWTEXTMETRIC.ntmSizeEM here */ + (*font)->line_spacing = textmet.tmAscent + textmet.tmDescent + textmet.tmExternalLeading; + SelectObject(hdc, oldfont); DeleteObject(hfont); @@ -444,15 +449,31 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, */ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, REAL *height) { + REAL font_height; + TRACE("%p (%s), %f, %p\n", font, debugstr_w(font->lfw.lfFaceName), dpi, height); if (!(font && height)) return InvalidParameter; + font_height = font->line_spacing * (font->emSize / font->height); + switch (font->unit) { case UnitPixel: - *height = font->emSize; + *height = font_height; + break; + case UnitPoint: + *height = font_height * dpi * inch_per_point; + break; + case UnitInch: + *height = font_height * dpi; + break; + case UnitDocument: + *height = font_height * (dpi / 300.0); + break; + case UnitMillimeter: + *height = font_height * (dpi / mm_per_inch); break; default: FIXME("Unhandled unit type: %d\n", font->unit); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index a279268..714739c 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -209,6 +209,8 @@ struct GpImageAttributes{ struct GpFont{ LOGFONTW lfw; REAL emSize; + UINT height; + LONG line_spacing; Unit unit; };

1 0

Alistair Leslie-Hughes : mshtml: Implement IDispatch for IHTMLCommentElement.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 43ea81bf554d3e663efdb022763512bd9525e79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ea81bf554d3e663efdb0227… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 23 20:53:49 2008 +1100 mshtml: Implement IDispatch for IHTMLCommentElement. --- dlls/mshtml/htmlcomment.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 722cb14..a589d7d 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -66,16 +66,14 @@ static ULONG WINAPI HTMLCommentElement_Release(IHTMLCommentElement *iface) static HRESULT WINAPI HTMLCommentElement_GetTypeInfoCount(IHTMLCommentElement *iface, UINT *pctinfo) { HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLCommentElement_GetTypeInfo(IHTMLCommentElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLCommentElement_GetIDsOfNames(IHTMLCommentElement *iface, REFIID riid, @@ -83,9 +81,7 @@ static HRESULT WINAPI HTMLCommentElement_GetIDsOfNames(IHTMLCommentElement *ifac LCID lcid, DISPID *rgDispId) { HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLCommentElement_Invoke(IHTMLCommentElement *iface, DISPID dispIdMember, @@ -93,9 +89,8 @@ static HRESULT WINAPI HTMLCommentElement_Invoke(IHTMLCommentElement *iface, DISP VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLCommentElement *This = HTMLCOMMENT_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLCommentElement_put_text(IHTMLCommentElement *iface, BSTR v)

1 0