March 2009 - Wine-commits - list.winehq.org

Rob Shearman : widl: Implement a more abstract way of representing basic types.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 319a7a102ed01a53a28e4d45d15433a1eb7e13fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=319a7a102ed01a53a28e4d45d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:21:51 2009 +0000 widl: Implement a more abstract way of representing basic types. --- tools/widl/expr.c | 18 ++++---- tools/widl/header.c | 34 ++++++++++++++-- tools/widl/parser.y | 103 ++++++++++++++--------------------------------- tools/widl/typelib.c | 60 ++++++++++++++++------------ tools/widl/typetree.c | 31 ++++++++++++++ tools/widl/typetree.h | 37 +++++++++++++++++- tools/widl/widltypes.h | 29 +++++++++++++- 7 files changed, 200 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=319a7a102ed01a53a28e4…

1 0

Rob Shearman : widl: Remove the single keyword and type.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: b7dd838136c7835cbf7f29a8906583772df93ba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7dd838136c7835cbf7f29a89… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:21:58 2009 +0000 widl: Remove the single keyword and type. It isn't valid in MIDL or the FreeDCE IDL compiler, nor does it appear in the DCE/RPC or C99 specs. --- tools/widl/parser.l | 1 - tools/widl/parser.y | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index dba27ea..55a73c7 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -341,7 +341,6 @@ static const struct keyword attr_keywords[] = {"requestedit", tREQUESTEDIT}, {"restricted", tRESTRICTED}, {"retval", tRETVAL}, - {"single", tSINGLE}, {"size_is", tSIZEIS}, {"source", tSOURCE}, {"strict_context_handle", tSTRICTCONTEXTHANDLE}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 962b37a..c921ab6 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -269,7 +269,6 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token tSAFEARRAY %token tSHORT %token tSIGNED -%token tSINGLE %token tSIZEIS tSIZEOF %token tSMALL %token tSOURCE @@ -774,7 +773,6 @@ base_type: tBYTE { $$ = find_type_or_error($<str>1, 0); } | tUNSIGNED int_std { $$ = type_new_int(type_basic_get_type($2), 1); } | tUNSIGNED { $$ = type_new_int(TYPE_BASIC_INT, 1); } | tFLOAT { $$ = find_type_or_error($<str>1, 0); } - | tSINGLE { $$ = find_type("float", 0); } | tDOUBLE { $$ = find_type_or_error($<str>1, 0); } | tBOOLEAN { $$ = find_type_or_error($<str>1, 0); } | tERRORSTATUST { $$ = find_type_or_error($<str>1, 0); }

1 0

Alistair Leslie-Hughes : mshtml: Add missing IHTMLCurrentStyle IDispatchEx ids.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: ad7fc048b76e18f7526603b4e1c8da6e668d2a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7fc048b76e18f7526603b4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:08:51 2009 +1100 mshtml: Add missing IHTMLCurrentStyle IDispatchEx ids. --- dlls/mshtml/dispex.c | 3 +++ dlls/mshtml/htmlcurstyle.c | 3 +++ dlls/mshtml/mshtml_private.h | 3 +++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 18b549f..0d0422c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -88,6 +88,9 @@ static REFIID tid_ids[] = { &IID_IHTMLBodyElement2, &IID_IHTMLCommentElement, &IID_IHTMLCurrentStyle, + &IID_IHTMLCurrentStyle2, + &IID_IHTMLCurrentStyle3, + &IID_IHTMLCurrentStyle4, &IID_IHTMLDocument2, &IID_IHTMLDocument3, &IID_IHTMLDocument4, diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 77c10ee..5aaaece 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -874,6 +874,9 @@ static const IHTMLCurrentStyleVtbl HTMLCurrentStyleVtbl = { static const tid_t HTMLCurrentStyle_iface_tids[] = { IHTMLCurrentStyle_tid, + IHTMLCurrentStyle2_tid, + IHTMLCurrentStyle3_tid, + IHTMLCurrentStyle4_tid, 0 }; static dispex_static_data_t HTMLCurrentStyle_dispex = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5239a21..3ecfdea 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -84,6 +84,9 @@ typedef enum { IHTMLBodyElement2_tid, IHTMLCommentElement_tid, IHTMLCurrentStyle_tid, + IHTMLCurrentStyle2_tid, + IHTMLCurrentStyle3_tid, + IHTMLCurrentStyle4_tid, IHTMLDocument2_tid, IHTMLDocument3_tid, IHTMLDocument4_tid,

1 0

Alexandre Julliard : ntdll: Fix a couple of warnings on Solaris.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: abbf38ccd96452bd92d3e8f3c4f111630bf41536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbf38ccd96452bd92d3e8f3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 14:40:16 2009 +0100 ntdll: Fix a couple of warnings on Solaris. --- dlls/ntdll/signal_i386.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 32db810..0b7c25b 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -636,7 +636,7 @@ static void wine_sigacthandler( int signal, siginfo_t *siginfo, void *sigcontext __asm__ __volatile__("mov %ss,%ax; mov %ax,%ds; mov %ax,%es"); - thread_data = get_current_teb()->SystemReserved2; + thread_data = (struct ntdll_thread_data *)get_current_teb()->SystemReserved2; wine_set_fs( thread_data->fs ); wine_set_gs( thread_data->gs ); @@ -672,7 +672,6 @@ typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD *gs ) { TEB *teb = get_current_teb(); - struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2; /* get %fs and %gs at time of the fault */ #ifdef FS_sig @@ -687,8 +686,11 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * #endif #ifndef __sun /* see above for Solaris handling */ - wine_set_fs( thread_data->fs ); - wine_set_gs( thread_data->gs ); + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SystemReserved2; + wine_set_fs( thread_data->fs ); + wine_set_gs( thread_data->gs ); + } #endif if (!wine_ldt_is_system(CS_sig(sigcontext)) ||

1 0

Vincent Povirk : gdiplus: Return a NULL bitmap when GdipCreateBitmapFromScan0 fails.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 3db77ce50b9dfa811966afe15604ce2ee3e20c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db77ce50b9dfa811966afe15… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 3 16:07:29 2009 -0600 gdiplus: Return a NULL bitmap when GdipCreateBitmapFromScan0 fails. --- dlls/gdiplus/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a229f8b..5dab53e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -549,6 +549,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, ERR("could not make stream\n"); GdipFree(*bitmap); GdipFree(buff); + *bitmap = NULL; return GenericError; } @@ -558,6 +559,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, IStream_Release(stream); GdipFree(*bitmap); GdipFree(buff); + *bitmap = NULL; return GenericError; }

1 0

Henri Verbeet : wined3d: Add separate methods for setting the primitive type.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 702eeb6b0c735017c87872f7f077f1f083478b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702eeb6b0c735017c87872f7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 5 12:30:43 2009 +0100 wined3d: Add separate methods for setting the primitive type. --- dlls/d3d10core/device.c | 12 +++- dlls/d3d8/device.c | 14 ++- dlls/d3d9/device.c | 14 ++- dlls/ddraw/device.c | 36 ++++----- dlls/wined3d/device.c | 169 +++++++++++++++++++++++++++++++++------- dlls/wined3d/drawprim.c | 51 +----------- dlls/wined3d/stateblock.c | 13 +++ dlls/wined3d/wined3d_private.h | 24 ++++--- include/wine/wined3d.idl | 12 ++-- 9 files changed, 217 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=702eeb6b0c735017c8787…

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::Draw().
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 18300b8351237278883cae700be4a49735d3fb63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18300b8351237278883cae700… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 5 12:30:44 2009 +0100 d3d10core: Implement ID3D10Device::Draw(). --- dlls/d3d10core/device.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 4435af6..1406c38 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -146,8 +146,12 @@ static void STDMETHODCALLTYPE d3d10_device_DrawIndexed(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_Draw(ID3D10Device *iface, UINT vertex_count, UINT start_vertex_location) { - FIXME("iface %p, vertex_count %u, start_vertex_location %u stub!\n", + struct d3d10_device *This = (struct d3d10_device *)iface; + + TRACE("iface %p, vertex_count %u, start_vertex_location %u\n", iface, vertex_count, start_vertex_location); + + IWineD3DDevice_DrawPrimitive(This->wined3d_device, start_vertex_location, vertex_count); } static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device *iface,

1 0

Alistair Leslie-Hughes : mshtml: Add missing IHTMLStyle IDispatchEx ids.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: c58b8f288384e2fe2e4ac9f489d2abda28d27a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58b8f288384e2fe2e4ac9f48… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 20:03:56 2009 +1100 mshtml: Add missing IHTMLStyle IDispatchEx ids. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlstyle.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index a3a9595..18b549f 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -111,6 +111,8 @@ static REFIID tid_ids[] = { &IID_IHTMLSelectElement, &IID_IHTMLStyle, &IID_IHTMLStyle2, + &IID_IHTMLStyle3, + &IID_IHTMLStyle4, &IID_IHTMLTable, &IID_IHTMLTableRow, &IID_IHTMLTextContainer, diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7817d9b..d7d4f50 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2555,6 +2555,8 @@ static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { static const tid_t HTMLStyle_iface_tids[] = { IHTMLStyle_tid, IHTMLStyle2_tid, + IHTMLStyle3_tid, + IHTMLStyle4_tid, 0 }; static dispex_static_data_t HTMLStyle_dispex = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b67c485..5239a21 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -107,6 +107,8 @@ typedef enum { IHTMLSelectElement_tid, IHTMLStyle_tid, IHTMLStyle2_tid, + IHTMLStyle3_tid, + IHTMLStyle4_tid, IHTMLTable_tid, IHTMLTableRow_tid, IHTMLTextContainer_tid,

1 0

Henri Verbeet : wined3d: Add d3d10 primitive types.
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 3b07e7059e55b539df1549adce26120710d46482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b07e7059e55b539df1549adc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 5 12:30:43 2009 +0100 wined3d: Add d3d10 primitive types. --- dlls/wined3d/drawprim.c | 12 ++++++++++++ dlls/wined3d/utils.c | 5 +++++ include/wine/wined3d.idl | 5 +++++ 3 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9059ebb..91c9bdd 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -56,6 +56,18 @@ static GLenum primitive_to_gl(WINED3DPRIMITIVETYPE primitive_type) case WINED3DPT_TRIANGLEFAN: return GL_TRIANGLE_FAN; + case WINED3DPT_LINELIST_ADJ: + return GL_LINES_ADJACENCY_ARB; + + case WINED3DPT_LINESTRIP_ADJ: + return GL_LINE_STRIP_ADJACENCY_ARB; + + case WINED3DPT_TRIANGLELIST_ADJ: + return GL_TRIANGLES_ADJACENCY_ARB; + + case WINED3DPT_TRIANGLESTRIP_ADJ: + return GL_TRIANGLE_STRIP_ADJACENCY_ARB; + default: FIXME("Unhandled primitive type %s\n", debug_d3dprimitivetype(primitive_type)); return GL_NONE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 87bfac6..5fa4a1f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -918,12 +918,17 @@ const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res) { const char* debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) { switch (PrimitiveType) { #define PRIM_TO_STR(prim) case prim: return #prim + PRIM_TO_STR(WINED3DPT_UNDEFINED); PRIM_TO_STR(WINED3DPT_POINTLIST); PRIM_TO_STR(WINED3DPT_LINELIST); PRIM_TO_STR(WINED3DPT_LINESTRIP); PRIM_TO_STR(WINED3DPT_TRIANGLELIST); PRIM_TO_STR(WINED3DPT_TRIANGLESTRIP); PRIM_TO_STR(WINED3DPT_TRIANGLEFAN); + PRIM_TO_STR(WINED3DPT_LINELIST_ADJ); + PRIM_TO_STR(WINED3DPT_LINESTRIP_ADJ); + PRIM_TO_STR(WINED3DPT_TRIANGLELIST_ADJ); + PRIM_TO_STR(WINED3DPT_TRIANGLESTRIP_ADJ); #undef PRIM_TO_STR default: FIXME("Unrecognized %u WINED3DPRIMITIVETYPE!\n", PrimitiveType); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7faa2de..5c63ef9 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -97,12 +97,17 @@ typedef enum _WINED3DLIGHTTYPE typedef enum _WINED3DPRIMITIVETYPE { + WINED3DPT_UNDEFINED = 0, WINED3DPT_POINTLIST = 1, WINED3DPT_LINELIST = 2, WINED3DPT_LINESTRIP = 3, WINED3DPT_TRIANGLELIST = 4, WINED3DPT_TRIANGLESTRIP = 5, WINED3DPT_TRIANGLEFAN = 6, + WINED3DPT_LINELIST_ADJ = 10, + WINED3DPT_LINESTRIP_ADJ = 11, + WINED3DPT_TRIANGLELIST_ADJ = 12, + WINED3DPT_TRIANGLESTRIP_ADJ = 13, WINED3DPT_FORCE_DWORD = 0x7fffffff } WINED3DPRIMITIVETYPE;

1 0

Henri Verbeet : wined3d: Pass the vertex count rather than the primitive count to wined3d draw methods .
by Alexandre Julliard 05 Mar '09

05 Mar '09

Module: wine Branch: master Commit: 602bb1f551893404dff99ff0331746c0e7bf0d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602bb1f551893404dff99ff03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 5 12:30:42 2009 +0100 wined3d: Pass the vertex count rather than the primitive count to wined3d draw methods. --- dlls/d3d8/device.c | 40 +++++++- dlls/d3d9/device.c | 40 +++++++- dlls/ddraw/device.c | 204 ++-------------------------------------- dlls/wined3d/device.c | 74 +++++++-------- dlls/wined3d/drawprim.c | 98 +++++++------------ dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 12 +- 7 files changed, 156 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=602bb1f551893404dff99…

1 0