June 2012 - Wine-Commits - list.winehq.org

Francois Gouget : iphlpapi: Don' t rely on the HAVE_XXX macros having a numeric values.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 0f3085c82e2d1c4a5d90d1f4c5253256ad2f4871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3085c82e2d1c4a5d90d1f4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 04:53:28 2012 +0200 iphlpapi: Don't rely on the HAVE_XXX macros having a numeric values. --- dlls/iphlpapi/ipstats.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 009dd99..2f8ec90 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -664,9 +664,9 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) int ip_ttl, ip_forwarding; -#if HAVE_STRUCT_IPSTAT_IPS_TOTAL +#if defined(HAVE_STRUCT_IPSTAT_IPS_TOTAL) struct ipstat ip_stat; -#elif HAVE_STRUCT_IP_STATS_IPS_TOTAL +#elif defined(HAVE_STRUCT_IP_STATS_IPS_TOTAL) struct ip_stats ip_stat; #endif size_t needed; @@ -812,7 +812,7 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT || HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(TCPCTL_STATS) && (defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) || defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT)) { #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ #define TCPTV_MIN 2 @@ -821,9 +821,9 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) int mib[] = {CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) #define hz 1000 -#if HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT +#if defined(HAVE_STRUCT_TCPSTAT_TCPS_CONNATTEMPT) struct tcpstat tcp_stat; -#elif HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT +#elif defined(HAVE_STRUCT_TCP_STATS_TCPS_CONNATTEMPT) struct tcp_stats tcp_stat; #endif size_t needed = sizeof(tcp_stat);

1 0

Piotr Caban : msvcp90: Accept more base classes in DEFINE_RTTI_DATA macro.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 8d39c7d8899d224174bee692934ab34eada9b69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d39c7d8899d224174bee6929… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:27 2012 +0200 msvcp90: Accept more base classes in DEFINE_RTTI_DATA macro. --- dlls/msvcp90/exception.c | 18 +++++++++--------- dlls/msvcp90/ios.c | 30 +++++++++++++++--------------- dlls/msvcp90/locale.c | 32 ++++++++++++++++---------------- dlls/msvcp90/msvcp90.h | 18 +++++++++++++++--- 4 files changed, 55 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d39c7d8899d224174bee…

1 0

Piotr Caban : msvcp90: Added basic_filebuf<char> implementation.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 9f9a4a18d1fecadba589e7b7cf7f601e08ea8503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9a4a18d1fecadba589e7b7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:06 2012 +0200 msvcp90: Added basic_filebuf<char> implementation. --- dlls/msvcp90/ios.c | 576 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/locale.c | 17 +-- dlls/msvcp90/msvcp90.h | 26 ++ dlls/msvcp90/msvcp90.spec | 102 ++++---- 4 files changed, 653 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f9a4a18d1fecadba589e…

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 034de95550be8518fce566041a225434ed3ef26c URL: http://source.winehq.org/git/wine.git/?a=commit;h=034de95550be8518fce566041… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:14:30 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 262 ++++++++++++------------ dlls/msvcp70/msvcp70.spec | 374 +++++++++++++++++----------------- dlls/msvcp71/msvcp71.spec | 406 +++++++++++++++++++------------------- dlls/msvcp80/msvcp80.spec | 462 +++++++++++++++++++++--------------------- 4 files changed, 752 insertions(+), 752 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=034de95550be8518fce56…

1 0

Piotr Caban : msvcp90: Added basic_istream<char>::getline(basic_string<char >) implementation.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 0db98a30b99bcfc6135a4608d7bb34f61af375d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db98a30b99bcfc6135a4608d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:14:09 2012 +0200 msvcp90: Added basic_istream<char>::getline(basic_string<char>) implementation. --- dlls/msvcp90/ios.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 2 ++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8f4c216..97edacf 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -4630,6 +4630,39 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * return NULL; } +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z */ +basic_istream_char* __cdecl basic_istream_char_getline_str_delim( + basic_istream_char *istream, basic_string_char *str, char delim) +{ + IOSB_iostate state = IOSTATE_failbit; + int c; + + TRACE("(%p %p %c)\n", istream, str, delim); + + if(basic_istream_char_sentry_create(istream, TRUE)) { + MSVCP_basic_string_char_clear(str); + + for(c = basic_istream_char_get(istream); c!=delim && c!=EOF; + c = basic_istream_char_get(istream)) { + state = IOSTATE_goodbit; + MSVCP_basic_string_char_append_ch(str, c); + } + } + basic_istream_char_sentry_destroy(istream); + + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); + return istream; +} + +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +basic_istream_char* __cdecl basic_istream_char_getline_str( + basic_istream_char *istream, basic_string_char *str) +{ + return basic_istream_char_getline_str_delim(istream, str, '\n'); +} + /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ */ /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor, 8) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index ba5b0a7..5ca938c 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -247,6 +247,8 @@ basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); +void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); +basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 03e6c1a..0a6b24a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -386,10 +386,10 @@ @ stub -arch=win64 ??$exp(a)N@std@@YA?AV?$complex(a)N@0(a)AEBV10@@Z @ stub -arch=win32 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)ABV10@@Z @ stub -arch=win64 ??$exp(a)O@std@@YA?AV?$complex(a)O@0(a)AEBV10@@Z -@ stub -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z -@ stub -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(ptr ptr) basic_istream_char_getline_str +@ cdecl -arch=win32 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim +@ cdecl -arch=win64 ??$getline(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)D@Z(ptr ptr long) basic_istream_char_getline_str_delim @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win64 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AEAV10@AEAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0@@Z @ stub -arch=win32 ??$getline(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@0(a)AAV10@AAV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)G@Z

1 0

Piotr Caban : msvcp90: Added basic_ifstream<char> implementation.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 5b0548cc3ee525b59ac79c7a7f92ab6073ca24fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0548cc3ee525b59ac79c7a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:13:50 2012 +0200 msvcp90: Added basic_ifstream<char> implementation. --- dlls/msvcp90/ios.c | 221 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 68 +++++++------- 2 files changed, 255 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b0548cc3ee525b59ac79…

1 0

Aric Stewart : usp10: Do not use custom indic ShapeCharGlyphProp when shaping Indic numeric scripts .
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 3447b716a6e3bef5a6158de6c4b267d07cdf9422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3447b716a6e3bef5a6158de6c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 12 08:22:40 2012 -0500 usp10: Do not use custom indic ShapeCharGlyphProp when shaping Indic numeric scripts. --- dlls/usp10/shape.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 36f6854..cb5adcc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -415,25 +415,25 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, 0, ContextualShape_Lao, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('d','e','v','2'), ContextualShape_Devanagari, NULL}, {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, NULL}, {{ devanagari_features, 6}, required_bengali_features, MS_MAKE_TAG('b','n','g','2'), ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, {{ devanagari_features, 6}, required_gurmukhi_features, MS_MAKE_TAG('g','u','r','2'), ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ devanagari_features, 6}, required_gurmukhi_features, MS_MAKE_TAG('g','u','r','2'), ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ devanagari_features, 6}, required_gurmukhi_features, MS_MAKE_TAG('g','u','r','2'), ContextualShape_Gurmukhi, NULL}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, NULL}, {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 6}, required_devanagari_features, MS_MAKE_TAG('g','j','r','2'), ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 6}, required_oriya_features, MS_MAKE_TAG('o','r','y','2'), ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ devanagari_features, 6}, required_oriya_features, MS_MAKE_TAG('o','r','y','2'), ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ devanagari_features, 6}, required_oriya_features, MS_MAKE_TAG('o','r','y','2'), ContextualShape_Oriya, NULL}, {{ devanagari_features, 6}, required_tamil_features, MS_MAKE_TAG('t','a','m','2'), ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ devanagari_features, 6}, required_tamil_features, MS_MAKE_TAG('t','a','m','2'), ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('t','e','l','2'), ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ devanagari_features, 6}, required_tamil_features, MS_MAKE_TAG('t','a','m','2'), ContextualShape_Tamil, NULL}, {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('t','e','l','2'), ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('t','e','l','2'), ContextualShape_Telugu, NULL}, {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('k','n','d','2'), ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('k','n','d','2'), ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('k','n','d','2'), ContextualShape_Kannada, NULL}, {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ devanagari_features, 6}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, NULL}, {{ standard_features, 2}, NULL, 0, NULL, NULL}, {{ latin_features, 2}, NULL, 0, NULL, NULL}, {{ standard_features, 2}, NULL, 0, NULL, NULL},

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVertexShader9Impl.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: df9c6aa3ec1ca4239dc7e458f129efe921894ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9c6aa3ec1ca4239dc7e458f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:46 2012 +0200 d3d9: Get rid of IDirect3DVertexShader9Impl. --- dlls/d3d9/d3d9_private.h | 24 +++++++++--------------- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/shader.c | 43 +++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index f386eb5..d1d177d 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -272,23 +272,17 @@ HRESULT d3d9_vertex_declaration_create(struct d3d9_device *device, struct d3d9_vertex_declaration *unsafe_impl_from_IDirect3DVertexDeclaration9( IDirect3DVertexDeclaration9 *iface) DECLSPEC_HIDDEN; -/* ---------------------- */ -/* IDirect3DVertexShader9 */ -/* ---------------------- */ +struct d3d9_vertexshader +{ + IDirect3DVertexShader9 IDirect3DVertexShader9_iface; + LONG refcount; + struct wined3d_shader *wined3d_shader; + IDirect3DDevice9Ex *parent_device; +}; -/***************************************************************************** - * IDirect3DVertexShader implementation structure - */ -typedef struct IDirect3DVertexShader9Impl { - IDirect3DVertexShader9 IDirect3DVertexShader9_iface; - LONG ref; - struct wined3d_shader *wined3d_shader; - IDirect3DDevice9Ex *parentDevice; -} IDirect3DVertexShader9Impl; - -HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, +HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; -IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) DECLSPEC_HIDDEN; +struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) DECLSPEC_HIDDEN; #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 80349cd..2e5eb3d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2240,7 +2240,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, const DWORD *byte_code, IDirect3DVertexShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DVertexShader9Impl *object; + struct d3d9_vertexshader *object; HRESULT hr; TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); @@ -2269,7 +2269,7 @@ static HRESULT WINAPI d3d9_device_CreateVertexShader(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDirect3DVertexShader9 *shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DVertexShader9Impl *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); + struct d3d9_vertexshader *shader_obj = unsafe_impl_from_IDirect3DVertexShader9(shader); HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2285,7 +2285,7 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi static HRESULT WINAPI d3d9_device_GetVertexShader(IDirect3DDevice9Ex *iface, IDirect3DVertexShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DVertexShader9Impl *shader_impl; + struct d3d9_vertexshader *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index b4d8a3d..7020d15 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -22,39 +22,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -static inline IDirect3DVertexShader9Impl *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +static inline struct d3d9_vertexshader *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, IDirect3DVertexShader9_iface); + return CONTAINING_RECORD(iface, struct d3d9_vertexshader, IDirect3DVertexShader9_iface); } -static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **object) +static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DVertexShader9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DVertexShader9_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); - ULONG refcount = InterlockedIncrement(&shader->ref); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); if (refcount == 1) { - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + IDirect3DDevice9Ex_AddRef(shader->parent_device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -65,14 +65,14 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface) static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); - ULONG refcount = InterlockedDecrement(&shader->ref); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { - IDirect3DDevice9Ex *device = shader->parentDevice; + IDirect3DDevice9Ex *device = shader->parent_device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -87,11 +87,11 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface) static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface, IDirect3DDevice9 **device) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)shader->parentDevice; + *device = (IDirect3DDevice9 *)shader->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -99,10 +99,9 @@ static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface, return D3D_OK; } -static HRESULT WINAPI d3d9_vertexshader_GetFunction(IDirect3DVertexShader9 *iface, - void *data, UINT *data_size) +static HRESULT WINAPI d3d9_vertexshader_GetFunction(IDirect3DVertexShader9 *iface, void *data, UINT *data_size) { - IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface); + struct d3d9_vertexshader *shader = impl_from_IDirect3DVertexShader9(iface); HRESULT hr; TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); @@ -135,11 +134,11 @@ static const struct wined3d_parent_ops d3d9_vertexshader_wined3d_parent_ops = d3d9_vertexshader_wined3d_object_destroyed, }; -HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, struct d3d9_device *device, const DWORD *byte_code) +HRESULT vertexshader_init(struct d3d9_vertexshader *shader, struct d3d9_device *device, const DWORD *byte_code) { HRESULT hr; - shader->ref = 1; + shader->refcount = 1; shader->IDirect3DVertexShader9_iface.lpVtbl = &d3d9_vertexshader_vtbl; wined3d_mutex_lock(); @@ -152,13 +151,13 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, struct d3d9_device return hr; } - shader->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + shader->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(shader->parent_device); return D3D_OK; } -IDirect3DVertexShader9Impl *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) +struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface) { if (!iface) return NULL;

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DPixelShader9Impl.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 2f2995de753d09d21c2ed33ac65fb2f777f1d4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2995de753d09d21c2ed33ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:47 2012 +0200 d3d9: Get rid of IDirect3DPixelShader9Impl. --- dlls/d3d9/d3d9_private.h | 20 +++++++------------- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/shader.c | 46 ++++++++++++++++++++++------------------------ 3 files changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index d1d177d..6925272 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -287,23 +287,17 @@ struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVerte #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 -/* --------------------- */ -/* IDirect3DPixelShader9 */ -/* --------------------- */ - -/***************************************************************************** - * IDirect3DPixelShader implementation structure - */ -typedef struct IDirect3DPixelShader9Impl { +struct d3d9_pixelshader +{ IDirect3DPixelShader9 IDirect3DPixelShader9_iface; - LONG ref; + LONG refcount; struct wined3d_shader *wined3d_shader; - IDirect3DDevice9Ex *parentDevice; -} IDirect3DPixelShader9Impl; + IDirect3DDevice9Ex *parent_device; +}; -HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, +HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; -IDirect3DPixelShader9Impl *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; +struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; /* --------------- */ /* IDirect3DQuery9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2e5eb3d..1cfeace 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2547,7 +2547,7 @@ static HRESULT WINAPI d3d9_device_CreatePixelShader(IDirect3DDevice9Ex *iface, const DWORD *byte_code, IDirect3DPixelShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DPixelShader9Impl *object; + struct d3d9_pixelshader *object; HRESULT hr; TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); @@ -2576,7 +2576,7 @@ static HRESULT WINAPI d3d9_device_CreatePixelShader(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDirect3DPixelShader9 *shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DPixelShader9Impl *shader_obj = unsafe_impl_from_IDirect3DPixelShader9(shader); + struct d3d9_pixelshader *shader_obj = unsafe_impl_from_IDirect3DPixelShader9(shader); HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2592,7 +2592,7 @@ static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDir static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDirect3DPixelShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DPixelShader9Impl *shader_impl; + struct d3d9_pixelshader *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 7020d15..e65f485 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -166,39 +166,39 @@ struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVerte return impl_from_IDirect3DVertexShader9(iface); } -static inline IDirect3DPixelShader9Impl *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) +static inline struct d3d9_pixelshader *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, IDirect3DPixelShader9_iface); + return CONTAINING_RECORD(iface, struct d3d9_pixelshader, IDirect3DPixelShader9_iface); } -static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *iface, REFIID riid, void **object) +static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DPixelShader9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DPixelShader9_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); - ULONG refcount = InterlockedIncrement(&shader->ref); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); if (refcount == 1) { - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + IDirect3DDevice9Ex_AddRef(shader->parent_device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -209,14 +209,14 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); - ULONG refcount = InterlockedDecrement(&shader->ref); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { - IDirect3DDevice9Ex *device = shader->parentDevice; + IDirect3DDevice9Ex *device = shader->parent_device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -229,14 +229,13 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) return refcount; } -static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, - IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, IDirect3DDevice9 **device) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)shader->parentDevice; + *device = (IDirect3DDevice9 *)shader->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -244,10 +243,9 @@ static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, return D3D_OK; } -static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, - UINT *data_size) +static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, UINT *data_size) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); HRESULT hr; TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); @@ -280,11 +278,11 @@ static const struct wined3d_parent_ops d3d9_pixelshader_wined3d_parent_ops = d3d9_pixelshader_wined3d_object_destroyed, }; -HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, struct d3d9_device *device, const DWORD *byte_code) +HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *device, const DWORD *byte_code) { HRESULT hr; - shader->ref = 1; + shader->refcount = 1; shader->IDirect3DPixelShader9_iface.lpVtbl = &d3d9_pixelshader_vtbl; wined3d_mutex_lock(); @@ -297,13 +295,13 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, struct d3d9_device * return hr; } - shader->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + shader->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(shader->parent_device); return D3D_OK; } -IDirect3DPixelShader9Impl *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) +struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { if (!iface) return NULL;

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DQuery9Impl.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 56fffd06597c056655bf270fb0f8fe1134466f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56fffd06597c056655bf270fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:48 2012 +0200 d3d9: Get rid of IDirect3DQuery9Impl. --- dlls/d3d9/d3d9_private.h | 26 +++-------- dlls/d3d9/device.c | 2 +- dlls/d3d9/query.c | 108 ++++++++++++++++++++++----------------------- 3 files changed, 62 insertions(+), 74 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6925272..60bcc72 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -299,24 +299,14 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; -/* --------------- */ -/* IDirect3DQuery9 */ -/* --------------- */ - -/***************************************************************************** - * IDirect3DPixelShader implementation structure - */ -typedef struct IDirect3DQuery9Impl { - IDirect3DQuery9 IDirect3DQuery9_iface; - LONG ref; - - /* IDirect3DQuery9 fields */ - struct wined3d_query *wineD3DQuery; - - /* Parent reference */ - IDirect3DDevice9Ex *parentDevice; -} IDirect3DQuery9Impl; +struct d3d9_query +{ + IDirect3DQuery9 IDirect3DQuery9_iface; + LONG refcount; + struct wined3d_query *wined3d_query; + IDirect3DDevice9Ex *parent_device; +}; -HRESULT query_init(IDirect3DQuery9Impl *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; +HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1cfeace..1014c27 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2760,7 +2760,7 @@ static HRESULT WINAPI d3d9_device_DeletePatch(IDirect3DDevice9Ex *iface, UINT ha static HRESULT WINAPI d3d9_device_CreateQuery(IDirect3DDevice9Ex *iface, D3DQUERYTYPE type, IDirect3DQuery9 **query) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DQuery9Impl *object; + struct d3d9_query *object; HRESULT hr; TRACE("iface %p, type %#x, query %p.\n", iface, type, query); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 20dcfc4..d363413 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -25,66 +25,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -static inline IDirect3DQuery9Impl *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) +static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DQuery9Impl, IDirect3DQuery9_iface); + return CONTAINING_RECORD(iface, struct d3d9_query, IDirect3DQuery9_iface); } -static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, - void **ppobj) +static HRESULT WINAPI d3d9_query_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DQuery9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DQuery9_AddRef(iface); - *ppobj = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *ppobj = NULL; + *out = NULL; return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DQuery9Impl_AddRef(IDirect3DQuery9 *iface) +static ULONG WINAPI d3d9_query_AddRef(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); + ULONG refcount = InterlockedIncrement(&query->refcount); - TRACE("%p increasing refcount to %u.\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DQuery9Impl_Release(IDirect3DQuery9 *iface) +static ULONG WINAPI d3d9_query_Release(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); + ULONG refcount = InterlockedDecrement(&query->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (ref == 0) { + if (!refcount) + { wined3d_mutex_lock(); - wined3d_query_decref(This->wineD3DQuery); + wined3d_query_decref(query->wined3d_query); wined3d_mutex_unlock(); - IDirect3DDevice9Ex_Release(This->parentDevice); - HeapFree(GetProcessHeap(), 0, This); + IDirect3DDevice9Ex_Release(query->parent_device); + HeapFree(GetProcessHeap(), 0, query); } - return ref; + return refcount; } -static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, - IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_query_GetDevice(IDirect3DQuery9 *iface, IDirect3DDevice9 **device) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)This->parentDevice; + *device = (IDirect3DDevice9 *)query->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -92,86 +91,85 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, return D3D_OK; } -static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(IDirect3DQuery9 *iface) +static D3DQUERYTYPE WINAPI d3d9_query_GetType(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); D3DQUERYTYPE type; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - type = wined3d_query_get_type(This->wineD3DQuery); + type = wined3d_query_get_type(query->wined3d_query); wined3d_mutex_unlock(); return type; } -static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(IDirect3DQuery9 *iface) +static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); DWORD ret; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_query_get_data_size(This->wineD3DQuery); + ret = wined3d_query_get_data_size(query->wined3d_query); wined3d_mutex_unlock(); return ret; } -static HRESULT WINAPI IDirect3DQuery9Impl_Issue(IDirect3DQuery9 *iface, DWORD dwIssueFlags) +static HRESULT WINAPI d3d9_query_Issue(IDirect3DQuery9 *iface, DWORD flags) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, dwIssueFlags); + TRACE("iface %p, flags %#x.\n", iface, flags); wined3d_mutex_lock(); - hr = wined3d_query_issue(This->wineD3DQuery, dwIssueFlags); + hr = wined3d_query_issue(query->wined3d_query, flags); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DQuery9Impl_GetData(IDirect3DQuery9 *iface, void *pData, - DWORD dwSize, DWORD dwGetDataFlags) +static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWORD size, DWORD flags) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p, data %p, size %u, flags %#x.\n", - iface, pData, dwSize, dwGetDataFlags); + iface, data, size, flags); wined3d_mutex_lock(); - hr = wined3d_query_get_data(This->wineD3DQuery, pData, dwSize, dwGetDataFlags); + hr = wined3d_query_get_data(query->wined3d_query, data, size, flags); wined3d_mutex_unlock(); return hr; } -static const IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl = +static const struct IDirect3DQuery9Vtbl d3d9_query_vtbl = { - IDirect3DQuery9Impl_QueryInterface, - IDirect3DQuery9Impl_AddRef, - IDirect3DQuery9Impl_Release, - IDirect3DQuery9Impl_GetDevice, - IDirect3DQuery9Impl_GetType, - IDirect3DQuery9Impl_GetDataSize, - IDirect3DQuery9Impl_Issue, - IDirect3DQuery9Impl_GetData + d3d9_query_QueryInterface, + d3d9_query_AddRef, + d3d9_query_Release, + d3d9_query_GetDevice, + d3d9_query_GetType, + d3d9_query_GetDataSize, + d3d9_query_Issue, + d3d9_query_GetData, }; -HRESULT query_init(IDirect3DQuery9Impl *query, struct d3d9_device *device, D3DQUERYTYPE type) +HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) { HRESULT hr; - query->IDirect3DQuery9_iface.lpVtbl = &Direct3DQuery9_Vtbl; - query->ref = 1; + query->IDirect3DQuery9_iface.lpVtbl = &d3d9_query_vtbl; + query->refcount = 1; wined3d_mutex_lock(); - hr = wined3d_query_create(device->wined3d_device, type, &query->wineD3DQuery); + hr = wined3d_query_create(device->wined3d_device, type, &query->wined3d_query); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -179,8 +177,8 @@ HRESULT query_init(IDirect3DQuery9Impl *query, struct d3d9_device *device, D3DQU return hr; } - query->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(query->parentDevice); + query->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(query->parent_device); return D3D_OK; }

1 0