wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Piotr Caban : msvcp100: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 0312726b46ab3be4d82e2660d0cb96146c1a465a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0312726b46ab3be4d82e2660d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:58 2016 +0200 msvcp100: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 663a8f6..239500f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2145,23 +2145,23 @@ @ cdecl -ret64 ?max@?$numeric_limits@_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max @ cdecl ?max@?$numeric_limits@_N@std@@SA_NXZ() std_numeric_limits_bool_max @ cdecl ?max@?$numeric_limits@_W@std@@SA_WXZ() std_numeric_limits_wchar_t_max -@ stub ?max_digits10@?$numeric_limits@C@std@@2HB -@ stub ?max_digits10@?$numeric_limits@D@std@@2HB -@ stub ?max_digits10@?$numeric_limits@E@std@@2HB -@ stub ?max_digits10@?$numeric_limits@F@std@@2HB -@ stub ?max_digits10@?$numeric_limits@G@std@@2HB -@ stub ?max_digits10@?$numeric_limits@H@std@@2HB -@ stub ?max_digits10@?$numeric_limits@I@std@@2HB -@ stub ?max_digits10@?$numeric_limits@J@std@@2HB -@ stub ?max_digits10@?$numeric_limits@K@std@@2HB -@ stub ?max_digits10@?$numeric_limits@M@std@@2HB -@ stub ?max_digits10@?$numeric_limits@N@std@@2HB -@ stub ?max_digits10@?$numeric_limits@O@std@@2HB -@ stub ?max_digits10@?$numeric_limits@_J@std@@2HB -@ stub ?max_digits10@?$numeric_limits@_K@std@@2HB -@ stub ?max_digits10@?$numeric_limits@_N@std@@2HB -@ stub ?max_digits10@?$numeric_limits@_W@std@@2HB -@ stub ?max_digits10@_Num_base@std@@2HB +# extern ?max_digits10@?$numeric_limits@C@std@@2HB +# extern ?max_digits10@?$numeric_limits@D@std@@2HB +# extern ?max_digits10@?$numeric_limits@E@std@@2HB +# extern ?max_digits10@?$numeric_limits@F@std@@2HB +# extern ?max_digits10@?$numeric_limits@G@std@@2HB +# extern ?max_digits10@?$numeric_limits@H@std@@2HB +# extern ?max_digits10@?$numeric_limits@I@std@@2HB +# extern ?max_digits10@?$numeric_limits@J@std@@2HB +# extern ?max_digits10@?$numeric_limits@K@std@@2HB +# extern ?max_digits10@?$numeric_limits@M@std@@2HB +# extern ?max_digits10@?$numeric_limits@N@std@@2HB +# extern ?max_digits10@?$numeric_limits@O@std@@2HB +# extern ?max_digits10@?$numeric_limits@_J@std@@2HB +# extern ?max_digits10@?$numeric_limits@_K@std@@2HB +# extern ?max_digits10@?$numeric_limits@_N@std@@2HB +# extern ?max_digits10@?$numeric_limits@_W@std@@2HB +# extern ?max_digits10@_Num_base@std@@2HB @ extern ?max_exponent10@?$numeric_limits@M@std@@2HB std_numeric_limits_float_max_exponent10 @ extern ?max_exponent10@?$numeric_limits@N@std@@2HB std_numeric_limits_double_max_exponent10 @ extern ?max_exponent10@?$numeric_limits@O@std@@2HB std_numeric_limits_long_double_max_exponent10

1 0

Piotr Caban : msvcp110: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 657773a3671b753ebe1c446352681f3542aae9d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=657773a3671b753ebe1c44635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:49 2016 +0200 msvcp110: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index ced9795..ff16de2 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -@ stub ??_7_Facet_base@std@@6B@ +# extern ??_7_Facet_base@std@@6B@ @ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable @@ -1077,26 +1077,26 @@ @ stub -arch=win64 ?NFS_Free@details@Concurrency@@YAXPEAX@Z @ stub -arch=win32 ?NFS_GetLineSize@details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize@details@Concurrency@@YA_KXZ -@ stub ?_10@placeholders@std@@3V?$_Ph@$09@2@A -@ stub ?_11@placeholders@std@@3V?$_Ph@$0L@@2@A -@ stub ?_12@placeholders@std@@3V?$_Ph@$0M@@2@A -@ stub ?_13@placeholders@std@@3V?$_Ph@$0N@@2@A -@ stub ?_14@placeholders@std@@3V?$_Ph@$0O@@2@A -@ stub ?_15@placeholders@std@@3V?$_Ph@$0P@@2@A -@ stub ?_16@placeholders@std@@3V?$_Ph@$0BA@@2@A -@ stub ?_17@placeholders@std@@3V?$_Ph@$0BB@@2@A -@ stub ?_18@placeholders@std@@3V?$_Ph@$0BC@@2@A -@ stub ?_19@placeholders@std@@3V?$_Ph@$0BD@@2@A -@ stub ?_1@placeholders@std@@3V?$_Ph@$00@2@A -@ stub ?_20@placeholders@std@@3V?$_Ph@$0BE@@2@A -@ stub ?_2@placeholders@std@@3V?$_Ph@$01@2@A -@ stub ?_3@placeholders@std@@3V?$_Ph@$02@2@A -@ stub ?_4@placeholders@std@@3V?$_Ph@$03@2@A -@ stub ?_5@placeholders@std@@3V?$_Ph@$04@2@A -@ stub ?_6@placeholders@std@@3V?$_Ph@$05@2@A -@ stub ?_7@placeholders@std@@3V?$_Ph@$06@2@A -@ stub ?_8@placeholders@std@@3V?$_Ph@$07@2@A -@ stub ?_9@placeholders@std@@3V?$_Ph@$08@2@A +# extern ?_10@placeholders@std@@3V?$_Ph@$09@2@A +# extern ?_11@placeholders@std@@3V?$_Ph@$0L@@2@A +# extern ?_12@placeholders@std@@3V?$_Ph@$0M@@2@A +# extern ?_13@placeholders@std@@3V?$_Ph@$0N@@2@A +# extern ?_14@placeholders@std@@3V?$_Ph@$0O@@2@A +# extern ?_15@placeholders@std@@3V?$_Ph@$0P@@2@A +# extern ?_16@placeholders@std@@3V?$_Ph@$0BA@@2@A +# extern ?_17@placeholders@std@@3V?$_Ph@$0BB@@2@A +# extern ?_18@placeholders@std@@3V?$_Ph@$0BC@@2@A +# extern ?_19@placeholders@std@@3V?$_Ph@$0BD@@2@A +# extern ?_1@placeholders@std@@3V?$_Ph@$00@2@A +# extern ?_20@placeholders@std@@3V?$_Ph@$0BE@@2@A +# extern ?_2@placeholders@std@@3V?$_Ph@$01@2@A +# extern ?_3@placeholders@std@@3V?$_Ph@$02@2@A +# extern ?_4@placeholders@std@@3V?$_Ph@$03@2@A +# extern ?_5@placeholders@std@@3V?$_Ph@$04@2@A +# extern ?_6@placeholders@std@@3V?$_Ph@$05@2@A +# extern ?_7@placeholders@std@@3V?$_Ph@$06@2@A +# extern ?_8@placeholders@std@@3V?$_Ph@$07@2@A +# extern ?_9@placeholders@std@@3V?$_Ph@$08@2@A @ stub -arch=arm ?_Add_vtordisp1@?$basic_ios@DU?$char_traits@D@std@@@std@@UAAXXZ @ stub -arch=i386 ?_Add_vtordisp1@?$basic_ios@DU?$char_traits@D@std@@@std@@UAEXXZ @ stub -arch=win64 ?_Add_vtordisp1@?$basic_ios@DU?$char_traits@D@std@@@std@@UEAAXXZ @@ -1149,7 +1149,7 @@ @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z @ extern ?_BADOFF@std@@3_JB std_BADOFF -@ stub ?_Byte_reverse_table@details@Concurrency@@3QBEB +# extern ?_Byte_reverse_table@details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str @ cdecl -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ(ptr) _Yarn_char_c_str @@ -1845,7 +1845,7 @@ @ stub ?_Xregex_error@std@@YAXW4error_type@regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error@std@@YAXPBD@Z(str) _Xruntime_error @ cdecl -arch=win64 ?_Xruntime_error@std@@YAXPEBD@Z(str) _Xruntime_error -@ stub ?adopt_lock@std@@3Uadopt_lock_t@1@B +# extern ?adopt_lock@std@@3Uadopt_lock_t@1@B @ cdecl -arch=arm ?always_noconv@codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv@codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @@ -1915,7 +1915,7 @@ @ stub -arch=arm ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBA?AW4dateorder@time_base@2@XZ @ stub -arch=i386 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ @ stub -arch=win64 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ -@ stub ?defer_lock@std@@3Udefer_lock_t@1@B +# extern ?defer_lock@std@@3Udefer_lock_t@1@B @ stub -arch=arm ?do_always_noconv@?$codecvt@DDH@std@@MBA_NXZ @ stub -arch=i386 ?do_always_noconv@?$codecvt@DDH@std@@MBE_NXZ @ stub -arch=win64 ?do_always_noconv@?$codecvt@DDH@std@@MEBA_NXZ @@ -3605,7 +3605,7 @@ @ cdecl -arch=arm ?toupper@?$ctype@_W@std@@QBA_W_W@Z(ptr long) ctype_wchar_toupper_ch @ thiscall -arch=i386 ?toupper@?$ctype@_W@std@@QBE_W_W@Z(ptr long) ctype_wchar_toupper_ch @ cdecl -arch=win64 ?toupper@?$ctype@_W@std@@QEBA_W_W@Z(ptr long) ctype_wchar_toupper_ch -@ stub ?try_to_lock@std@@3Utry_to_lock_t@1@B +# extern ?try_to_lock@std@@3Utry_to_lock_t@1@B @ cdecl -arch=arm ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAAHXZ(ptr) basic_streambuf_char_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow

1 0

Piotr Caban : msvcp120_app: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 96a89761c48f7915a19399f6b84e7d60e47f6ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a89761c48f7915a19399f6b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:44 2016 +0200 msvcp120_app: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120_app/msvcp120_app.spec | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f16402d..f61a6ef 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ @ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ @ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ msvcp120.??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ -@ stub ??_7_Facet_base@std@@6B@ +# extern ??_7_Facet_base@std@@6B@ @ extern ??_7_Locimp@locale@std@@6B@ msvcp120.??_7_Locimp@locale@std@@6B@ @ extern ??_7_Pad@std@@6B@ msvcp120.??_7_Pad@std@@6B@ @ extern ??_7codecvt_base@std@@6B@ msvcp120.??_7codecvt_base@std@@6B@ @@ -1078,26 +1078,26 @@ @ stub -arch=win64 ?NFS_Free@details@Concurrency@@YAXPEAX@Z @ stub -arch=win32 ?NFS_GetLineSize@details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize@details@Concurrency@@YA_KXZ -@ stub ?_10@placeholders@std@@3V?$_Ph@$09@2@A -@ stub ?_11@placeholders@std@@3V?$_Ph@$0L@@2@A -@ stub ?_12@placeholders@std@@3V?$_Ph@$0M@@2@A -@ stub ?_13@placeholders@std@@3V?$_Ph@$0N@@2@A -@ stub ?_14@placeholders@std@@3V?$_Ph@$0O@@2@A -@ stub ?_15@placeholders@std@@3V?$_Ph@$0P@@2@A -@ stub ?_16@placeholders@std@@3V?$_Ph@$0BA@@2@A -@ stub ?_17@placeholders@std@@3V?$_Ph@$0BB@@2@A -@ stub ?_18@placeholders@std@@3V?$_Ph@$0BC@@2@A -@ stub ?_19@placeholders@std@@3V?$_Ph@$0BD@@2@A -@ stub ?_1@placeholders@std@@3V?$_Ph@$00@2@A -@ stub ?_20@placeholders@std@@3V?$_Ph@$0BE@@2@A -@ stub ?_2@placeholders@std@@3V?$_Ph@$01@2@A -@ stub ?_3@placeholders@std@@3V?$_Ph@$02@2@A -@ stub ?_4@placeholders@std@@3V?$_Ph@$03@2@A -@ stub ?_5@placeholders@std@@3V?$_Ph@$04@2@A -@ stub ?_6@placeholders@std@@3V?$_Ph@$05@2@A -@ stub ?_7@placeholders@std@@3V?$_Ph@$06@2@A -@ stub ?_8@placeholders@std@@3V?$_Ph@$07@2@A -@ stub ?_9@placeholders@std@@3V?$_Ph@$08@2@A +# extern ?_10@placeholders@std@@3V?$_Ph@$09@2@A +# extern ?_11@placeholders@std@@3V?$_Ph@$0L@@2@A +# extern ?_12@placeholders@std@@3V?$_Ph@$0M@@2@A +# extern ?_13@placeholders@std@@3V?$_Ph@$0N@@2@A +# extern ?_14@placeholders@std@@3V?$_Ph@$0O@@2@A +# extern ?_15@placeholders@std@@3V?$_Ph@$0P@@2@A +# extern ?_16@placeholders@std@@3V?$_Ph@$0BA@@2@A +# extern ?_17@placeholders@std@@3V?$_Ph@$0BB@@2@A +# extern ?_18@placeholders@std@@3V?$_Ph@$0BC@@2@A +# extern ?_19@placeholders@std@@3V?$_Ph@$0BD@@2@A +# extern ?_1@placeholders@std@@3V?$_Ph@$00@2@A +# extern ?_20@placeholders@std@@3V?$_Ph@$0BE@@2@A +# extern ?_2@placeholders@std@@3V?$_Ph@$01@2@A +# extern ?_3@placeholders@std@@3V?$_Ph@$02@2@A +# extern ?_4@placeholders@std@@3V?$_Ph@$03@2@A +# extern ?_5@placeholders@std@@3V?$_Ph@$04@2@A +# extern ?_6@placeholders@std@@3V?$_Ph@$05@2@A +# extern ?_7@placeholders@std@@3V?$_Ph@$06@2@A +# extern ?_8@placeholders@std@@3V?$_Ph@$07@2@A +# extern ?_9@placeholders@std@@3V?$_Ph@$08@2@A @ cdecl -arch=arm ?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z(ptr long str) msvcp120.?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z @ thiscall -arch=i386 ?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z(ptr long str) msvcp120.?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z @ cdecl -arch=win64 ?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z(ptr long str) msvcp120.?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z @@ -1114,7 +1114,7 @@ @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z @ extern ?_BADOFF@std@@3_JB msvcp120.?_BADOFF@std@@3_JB -@ stub ?_Byte_reverse_table@details@Concurrency@@3QBEB +# extern ?_Byte_reverse_table@details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) msvcp120.?_C_str@?$_Yarn@D@std@@QBAPBDXZ @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) msvcp120.?_C_str@?$_Yarn@D@std@@QBEPBDXZ @ cdecl -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ(ptr) msvcp120.?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ @@ -1806,7 +1806,7 @@ @ stub ?_Xregex_error@std@@YAXW4error_type@regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error@std@@YAXPBD@Z(str) msvcp120.?_Xruntime_error@std@@YAXPBD@Z @ cdecl -arch=win64 ?_Xruntime_error@std@@YAXPEBD@Z(str) msvcp120.?_Xruntime_error@std@@YAXPEBD@Z -@ stub ?adopt_lock@std@@3Uadopt_lock_t@1@B +# extern ?adopt_lock@std@@3Uadopt_lock_t@1@B @ cdecl -arch=arm ?always_noconv@codecvt_base@std@@QBA_NXZ(ptr) msvcp120.?always_noconv@codecvt_base@std@@QBA_NXZ @ thiscall -arch=i386 ?always_noconv@codecvt_base@std@@QBE_NXZ(ptr) msvcp120.?always_noconv@codecvt_base@std@@QBE_NXZ @ cdecl -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ(ptr) msvcp120.?always_noconv@codecvt_base@std@@QEBA_NXZ @@ -1875,7 +1875,7 @@ @ stub -arch=arm ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBA?AW4dateorder@time_base@2@XZ @ stub -arch=i386 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ @ stub -arch=win64 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ -@ stub ?defer_lock@std@@3Udefer_lock_t@1@B +# extern ?defer_lock@std@@3Udefer_lock_t@1@B @ stub -arch=arm ?do_always_noconv@?$codecvt@DDH@std@@MBA_NXZ @ stub -arch=i386 ?do_always_noconv@?$codecvt@DDH@std@@MBE_NXZ @ stub -arch=win64 ?do_always_noconv@?$codecvt@DDH@std@@MEBA_NXZ @@ -3546,7 +3546,7 @@ @ cdecl -arch=arm ?toupper@?$ctype@_W@std@@QBA_W_W@Z(ptr long) msvcp120.?toupper@?$ctype@_W@std@@QBA_W_W@Z @ thiscall -arch=i386 ?toupper@?$ctype@_W@std@@QBE_W_W@Z(ptr long) msvcp120.?toupper@?$ctype@_W@std@@QBE_W_W@Z @ cdecl -arch=win64 ?toupper@?$ctype@_W@std@@QEBA_W_W@Z(ptr long) msvcp120.?toupper@?$ctype@_W@std@@QEBA_W_W@Z -@ stub ?try_to_lock@std@@3Utry_to_lock_t@1@B +# extern ?try_to_lock@std@@3Utry_to_lock_t@1@B @ cdecl -arch=arm ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAAHXZ(ptr) msvcp120.?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAAHXZ @ thiscall -arch=i386 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) msvcp120.?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ @ cdecl -arch=win64 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) msvcp120.?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ

1 0

Piotr Caban : msvcp120: Don't export structures as stubs.
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 287fb5a9bd8df800acd8dbc7c458481942d913ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=287fb5a9bd8df800acd8dbc7c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 2 13:00:36 2016 +0200 msvcp120: Don't export structures as stubs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/msvcp120.spec | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 374a418..981bda3 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -949,7 +949,7 @@ @ extern ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@ MSVCP_time_put_char_vtable @ extern ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@ MSVCP_time_put_short_vtable @ extern ??_7?$time_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@6B@ MSVCP_time_put_wchar_vtable -@ stub ??_7_Facet_base@std@@6B@ +# extern ??_7_Facet_base@std@@6B@ @ extern ??_7_Locimp@locale@std@@6B@ MSVCP_locale__Locimp_vtable @ extern ??_7_Pad@std@@6B@ MSVCP__Pad_vtable @ extern ??_7codecvt_base@std@@6B@ MSVCP_codecvt_base_vtable @@ -1078,26 +1078,26 @@ @ stub -arch=win64 ?NFS_Free@details@Concurrency@@YAXPEAX@Z @ stub -arch=win32 ?NFS_GetLineSize@details@Concurrency@@YAIXZ @ stub -arch=win64 ?NFS_GetLineSize@details@Concurrency@@YA_KXZ -@ stub ?_10@placeholders@std@@3V?$_Ph@$09@2@A -@ stub ?_11@placeholders@std@@3V?$_Ph@$0L@@2@A -@ stub ?_12@placeholders@std@@3V?$_Ph@$0M@@2@A -@ stub ?_13@placeholders@std@@3V?$_Ph@$0N@@2@A -@ stub ?_14@placeholders@std@@3V?$_Ph@$0O@@2@A -@ stub ?_15@placeholders@std@@3V?$_Ph@$0P@@2@A -@ stub ?_16@placeholders@std@@3V?$_Ph@$0BA@@2@A -@ stub ?_17@placeholders@std@@3V?$_Ph@$0BB@@2@A -@ stub ?_18@placeholders@std@@3V?$_Ph@$0BC@@2@A -@ stub ?_19@placeholders@std@@3V?$_Ph@$0BD@@2@A -@ stub ?_1@placeholders@std@@3V?$_Ph@$00@2@A -@ stub ?_20@placeholders@std@@3V?$_Ph@$0BE@@2@A -@ stub ?_2@placeholders@std@@3V?$_Ph@$01@2@A -@ stub ?_3@placeholders@std@@3V?$_Ph@$02@2@A -@ stub ?_4@placeholders@std@@3V?$_Ph@$03@2@A -@ stub ?_5@placeholders@std@@3V?$_Ph@$04@2@A -@ stub ?_6@placeholders@std@@3V?$_Ph@$05@2@A -@ stub ?_7@placeholders@std@@3V?$_Ph@$06@2@A -@ stub ?_8@placeholders@std@@3V?$_Ph@$07@2@A -@ stub ?_9@placeholders@std@@3V?$_Ph@$08@2@A +# extern ?_10@placeholders@std@@3V?$_Ph@$09@2@A +# extern ?_11@placeholders@std@@3V?$_Ph@$0L@@2@A +# extern ?_12@placeholders@std@@3V?$_Ph@$0M@@2@A +# extern ?_13@placeholders@std@@3V?$_Ph@$0N@@2@A +# extern ?_14@placeholders@std@@3V?$_Ph@$0O@@2@A +# extern ?_15@placeholders@std@@3V?$_Ph@$0P@@2@A +# extern ?_16@placeholders@std@@3V?$_Ph@$0BA@@2@A +# extern ?_17@placeholders@std@@3V?$_Ph@$0BB@@2@A +# extern ?_18@placeholders@std@@3V?$_Ph@$0BC@@2@A +# extern ?_19@placeholders@std@@3V?$_Ph@$0BD@@2@A +# extern ?_1@placeholders@std@@3V?$_Ph@$00@2@A +# extern ?_20@placeholders@std@@3V?$_Ph@$0BE@@2@A +# extern ?_2@placeholders@std@@3V?$_Ph@$01@2@A +# extern ?_3@placeholders@std@@3V?$_Ph@$02@2@A +# extern ?_4@placeholders@std@@3V?$_Ph@$03@2@A +# extern ?_5@placeholders@std@@3V?$_Ph@$04@2@A +# extern ?_6@placeholders@std@@3V?$_Ph@$05@2@A +# extern ?_7@placeholders@std@@3V?$_Ph@$06@2@A +# extern ?_8@placeholders@std@@3V?$_Ph@$07@2@A +# extern ?_9@placeholders@std@@3V?$_Ph@$08@2@A @ cdecl -arch=arm ?_Addcats@_Locinfo@std@@QAAAAV12@HPBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=i386 ?_Addcats@_Locinfo@std@@QAEAAV12@HPBD@Z(ptr long str) _Locinfo__Addcats @ cdecl -arch=win64 ?_Addcats@_Locinfo@std@@QEAAAEAV12@HPEBD@Z(ptr long str) _Locinfo__Addcats @@ -1114,7 +1114,7 @@ @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ@Z @ extern ?_BADOFF@std@@3_JB std_BADOFF -@ stub ?_Byte_reverse_table@details@Concurrency@@3QBEB +# extern ?_Byte_reverse_table@details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn@D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn@D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str @ cdecl -arch=win64 ?_C_str@?$_Yarn@D@std@@QEBAPEBDXZ(ptr) _Yarn_char_c_str @@ -1806,7 +1806,7 @@ @ stub ?_Xregex_error@std@@YAXW4error_type@regex_constants@1@@Z @ cdecl -arch=win32 ?_Xruntime_error@std@@YAXPBD@Z(str) _Xruntime_error @ cdecl -arch=win64 ?_Xruntime_error@std@@YAXPEBD@Z(str) _Xruntime_error -@ stub ?adopt_lock@std@@3Uadopt_lock_t@1@B +# extern ?adopt_lock@std@@3Uadopt_lock_t@1@B @ cdecl -arch=arm ?always_noconv@codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv@codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @@ -1875,7 +1875,7 @@ @ stub -arch=arm ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBA?AW4dateorder@time_base@2@XZ @ stub -arch=i386 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QBE?AW4dateorder@time_base@2@XZ @ stub -arch=win64 ?date_order@?$time_get@_WV?$istreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@QEBA?AW4dateorder@time_base@2@XZ -@ stub ?defer_lock@std@@3Udefer_lock_t@1@B +# extern ?defer_lock@std@@3Udefer_lock_t@1@B @ stub -arch=arm ?do_always_noconv@?$codecvt@DDH@std@@MBA_NXZ @ stub -arch=i386 ?do_always_noconv@?$codecvt@DDH@std@@MBE_NXZ @ stub -arch=win64 ?do_always_noconv@?$codecvt@DDH@std@@MEBA_NXZ @@ -3546,7 +3546,7 @@ @ cdecl -arch=arm ?toupper@?$ctype@_W@std@@QBA_W_W@Z(ptr long) ctype_wchar_toupper_ch @ thiscall -arch=i386 ?toupper@?$ctype@_W@std@@QBE_W_W@Z(ptr long) ctype_wchar_toupper_ch @ cdecl -arch=win64 ?toupper@?$ctype@_W@std@@QEBA_W_W@Z(ptr long) ctype_wchar_toupper_ch -@ stub ?try_to_lock@std@@3Utry_to_lock_t@1@B +# extern ?try_to_lock@std@@3Utry_to_lock_t@1@B @ cdecl -arch=arm ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAAHXZ(ptr) basic_streambuf_char_uflow @ thiscall -arch=i386 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_uflow @ cdecl -arch=win64 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_depth_blt_fbo().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 6c7eeeee32cb06fd95196a6cb6e0693da9dcb9fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7eeeee32cb06fd95196a6cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:33 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_depth_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ab4ee17..8ae4b73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -401,6 +401,7 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; @@ -448,9 +449,9 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ - surface_load_location(src_surface, context, src_location); + wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, src_location); if (!surface_is_full_rect(dst_surface, dst_rect)) - surface_load_location(dst_surface, context, dst_location); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in draw_primitive().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 4ff6946b61a0057a523dcd8c4298e19896dba357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff6946b61a0057a523dcd8c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:32 2016 +0200 wined3d: Use wined3d_texture_load_location() in draw_primitive(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9f92851..e5b30db 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -438,21 +438,20 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < gl_info->limits.buffers; ++i) { struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; - struct wined3d_surface *target = wined3d_rendertarget_view_get_surface(rtv); + struct wined3d_texture *rt; - if (target && rtv->format->id != WINED3DFMT_NULL) + if (!rtv || rtv->format->id == WINED3DFMT_NULL) + continue; + + rt = wined3d_texture_from_resource(rtv->resource); + if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { - if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) - { - surface_load_location(target, context, rtv->resource->draw_binding); - wined3d_texture_invalidate_location(target->container, - rtv->sub_resource_idx, ~rtv->resource->draw_binding); - } - else - { - wined3d_texture_prepare_location(target->container, rtv->sub_resource_idx, - context, rtv->resource->draw_binding); - } + wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); + wined3d_texture_invalidate_location(rt, rtv->sub_resource_idx, ~rtv->resource->draw_binding); + } + else + { + wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); } } @@ -482,7 +481,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) - surface_load_location(ds, context, location); + wined3d_texture_load_location(ds->container, dsv->sub_resource_idx, context, location); else wined3d_texture_prepare_location(ds->container, dsv->sub_resource_idx, context, location); }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_device_update_sub_resource().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 887bf4354345d54be5f291e6d361446bda87316e URL: http://source.winehq.org/git/wine.git/?a=commit;h=887bf4354345d54be5f291e6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:31 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_device_update_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ce06474..34ce224 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4151,7 +4151,7 @@ void CDECL wined3d_device_update_sub_resource(struct wined3d_device *device, str if (!dst_point.x && !dst_point.y && src_rect.right == width && src_rect.bottom == height) wined3d_texture_prepare_texture(texture, context, FALSE); else - surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(texture, context, FALSE); wined3d_surface_upload_data(surface, gl_info, resource->format,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in device_clear_render_targets().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 56f60eed909974a8b41f4cc941deba0d793be933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f60eed909974a8b41f4cc94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:30 2016 +0200 wined3d: Use wined3d_texture_load_location() in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 55046db..ce06474 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -324,15 +324,15 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c for (i = 0; i < rt_count; ++i) { struct wined3d_rendertarget_view *rtv = fb->render_targets[i]; - struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(rtv); - if (rt && rtv->format->id != WINED3DFMT_NULL) + if (rtv && rtv->format->id != WINED3DFMT_NULL) { + struct wined3d_texture *rt = wined3d_texture_from_resource(rtv->resource); + if (flags & WINED3DCLEAR_TARGET && !is_full_clear(target, draw_rect, rect_count ? clear_rect : NULL)) - surface_load_location(rt, context, rtv->resource->draw_binding); + wined3d_texture_load_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); else - wined3d_texture_prepare_location(rt->container, rtv->sub_resource_idx, - context, rtv->resource->draw_binding); + wined3d_texture_prepare_location(rt, rtv->sub_resource_idx, context, rtv->resource->draw_binding); } }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in context_validate_onscreen_formats().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: 3160eabf24613a8608a348330d4877de42958d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3160eabf24613a8608a348330… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 2 12:26:29 2016 +0200 wined3d: Use wined3d_texture_load_location() in context_validate_onscreen_formats(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb97fb9..f5311af 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2455,7 +2455,6 @@ static void context_validate_onscreen_formats(struct wined3d_context *context, { /* Onscreen surfaces are always in a swapchain */ struct wined3d_swapchain *swapchain = context->current_rt.texture->swapchain; - struct wined3d_surface *surface; if (context->render_offscreen || !depth_stencil) return; if (match_depth_stencil_format(swapchain->ds_format, depth_stencil->format)) return; @@ -2466,8 +2465,9 @@ static void context_validate_onscreen_formats(struct wined3d_context *context, WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ - surface = context->current_rt.texture->sub_resources[context->current_rt.sub_resource_idx].u.surface; - surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); + if (!(wined3d_texture_load_location(context->current_rt.texture, context->current_rt.sub_resource_idx, + context, WINED3D_LOCATION_TEXTURE_RGB))) + ERR("Failed to load location.\n"); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); context_set_render_offscreen(context, TRUE); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 865fb4d..098b5d0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -176,7 +176,7 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ -static BOOL wined3d_texture_load_location(struct wined3d_texture *texture, +BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { return texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4984ba2..abb950c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2760,6 +2760,8 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_load(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; +BOOL wined3d_texture_load_location(struct wined3d_texture *texture, + unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size_t size, const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx,

1 0

Józef Kucia : wined3d: Extract wined3d_swapchain_set_fullscreen() from wined3d_device_reset().
by Alexandre Julliard 02 Aug '16

02 Aug '16

Module: wine Branch: master Commit: cad279449c62a965a70a712a91b11ba52c4ff4f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad279449c62a965a70a712a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 1 22:28:35 2016 +0200 wined3d: Extract wined3d_swapchain_set_fullscreen() from wined3d_device_reset(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 74 ++++------------------------------------------- dlls/wined3d/swapchain.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 4 files changed, 80 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb3a23b..55046db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4641,8 +4641,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_rendertarget_view_desc view_desc; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; - struct wined3d_display_mode m; - BOOL DisplayModeChanged; HRESULT hr = WINED3D_OK; unsigned int i; @@ -4654,7 +4652,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, ERR("Failed to get the first implicit swapchain.\n"); return WINED3DERR_INVALIDCALL; } - DisplayModeChanged = swapchain->reapply_mode; if (reset_state) { @@ -4733,72 +4730,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_swapchain_set_window(swapchain, NULL); } - if (mode) - { - DisplayModeChanged = TRUE; - m = *mode; - } - else if (swapchain_desc->windowed) - { - m = swapchain->original_mode; - } - else - { - m.width = swapchain_desc->backbuffer_width; - m.height = swapchain_desc->backbuffer_height; - m.refresh_rate = swapchain_desc->refresh_rate; - m.format_id = swapchain_desc->backbuffer_format; - m.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - - if ((m.width != swapchain->desc.backbuffer_width - || m.height != swapchain->desc.backbuffer_height)) - DisplayModeChanged = TRUE; - } - if (!swapchain_desc->windowed != !swapchain->desc.windowed - || DisplayModeChanged) + || swapchain->reapply_mode || mode + || swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width + || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height) { - if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, &m))) - { - WARN("Failed to set display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } - - if (!swapchain_desc->windowed) - { - if (swapchain->desc.windowed) - { - HWND focus_window = device->create_parms.focus_window; - if (!focus_window) - focus_window = swapchain_desc->device_window; - if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) - { - ERR("Failed to acquire focus window, hr %#x.\n", hr); - return hr; - } - - /* switch from windowed to fs */ - wined3d_device_setup_fullscreen_window(device, swapchain->device_window, - swapchain_desc->backbuffer_width, - swapchain_desc->backbuffer_height); - } - else - { - /* Fullscreen -> fullscreen mode change */ - MoveWindow(swapchain->device_window, 0, 0, - swapchain_desc->backbuffer_width, - swapchain_desc->backbuffer_height, - TRUE); - } - swapchain->d3d_mode = m; - } - else if (!swapchain->desc.windowed) - { - /* Fullscreen -> windowed switch */ - wined3d_device_restore_fullscreen_window(device, swapchain->device_window); - wined3d_device_release_focus_window(device); - } - swapchain->desc.windowed = swapchain_desc->windowed; + if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode))) + return hr; } else if (!swapchain_desc->windowed) { @@ -4832,7 +4770,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_resource_desc texture_desc; struct wined3d_texture *texture; - TRACE("Creating the depth stencil buffer\n"); + TRACE("Creating the depth stencil buffer.\n"); texture_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; texture_desc.format = swapchain->desc.auto_depth_stencil_format; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7485c1c..28629ab 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1387,3 +1387,74 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha return WINED3D_OK; } + +HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, + const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode) +{ + struct wined3d_device *device = swapchain->device; + struct wined3d_display_mode default_mode; + unsigned int width, height; + HRESULT hr; + + TRACE("swapchain %p, desc %p, mode %p.\n", swapchain, swapchain_desc, mode); + + width = swapchain_desc->backbuffer_width; + height = swapchain_desc->backbuffer_height; + + if (!mode) + { + if (!swapchain_desc->windowed) + { + default_mode.width = swapchain_desc->backbuffer_width; + default_mode.height = swapchain_desc->backbuffer_height; + default_mode.refresh_rate = swapchain_desc->refresh_rate; + default_mode.format_id = swapchain_desc->backbuffer_format; + default_mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + } + else + { + default_mode = swapchain->original_mode; + } + mode = &default_mode; + } + + if (FAILED(hr = wined3d_set_adapter_display_mode(device->wined3d, device->adapter->ordinal, mode))) + { + WARN("Failed to set display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } + + if (!swapchain_desc->windowed) + { + if (swapchain->desc.windowed) + { + HWND focus_window = device->create_parms.focus_window; + if (!focus_window) + focus_window = swapchain->device_window; + if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) + { + ERR("Failed to acquire focus window, hr %#x.\n", hr); + return hr; + } + + /* switch from windowed to fs */ + wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); + } + else + { + /* Fullscreen -> fullscreen mode change */ + MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); + } + swapchain->d3d_mode = *mode; + } + else if (!swapchain->desc.windowed) + { + /* Fullscreen -> windowed switch */ + wined3d_device_restore_fullscreen_window(device, swapchain->device_window); + wined3d_device_release_focus_window(device); + } + + swapchain->desc.windowed = swapchain_desc->windowed; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 77b506d..bdf3916 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -242,6 +242,7 @@ @ cdecl wined3d_swapchain_incref(ptr) @ cdecl wined3d_swapchain_present(ptr ptr ptr ptr long) @ cdecl wined3d_swapchain_resize_buffers(ptr long long long long long long) +@ cdecl wined3d_swapchain_set_fullscreen(ptr ptr ptr) @ cdecl wined3d_swapchain_set_gamma_ramp(ptr long ptr) @ cdecl wined3d_swapchain_set_palette(ptr ptr) @ cdecl wined3d_swapchain_set_window(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e2f1004..948a57b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2524,6 +2524,8 @@ HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT __cdecl wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapchain, unsigned int buffer_count, unsigned int width, unsigned int height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, unsigned int multisample_quality); +HRESULT __cdecl wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapchain, + const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode); HRESULT __cdecl wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette);

1 0

← Newer
1
...
71
72
73
74
75
76
77
78
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 August 2016