wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Nikolay Sivov : msxml3: Store boolean properties in a single array.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 1831e54916152cb5c334c19bc4c25cce83e03ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1831e54916152cb5c334c19bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 4 10:59:32 2011 +0400 msxml3: Store boolean properties in a single array. --- dlls/msxml3/mxwriter.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index ec82611..b48533a 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -42,6 +42,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const char crlfA[] = "\r\n"; +typedef enum +{ + MXWriter_Standalone = 0, + MXWriter_LastProp +} MXWRITER_PROPS; + typedef struct _mxwriter { IMXWriter IMXWriter_iface; @@ -49,7 +55,7 @@ typedef struct _mxwriter LONG ref; - VARIANT_BOOL standalone; + VARIANT_BOOL props[MXWriter_LastProp]; BSTR encoding; BSTR version; @@ -320,7 +326,7 @@ static HRESULT WINAPI mxwriter_put_standalone(IMXWriter *iface, VARIANT_BOOL val mxwriter *This = impl_from_IMXWriter( iface ); TRACE("(%p)->(%d)\n", This, value); - This->standalone = value; + This->props[MXWriter_Standalone] = value; return S_OK; } @@ -333,7 +339,7 @@ static HRESULT WINAPI mxwriter_get_standalone(IMXWriter *iface, VARIANT_BOOL *va if (!value) return E_POINTER; - *value = This->standalone; + *value = This->props[MXWriter_Standalone]; return S_OK; } @@ -473,7 +479,7 @@ static HRESULT WINAPI mxwriter_saxcontent_startDocument(ISAXContentHandler *ifac /* standalone */ xmlOutputBufferWriteString(This->buffer, " standalone=\""); - if (This->standalone == VARIANT_TRUE) + if (This->props[MXWriter_Standalone] == VARIANT_TRUE) xmlOutputBufferWriteString(This->buffer, "yes\"?>"); else xmlOutputBufferWriteString(This->buffer, "no\"?>"); @@ -621,7 +627,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; - This->standalone = VARIANT_FALSE; + This->props[MXWriter_Standalone] = VARIANT_FALSE; This->encoding = SysAllocString(utf16W); This->version = SysAllocString(version10W);

1 0

Alexandre Julliard : msvcp: Implement the Ctraits math functions.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 277120bbd59318e36027dfca153da7ba0fe72ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277120bbd59318e36027dfca1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 16:58:09 2011 +0200 msvcp: Implement the Ctraits math functions. --- dlls/msvcp70/msvcp70.spec | 66 +++++++++++++++--------------- dlls/msvcp71/msvcp71.spec | 66 +++++++++++++++--------------- dlls/msvcp80/msvcp80.spec | 66 +++++++++++++++--------------- dlls/msvcp90/math.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 66 +++++++++++++++--------------- include/msvcrt/math.h | 2 +- 6 files changed, 228 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=277120bbd59318e36027d…

1 0

Alexandre Julliard : msvcp: Implement the numeric limit functions.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: af0c9edfc3b9faac928ad9c7fc462a51c206ce3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0c9edfc3b9faac928ad9c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 15:15:51 2011 +0200 msvcp: Implement the numeric limit functions. --- dlls/msvcp100/msvcp100.spec | 332 +++++++++++++++++----------------- dlls/msvcp60/msvcp60.spec | 272 ++++++++++++++-------------- dlls/msvcp70/msvcp70.spec | 332 +++++++++++++++++----------------- dlls/msvcp71/msvcp71.spec | 332 +++++++++++++++++----------------- dlls/msvcp80/msvcp80.spec | 332 +++++++++++++++++----------------- dlls/msvcp90/math.c | 432 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 332 +++++++++++++++++----------------- 7 files changed, 1398 insertions(+), 966 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af0c9edfc3b9faac928ad…

1 0

Alexandre Julliard : msvcp: Implement the numeric limit constants.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 9e89da33f75c03e86829a0dbaf8029a79e3cb300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e89da33f75c03e86829a0dba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 13:49:36 2011 +0200 msvcp: Implement the numeric limit constants. --- dlls/msvcp100/msvcp100.spec | 204 +++++++++++++------------- dlls/msvcp70/msvcp70.spec | 204 +++++++++++++------------- dlls/msvcp71/msvcp71.spec | 204 +++++++++++++------------- dlls/msvcp80/msvcp80.spec | 204 +++++++++++++------------- dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/math.c | 349 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 204 +++++++++++++------------- 7 files changed, 860 insertions(+), 510 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e89da33f75c03e86829a…

1 0

Alexandre Julliard : msvcp: Export a couple of variables and their access function.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 5b58de9648884f93e7f06c3ad3cfc8ba50d4d598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b58de9648884f93e7f06c3ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 13:48:21 2011 +0200 msvcp: Export a couple of variables and their access function. --- dlls/msvcp100/msvcp100.c | 3 +++ dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp70/msvcp70.spec | 6 +++--- dlls/msvcp71/msvcp71.spec | 6 +++--- dlls/msvcp80/msvcp80.spec | 14 +++++++------- dlls/msvcp90/msvcp90.spec | 14 +++++++------- dlls/msvcp90/msvcp90_main.c | 21 +++++++++++++++++++++ 7 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index 98087a7..ed44b72 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -23,6 +23,9 @@ #include "windef.h" #include "winbase.h" +/* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */ +const __int64 std_BADOFF = -1; + BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index e37e831..c3d1a8d 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -767,7 +767,7 @@ @ stub -arch=win32 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IAEXABV123@@Z @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z -# extern -arch=win64 ?_BADOFF@std@@3_JB +@ extern ?_BADOFF@std@@3_JB std_BADOFF @ stub -arch=win32 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ @ stub -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 4484167..dedfb31 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1753,8 +1753,8 @@ @ stub -arch=win64 ?_Addfac@locale@std@@QEAAAEAV12@PEAVfacet@12@_K1@Z @ stub -arch=win32 ?_Addstd@ios_base@std@@QAEXXZ @ stub -arch=win64 ?_Addstd@ios_base@std@@QEAAXXZ -# extern -arch=win32 ?_BADOFF@std@@3JB -# extern -arch=win64 ?_BADOFF@std@@3_JB +@ extern -arch=win32 ?_BADOFF@std@@3JB msvcp90.?_BADOFF@std@@3JB +@ extern -arch=win64 ?_BADOFF@std@@3_JB msvcp90.?_BADOFF@std@@3_JB @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z @ stub -arch=win32 ?_Charalloc@?$allocator@D@std@@QAEPADI@Z @@ -1814,7 +1814,7 @@ @ stub -arch=win32 ?_Fput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DPBDIIII@Z @ stub -arch=win32 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPBDIIII@Z @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z -# extern ?_Fpz@std@@3_JA +@ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index ca453fb..12330af 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1941,8 +1941,8 @@ @ stub -arch=win64 ?_Addfac@locale@std@@QEAAAEAV12@PEAVfacet@12@_K1@Z @ stub -arch=win32 ?_Addstd@ios_base@std@@QAEXXZ @ stub -arch=win64 ?_Addstd@ios_base@std@@QEAAXXZ -# extern -arch=win32 ?_BADOFF@std@@3JB -# extern -arch=win64 ?_BADOFF@std@@3_JB +@ extern -arch=win32 ?_BADOFF@std@@3JB msvcp90.?_BADOFF@std@@3JB +@ extern -arch=win64 ?_BADOFF@std@@3_JB msvcp90.?_BADOFF@std@@3_JB @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z # extern -arch=win32 ?_Clocptr@_Locimp@locale@std@@0PAV123@A @@ -2000,7 +2000,7 @@ @ stub -arch=win64 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEBD_K333@Z @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z @ stub -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z -# extern ?_Fpz@std@@3_JA +@ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index ff1d633..399dd99 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2103,10 +2103,10 @@ @ stub -arch=win32 ?_Addstd@ios_base@std@@SAXPAV12@@Z @ stub -arch=win64 ?_Addstd@ios_base@std@@SAXPEAV12@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z -# extern -arch=win32 ?_BADOFF@std@@3JB -# extern -arch=win64 ?_BADOFF@std@@3_JB -@ stub -arch=win32 ?_BADOFF_func@std@@YAABJXZ -@ stub -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ +@ extern -arch=win32 ?_BADOFF@std@@3JB msvcp90.?_BADOFF@std@@3JB +@ extern -arch=win64 ?_BADOFF@std@@3_JB msvcp90.?_BADOFF@std@@3_JB +@ cdecl -arch=win32 ?_BADOFF_func@std@@YAABJXZ() msvcp90.?_BADOFF_func@std@@YAABJXZ +@ cdecl -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ() msvcp90.?_BADOFF_func@std@@YAAEB_JXZ @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z @ stub -arch=win32 ?_Cerr_func@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ @@ -2215,9 +2215,9 @@ @ stub -arch=win64 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEBD_K333@Z @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z @ stub -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z -# extern ?_Fpz@std@@3_JA -@ stub -arch=win32 ?_Fpz_func@std@@YAAA_JXZ -@ stub -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ +@ extern ?_Fpz@std@@3_JA msvcp90.?_Fpz@std@@3_JA +@ cdecl -arch=win32 ?_Fpz_func@std@@YAAA_JXZ() msvcp90.?_Fpz_func@std@@YAAA_JXZ +@ cdecl -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ() msvcp90.?_Fpz_func@std@@YAAEA_JXZ @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@@Z @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@@Z @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@@Z diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2857a82..9e5cf0c 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -2106,10 +2106,10 @@ @ stub -arch=win32 ?_Addstd@ios_base@std@@SAXPAV12@@Z @ stub -arch=win64 ?_Addstd@ios_base@std@@SAXPEAV12@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z -# extern -arch=win32 ?_BADOFF@std@@3JB -# extern -arch=win64 ?_BADOFF@std@@3_JB -@ stub -arch=win32 ?_BADOFF_func@std@@YAABJXZ -@ stub -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ +@ extern -arch=win32 ?_BADOFF@std@@3JB std_BADOFF +@ extern -arch=win64 ?_BADOFF@std@@3_JB std_BADOFF +@ cdecl -arch=win32 ?_BADOFF_func@std@@YAABJXZ() std_BADOFF_func +@ cdecl -arch=win64 ?_BADOFF_func@std@@YAAEB_JXZ() std_BADOFF_func @ stub -arch=win32 ?_Callfns@ios_base@std@@AAEXW4event@12@@Z @ stub -arch=win64 ?_Callfns@ios_base@std@@AEAAXW4event@12@@Z @ stub -arch=win32 ?_Cerr_func@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@1@XZ @@ -2218,9 +2218,9 @@ @ stub -arch=win64 ?_Fput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEBD_K333@Z @ stub -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z @ stub -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z -# extern ?_Fpz@std@@3_JA -@ stub -arch=win32 ?_Fpz_func@std@@YAAA_JXZ -@ stub -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ +@ extern ?_Fpz@std@@3_JA std_Fpz +@ cdecl -arch=win32 ?_Fpz_func@std@@YAAA_JXZ() std_Fpz_func +@ cdecl -arch=win64 ?_Fpz_func@std@@YAAEA_JXZ() std_Fpz_func @ stub -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z @ stub -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z @ stub -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 9ce763c..75c807e 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -64,3 +64,24 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/* ?_BADOFF@std@@3JB -> long const std::_BADOFF */ +/* ?_BADOFF@std@@3_JB -> __int64 const std::_BADOFF */ +const INT_PTR std_BADOFF = -1; + +/* ?_BADOFF_func@std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */ +/* ?_BADOFF_func@std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */ +const INT_PTR * __cdecl std_BADOFF_func(void) +{ + return &std_BADOFF; +} + +/* ?_Fpz@std@@3_JA __int64 std::_Fpz */ +__int64 std_Fpz = 0; + +/* ?_Fpz_func@std@@YAAA_JXZ -> __int64 & __cdecl std::_Fpz_func(void) */ +/* ?_Fpz_func@std@@YAAEA_JXZ -> __int64 & __ptr64 __cdecl std::_Fpz_func(void) */ +__int64 * __cdecl std_Fpz_func(void) +{ + return &std_Fpz; +}

1 0

Alexandre Julliard : make_specfiles: Properly replace commented out exports .
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 83a8c45dc413b69ad5e7e85c2c5ce643d4475952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a8c45dc413b69ad5e7e85c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 4 13:45:36 2011 +0200 make_specfiles: Properly replace commented out exports. --- tools/make_specfiles | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 73dd2bf..b03fe54 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -198,7 +198,7 @@ sub update_spec_file($) my %parent = %{$funcs{$func}}; goto done if $parent{spec} eq $descr{spec}; # the definition is in this spec file - if ($descr{callconv} ne "stub" && $descr{target} !~ /\./) + if ($descr{callconv} ne "stub" && $descr{target} !~ /\./ && !$commented_out) { printf "%s:%u: note: %s already defined in %s\n", $file, $., $func, $parent{spec} if $show_duplicates; goto done;

1 0

Henri Verbeet : d3d8: Check for D3DPOOL_DEFAULT resources before doing a Reset().
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 693fb6d56cb11275ee8a6b96fbb01fc1ded82ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693fb6d56cb11275ee8a6b96f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 3 22:30:20 2011 +0200 d3d8: Check for D3DPOOL_DEFAULT resources before doing a Reset(). --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/device.c | 73 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d8/tests/device.c | 12 ++++---- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 96b31d0..8039048 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -187,6 +187,7 @@ struct IDirect3DDevice8Impl /* Avoids recursion with nested ReleaseRef to 0 */ BOOL inDestruction; + BOOL lost; }; HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0945632..6d0b247 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -334,8 +334,16 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(IDirect3DDevice8 *iface) /* IDirect3DDevice Interface follow: */ static HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(IDirect3DDevice8 *iface) { + IDirect3DDevice8Impl *device = impl_from_IDirect3DDevice8(iface); + TRACE("iface %p.\n", iface); + if (device->lost) + { + TRACE("Device is lost.\n"); + return D3DERR_DEVICENOTRESET; + } + return D3D_OK; } @@ -542,15 +550,71 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(IDirect3DDe return D3D_OK; } +static HRESULT WINAPI reset_enum_callback(struct wined3d_resource *resource, void *data) +{ + struct wined3d_resource_desc desc; + BOOL *resources_ok = data; + + wined3d_resource_get_desc(resource, &desc); + if (desc.pool == WINED3DPOOL_DEFAULT) + { + IDirect3DSurface8 *surface; + + if (desc.resource_type != WINED3DRTYPE_SURFACE) + { + WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource); + *resources_ok = FALSE; + return S_FALSE; + } + + surface = wined3d_resource_get_parent(resource); + + IDirect3DSurface8_AddRef(surface); + if (IDirect3DSurface8_Release(surface)) + { + WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); + *resources_ok = FALSE; + return S_FALSE; + } + + WARN("Surface %p (resource %p) is an implicit resource with ref 0.\n", surface, resource); + } + + return S_OK; +} + static HRESULT WINAPI IDirect3DDevice8Impl_Reset(IDirect3DDevice8 *iface, D3DPRESENT_PARAMETERS *pPresentationParameters) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); WINED3DPRESENT_PARAMETERS localParameters; + BOOL resources_ok = TRUE; HRESULT hr; + UINT i; TRACE("iface %p, present_parameters %p.\n", iface, pPresentationParameters); + wined3d_mutex_lock(); + IWineD3DDevice_SetIndexBuffer(This->WineD3DDevice, NULL, WINED3DFMT_UNKNOWN); + for (i = 0; i < 16; ++i) + { + IWineD3DDevice_SetStreamSource(This->WineD3DDevice, i, NULL, 0, 0); + } + for (i = 0; i < 16; ++i) + { + IWineD3DDevice_SetTexture(This->WineD3DDevice, i, NULL); + } + + IWineD3DDevice_EnumResources(This->WineD3DDevice, reset_enum_callback, &resources_ok); + if (!resources_ok) + { + WARN("The application is holding D3DPOOL_DEFAULT resources, rejecting reset.\n"); + This->lost = TRUE; + wined3d_mutex_unlock(); + + return D3DERR_DEVICELOST; + } + localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; localParameters.BackBufferHeight = pPresentationParameters->BackBufferHeight; localParameters.BackBufferFormat = wined3dformat_from_d3dformat(pPresentationParameters->BackBufferFormat); @@ -567,10 +631,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(IDirect3DDevice8 *iface, localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; localParameters.AutoRestoreDisplayMode = TRUE; - wined3d_mutex_lock(); hr = IWineD3DDevice_Reset(This->WineD3DDevice, &localParameters); - if(SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) + { hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, WINED3DRS_POINTSIZE_MIN, 0); + This->lost = FALSE; + } + else + { + This->lost = TRUE; } wined3d_mutex_unlock(); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 07aef02..bf2d4c3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1089,9 +1089,9 @@ static void test_reset(void) hr = IDirect3DDevice8_CreateTexture(device1, 16, 16, 1, 0, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &texture); ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); hr = IDirect3DDevice8_Reset(device1, &d3dpp); - todo_wine ok(hr == D3DERR_DEVICELOST, "Reset returned %#x, expected %#x.\n", hr, D3DERR_DEVICELOST); + ok(hr == D3DERR_DEVICELOST, "Reset returned %#x, expected %#x.\n", hr, D3DERR_DEVICELOST); hr = IDirect3DDevice8_TestCooperativeLevel(device1); - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); IDirect3DTexture8_Release(texture); /* Reset again to get the device out of the lost state. */ hr = IDirect3DDevice8_Reset(device1, &d3dpp); @@ -1177,9 +1177,9 @@ static void test_reset(void) hr = IDirect3DDevice8_GetBackBuffer(device1, 0, D3DBACKBUFFER_TYPE_MONO, &surface); ok(SUCCEEDED(hr), "GetBackBuffer failed, hr %#x.\n", hr); hr = IDirect3DDevice8_Reset(device1, &d3dpp); - todo_wine ok(hr == D3DERR_DEVICELOST, "Reset returned %#x, expected %#x.\n", hr, D3DERR_DEVICELOST); + ok(hr == D3DERR_DEVICELOST, "Reset returned %#x, expected %#x.\n", hr, D3DERR_DEVICELOST); hr = IDirect3DDevice8_TestCooperativeLevel(device1); - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); IDirect3DSurface8_Release(surface); hr = IDirect3DDevice8_Reset(device1, &d3dpp); ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); @@ -1204,7 +1204,7 @@ static void test_reset(void) hr = IDirect3DDevice8_Reset(device1, &d3dpp); ok(hr == D3DERR_INVALIDCALL, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); hr = IDirect3DDevice8_TestCooperativeLevel(device1); - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; @@ -1215,7 +1215,7 @@ static void test_reset(void) hr = IDirect3DDevice8_Reset(device1, &d3dpp); ok(hr == D3DERR_INVALIDCALL, "Reset returned %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); hr = IDirect3DDevice8_TestCooperativeLevel(device1); - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); + ok(hr == D3DERR_DEVICENOTRESET, "TestCooperativeLevel returned %#x, expected %#x.\n", hr, D3DERR_DEVICENOTRESET); hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr);

1 0

Henri Verbeet : d3d8/tests: Add a Reset test.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: 7db1ebb8531c0c70bd93d36c1a4f1d9572a75aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db1ebb8531c0c70bd93d36c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 3 22:30:19 2011 +0200 d3d8/tests: Add a Reset test. This is based on the equivalent d3d9 test. --- dlls/d3d8/tests/device.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 402 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7db1ebb8531c0c70bd93d…

1 0

Henri Verbeet : d3d8/tests: Fix some failure messages in test_depth_stencil_size().
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: b20a2703e40c50ae2f5b8cc872427ff094374207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b20a2703e40c50ae2f5b8cc87… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 3 22:30:18 2011 +0200 d3d8/tests: Fix some failure messages in test_depth_stencil_size(). --- dlls/d3d8/tests/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 16fc22b..259d089 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2151,13 +2151,13 @@ static void test_depth_stencil_size(void) hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetRenderTarget returned %#x, expected D3DERR_INVALIDCALL.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds_bigger); - ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); /* try to set the small ds without changing the render target at the same time */ hr = IDirect3DDevice8_SetRenderTarget(device, NULL, ds); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetRenderTarget returned %#x, expected D3DERR_INVALIDCALL.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, NULL, ds_bigger2); - ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetRenderTarget(device, &surf); ok(surf == rt, "The render target is %p, expected %p\n", surf, rt); @@ -2167,7 +2167,7 @@ static void test_depth_stencil_size(void) IDirect3DSurface8_Release(surf); hr = IDirect3DDevice8_SetRenderTarget(device, NULL, NULL); - ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surf); ok(surf == NULL, "The depth stencil is %p, expected NULL\n", surf); if (surf) IDirect3DSurface8_Release(surf);

1 0

Henri Verbeet : d3d9/tests: Avoid leaking a device in the Reset test.
by Alexandre Julliard 04 May '11

04 May '11

Module: wine Branch: master Commit: d06873443d88d84589b366558509600b8d8d0c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06873443d88d84589b366558… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 3 22:30:17 2011 +0200 d3d9/tests: Avoid leaking a device in the Reset test. --- dlls/d3d9/tests/device.c | 131 ++++++++++++++++++++++++---------------------- 1 files changed, 68 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d06873443d88d84589b36…

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011