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

Piotr Caban : msvcp90: Export already implemented basic_string private functions.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 50b7da01dea4d600d1851c94ef903df1c72c0f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b7da01dea4d600d1851c94e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 19:15:47 2011 +0200 msvcp90: Export already implemented basic_string private functions. --- dlls/msvcp90/msvcp90.spec | 48 ++++++++++++++-------------- dlls/msvcp90/string.c | 74 +++++++++++++++++++++++++++++---------------- 2 files changed, 72 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50b7da01dea4d600d1851…

1 0

Piotr Caban : msvcp90: Added older version of basic_string::_Tidy function.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 3f9179ad3eb1ca6b6d54beefdf67a656cf23baaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9179ad3eb1ca6b6d54beefd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 19:15:59 2011 +0200 msvcp90: Added older version of basic_string::_Tidy function. --- dlls/msvcp90/msvcp90.spec | 4 ++++ dlls/msvcp90/string.c | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 1f97a90..4fda8e4 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5810,3 +5810,7 @@ @ stub towctrans @ stub wctrans @ stub wctype + +#Functions not exported in native dll: +@ thiscall -arch=win32 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z(ptr long) basic_string_char_tidy_built +@ cdecl -arch=win64 ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAX_N(a)Z(ptr long) basic_string_char_tidy_built diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index f4d3ecb..87d5e5a 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -560,6 +560,15 @@ void __thiscall basic_string_char_tidy(basic_string_char *this, basic_string_char_eos(this, new_size); } +/* Exported only from msvcp60/70 */ +/* ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AAEX_N(a)Z */ +/* ?_Tidy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@AEAAX_N(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char_tidy_built, 8) +void __thiscall basic_string_char_tidy_built(basic_string_char *this, MSVCP_bool built) +{ + return basic_string_char_tidy(this, built, 0); +} + /* ?_Grow@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAE_NI_N(a)Z */ /* ?_Grow@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IEAA_N_K_N(a)Z */ DEFINE_THISCALL_WRAPPER(basic_string_char_grow, 12)

1 0

Piotr Caban : msvcp90: Added basic_string operator== implementation.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: ab7914ce967097e74c544eea7b18f8ead0e4bcb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7914ce967097e74c544eea7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 19:15:05 2011 +0200 msvcp90: Added basic_string operator== implementation. --- dlls/msvcp90/msvcp90.spec | 24 +++++++++++----------- dlls/msvcp90/string.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 0dbd473..abed9c4 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -86,12 +86,12 @@ @ stub -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@_W(a)Z @ stub -arch=win32 ??$?6_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@ABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z @ stub -arch=win64 ??$?6_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z -@ stub -arch=win32 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z -@ stub -arch=win64 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z -@ stub -arch=win32 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBD@Z -@ stub -arch=win64 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PEBD@Z -@ stub -arch=win32 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPBDABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPEBDAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z +@ cdecl -arch=win32 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_char_equal +@ cdecl -arch=win64 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_char_equal +@ cdecl -arch=win32 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBD@Z(ptr str) MSVCP_basic_string_char_equal_str_cstr +@ cdecl -arch=win64 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PEBD@Z(ptr str) MSVCP_basic_string_char_equal_str_cstr +@ cdecl -arch=win32 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPBDABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(str ptr) MSVCP_basic_string_char_equal_cstr_str +@ cdecl -arch=win64 ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPEBDAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(str ptr) MSVCP_basic_string_char_equal_cstr_str @ stub -arch=win32 ??$?8GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA_NABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)0@Z @ stub -arch=win64 ??$?8GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA_NAEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)0@Z @ stub -arch=win32 ??$?8GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA_NABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)PBG@Z @@ -116,12 +116,12 @@ @ stub -arch=win64 ??$?8O(a)std@@YA_NAEBV?$complex(a)O@0(a)0@Z @ stub -arch=win32 ??$?8O(a)std@@YA_NABV?$complex(a)O@0(a)ABO@Z @ stub -arch=win64 ??$?8O(a)std@@YA_NAEBV?$complex(a)O@0(a)AEBO@Z -@ stub -arch=win32 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z -@ stub -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z -@ stub -arch=win32 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PB_W@Z -@ stub -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z -@ stub -arch=win32 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z -@ stub -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z +@ cdecl -arch=win32 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_wchar_equal +@ cdecl -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_wchar_equal +@ cdecl -arch=win32 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PB_W@Z(ptr ptr) MSVCP_basic_string_wchar_equal_str_cstr +@ cdecl -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z(ptr ptr) MSVCP_basic_string_wchar_equal_str_cstr +@ cdecl -arch=win32 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_equal_cstr_str +@ cdecl -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_equal_cstr_str @ stub -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z @ stub -arch=win64 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z @ stub -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBD@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 88a542a..7bcc663 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1042,6 +1042,30 @@ int __thiscall MSVCP_basic_string_char_compare( basic_string_char_const_ptr(compare), compare->size); } +/* ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ +/* ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_char_equal( + const basic_string_char *left, const basic_string_char *right) +{ + return MSVCP_basic_string_char_compare(left, right) == 0; +} + +/* ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBD@Z */ +/* ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PEBD@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_char_equal_str_cstr( + const basic_string_char *left, const char *right) +{ + return MSVCP_basic_string_char_compare_cstr(left, right) == 0; +} + +/* ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPBDABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$?8DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPEBDAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_char_equal_cstr_str( + const char *left, const basic_string_char *right) +{ + return MSVCP_basic_string_char_compare_cstr(right, left) == 0; +} + /* ??$?MDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ /* ??$?MDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ MSVCP_bool __cdecl MSVCP_basic_string_char_lower( @@ -1812,6 +1836,30 @@ int __thiscall MSVCP_basic_string_wchar_compare( basic_string_wchar_const_ptr(compare), compare->size); } +/* ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ +/* ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal( + const basic_string_wchar *left, const basic_string_wchar *right) +{ + return MSVCP_basic_string_wchar_compare(left, right) == 0; +} + +/* ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PB_W@Z */ +/* ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal_str_cstr( + const basic_string_wchar *left, const wchar_t *right) +{ + return MSVCP_basic_string_wchar_compare_cstr(left, right) == 0; +} + +/* ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z */ +/* ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal_cstr_str( + const wchar_t *left, const basic_string_wchar *right) +{ + return MSVCP_basic_string_wchar_compare_cstr(right, left) == 0; +} + /* ??$?M_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ /* ??$?M_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower(

1 0

Piotr Caban : msvcp90: Added basic_string::last_index_of implementation.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: bd77b96855dad7ed158ad2d7bf56cae734ca96b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd77b96855dad7ed158ad2d7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 19:14:29 2011 +0200 msvcp90: Added basic_string::last_index_of implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++++------- dlls/msvcp90/string.c | 106 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd77b96855dad7ed158ad…

1 0

Piotr Caban : msvcp90: Added basic_string operator!= implementation.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 9e9d3cc90293940ef856b233cfb14d8e2c33f9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e9d3cc90293940ef856b233c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 19:15:20 2011 +0200 msvcp90: Added basic_string operator!= implementation. --- dlls/msvcp90/msvcp90.spec | 24 +++++++++++----------- dlls/msvcp90/string.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index abed9c4..92b6492 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -122,12 +122,12 @@ @ cdecl -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z(ptr ptr) MSVCP_basic_string_wchar_equal_str_cstr @ cdecl -arch=win32 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_equal_cstr_str @ cdecl -arch=win64 ??$?8_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_equal_cstr_str -@ stub -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z -@ stub -arch=win64 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z -@ stub -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBD@Z -@ stub -arch=win64 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PEBD@Z -@ stub -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPBDABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z -@ stub -arch=win64 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPEBDAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z +@ cdecl -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_char_not_equal +@ cdecl -arch=win64 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_char_not_equal +@ cdecl -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBD@Z(ptr str) MSVCP_basic_string_char_not_equal_str_cstr +@ cdecl -arch=win64 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PEBD@Z(ptr str) MSVCP_basic_string_char_not_equal_str_cstr +@ cdecl -arch=win32 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPBDABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(str ptr) MSVCP_basic_string_char_not_equal_cstr_str +@ cdecl -arch=win64 ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPEBDAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z(str ptr) MSVCP_basic_string_char_not_equal_cstr_str @ stub -arch=win32 ??$?9GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA_NABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)0@Z @ stub -arch=win64 ??$?9GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA_NAEBV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)0@Z @ stub -arch=win32 ??$?9GU?$char_traits(a)G@std@@V?$allocator(a)G@1@@std@@YA_NABV?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@0(a)PBG@Z @@ -152,12 +152,12 @@ @ stub -arch=win64 ??$?9O(a)std@@YA_NAEBV?$complex(a)O@0(a)0@Z @ stub -arch=win32 ??$?9O(a)std@@YA_NABV?$complex(a)O@0(a)ABO@Z @ stub -arch=win64 ??$?9O(a)std@@YA_NAEBV?$complex(a)O@0(a)AEBO@Z -@ stub -arch=win32 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z -@ stub -arch=win64 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z -@ stub -arch=win32 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PB_W@Z -@ stub -arch=win64 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z -@ stub -arch=win32 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z -@ stub -arch=win64 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z +@ cdecl -arch=win32 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal +@ cdecl -arch=win64 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal +@ cdecl -arch=win32 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PB_W@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal_str_cstr +@ cdecl -arch=win64 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal_str_cstr +@ cdecl -arch=win32 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal_cstr_str +@ cdecl -arch=win64 ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z(ptr ptr) MSVCP_basic_string_wchar_not_equal_cstr_str @ stub -arch=win32 ??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z @ stub -arch=win64 ??$?DM(a)std@@YA?AV?$complex(a)M@0(a)AEBMAEBV10@@Z @ stub -arch=win32 ??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 7bcc663..5d2b5ee 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1066,6 +1066,30 @@ MSVCP_bool __cdecl MSVCP_basic_string_char_equal_cstr_str( return MSVCP_basic_string_char_compare_cstr(right, left) == 0; } +/* ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ +/* ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal( + const basic_string_char *left, const basic_string_char *right) +{ + return MSVCP_basic_string_char_compare(left, right) != 0; +} + +/* ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PBD@Z */ +/* ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)PEBD@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal_str_cstr( + const basic_string_char *left, const char *right) +{ + return MSVCP_basic_string_char_compare_cstr(left, right) != 0; +} + +/* ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPBDABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +/* ??$?9DU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NPEBDAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0@@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_char_not_equal_cstr_str( + const char *left, const basic_string_char *right) +{ + return MSVCP_basic_string_char_compare_cstr(right, left) != 0; +} + /* ??$?MDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ /* ??$?MDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA_NAEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)0@Z */ MSVCP_bool __cdecl MSVCP_basic_string_char_lower( @@ -1860,6 +1884,30 @@ MSVCP_bool __cdecl MSVCP_basic_string_wchar_equal_cstr_str( return MSVCP_basic_string_wchar_compare_cstr(right, left) == 0; } +/* ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ +/* ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal( + const basic_string_wchar *left, const basic_string_wchar *right) +{ + return MSVCP_basic_string_wchar_compare(left, right) != 0; +} + +/* ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PB_W@Z */ +/* ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)PEB_W@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal_str_cstr( + const basic_string_wchar *left, const wchar_t *right) +{ + return MSVCP_basic_string_wchar_compare_cstr(left, right) != 0; +} + +/* ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPB_WABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z */ +/* ??$?9_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NPEB_WAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0@@Z */ +MSVCP_bool __cdecl MSVCP_basic_string_wchar_not_equal_cstr_str( + const wchar_t *left, const basic_string_wchar *right) +{ + return MSVCP_basic_string_wchar_compare_cstr(right, left) != 0; +} + /* ??$?M_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NABV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ /* ??$?M_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@1@@std@@YA_NAEBV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)0@Z */ MSVCP_bool __cdecl MSVCP_basic_string_wchar_lower(

1 0

Huw Davies : comdlg32: When changing printers, only preserve the paper/ bin settings if the new printer has the original setting available.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 016b7c53dc173389950af2047efd343cfd36666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=016b7c53dc173389950af2047… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 22 15:22:48 2011 +0100 comdlg32: When changing printers, only preserve the paper/bin settings if the new printer has the original setting available. --- dlls/comdlg32/printdlg.c | 101 +++++++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 46 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d692e7d..4d8b0c8 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -616,8 +616,8 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, int NrOfEntries; char* Names; WORD* Words; - DWORD Sel; - WORD oldWord = 0; + DWORD Sel, old_Sel; + WORD oldWord = 0, newWord = 0; /* DMPAPER_ and DMBIN_ start at 1 */ int NamesSize; int fwCapability_Names; int fwCapability_Words; @@ -633,26 +633,14 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, */ oldWord = SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, Sel, 0); - if (dm) { - if (nIDComboBox == cmb2) - dm->u1.s1.dmPaperSize = oldWord; - else - dm->u1.s1.dmDefaultSource = oldWord; - } - } - else { - /* we enter here only when the Print setup dialog is initially - * opened. In this case the settings are restored from when - * the dialog was last closed. - */ - if (dm) { - if (nIDComboBox == cmb2) - oldWord = dm->u1.s1.dmPaperSize; - else - oldWord = dm->u1.s1.dmDefaultSource; - } + if(oldWord >= DMPAPER_USER) /* DMPAPER_USER == DMBIN_USER */ + oldWord = 0; /* There's no point in trying to keep custom + paper / bin sizes across printers */ } + if (dm) + newWord = (nIDComboBox == cmb2) ? dm->u1.s1.dmPaperSize : dm->u1.s1.dmDefaultSource; + if (nIDComboBox == cmb2) { NamesSize = 64; fwCapability_Names = DC_PAPERNAMES; @@ -695,16 +683,32 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, Words[i]); } - /* Look for old selection - can't do this is previous loop since - item order will change as more items are added */ + /* Look for old selection or the new default. + Can't do this is previous loop since item order will change as more items are added */ Sel = 0; + old_Sel = NrOfEntries; for (i = 0; i < NrOfEntries; i++) { if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == oldWord) { - Sel = i; + old_Sel = i; break; } + if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == newWord) + Sel = i; + } + + if(old_Sel < NrOfEntries) + { + if (dm) + { + if(nIDComboBox == cmb2) + dm->u1.s1.dmPaperSize = oldWord; + else + dm->u1.s1.dmDefaultSource = oldWord; + } + Sel = old_Sel; } + SendDlgItemMessageA(hDlg, nIDComboBox, CB_SETCURSEL, Sel, 0); HeapFree(GetProcessHeap(),0,Words); @@ -722,8 +726,8 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, int NrOfEntries; WCHAR* Names; WORD* Words; - DWORD Sel; - WORD oldWord = 0; + DWORD Sel, old_Sel; + WORD oldWord = 0, newWord = 0; /* DMPAPER_ and DMBIN_ start at 1 */ int NamesSize; int fwCapability_Names; int fwCapability_Words; @@ -739,26 +743,15 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, */ oldWord = SendDlgItemMessageW(hDlg, nIDComboBox, CB_GETITEMDATA, Sel, 0); - if (dm) { - if (nIDComboBox == cmb2) - dm->u1.s1.dmPaperSize = oldWord; - else - dm->u1.s1.dmDefaultSource = oldWord; - } - } - else { - /* we enter here only when the Print setup dialog is initially - * opened. In this case the settings are restored from when - * the dialog was last closed. - */ - if (dm) { - if (nIDComboBox == cmb2) - oldWord = dm->u1.s1.dmPaperSize; - else - oldWord = dm->u1.s1.dmDefaultSource; - } + + if(oldWord >= DMPAPER_USER) /* DMPAPER_USER == DMBIN_USER */ + oldWord = 0; /* There's no point in trying to keep custom + paper / bin sizes across printers */ } + if (dm) + newWord = (nIDComboBox == cmb2) ? dm->u1.s1.dmPaperSize : dm->u1.s1.dmDefaultSource; + if (nIDComboBox == cmb2) { NamesSize = 64; fwCapability_Names = DC_PAPERNAMES; @@ -801,16 +794,32 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, Words[i]); } - /* Look for old selection - can't do this is previous loop since - item order will change as more items are added */ + /* Look for old selection or the new default. + Can't do this is previous loop since item order will change as more items are added */ Sel = 0; + old_Sel = NrOfEntries; for (i = 0; i < NrOfEntries; i++) { if(SendDlgItemMessageW(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == oldWord) { - Sel = i; + old_Sel = i; break; } + if(SendDlgItemMessageA(hDlg, nIDComboBox, CB_GETITEMDATA, i, 0) == newWord) + Sel = i; + } + + if(old_Sel < NrOfEntries) + { + if (dm) + { + if(nIDComboBox == cmb2) + dm->u1.s1.dmPaperSize = oldWord; + else + dm->u1.s1.dmDefaultSource = oldWord; + } + Sel = old_Sel; } + SendDlgItemMessageW(hDlg, nIDComboBox, CB_SETCURSEL, Sel, 0); HeapFree(GetProcessHeap(),0,Words);

1 0

Mariusz Pluciński : shell32: Add support of registry-registered folders to IKnownFolderManager:: GetFolder.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: ed29ff8c3b6a61192081bb4d88d6488435c71a6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed29ff8c3b6a61192081bb4d8… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 22 15:10:15 2011 +0200 shell32: Add support of registry-registered folders to IKnownFolderManager::GetFolder. --- dlls/shell32/shellpath.c | 16 +++++++++++++++- dlls/shell32/tests/shellpath.c | 3 --- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0514647..ffd1aed 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3400,11 +3400,25 @@ static HRESULT WINAPI foldermanager_GetFolderIds( static BOOL is_knownfolder( struct foldermanager *fm, const KNOWNFOLDERID *id ) { UINT i; + HRESULT hr; + LPWSTR registryPath = NULL; + HKEY hKey; + /* TODO: move all entries from "CSIDL_Data" static array to registry known folder descriptions */ for (i = 0; i < fm->num_ids; i++) if (IsEqualGUID( &fm->ids[i], id )) return TRUE; - return FALSE; + hr = get_known_folder_registry_path(id, &registryPath); + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, 0, &hKey)); + + if(SUCCEEDED(hr)) + { + hr = S_OK; + RegCloseKey(hKey); + } + + return hr == S_OK; } static HRESULT WINAPI foldermanager_GetFolder( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 104e7d7..1b575fe 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1172,14 +1172,11 @@ static void test_knownFolders(void) if(SUCCEEDED(hr)) { hr = IKnownFolderManager_GetFolder(mgr, &newFolderId, &folder); - todo_wine ok(hr == S_OK, "failed to get known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) { hr = IKnownFolder_GetId(folder, &folderId); - todo_wine ok(hr == S_OK, "failed to get folder id: 0x%08x\n", hr); - todo_wine ok(IsEqualGUID(&folderId, &newFolderId)==TRUE, "invalid KNOWNFOLDERID returned\n"); hr = IKnownFolder_GetPath(folder, 0, &folderPath);

1 0

Mariusz Pluciński : shell32: Add IKnownFolderManager:: UnregisterFolder implementation.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: c5bf1977f2aecda8ebfdcac6b8fa144879c84240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf1977f2aecda8ebfdcac6b… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 22 15:10:02 2011 +0200 shell32: Add IKnownFolderManager::UnregisterFolder implementation. --- dlls/shell32/shellpath.c | 13 +++++++++++-- dlls/shell32/tests/shellpath.c | 1 - 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f602092..0514647 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3477,8 +3477,17 @@ static HRESULT WINAPI foldermanager_UnregisterFolder( IKnownFolderManager *iface, REFKNOWNFOLDERID rfid) { - FIXME("%p\n", rfid); - return E_NOTIMPL; + HRESULT hr; + LPWSTR registryPath = NULL; + TRACE("(%p, %s)\n", iface, debugstr_guid(rfid)); + + hr = get_known_folder_registry_path(rfid, &registryPath); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath)); + + HeapFree(GetProcessHeap(), 0, registryPath); + return hr; } static HRESULT WINAPI foldermanager_FindFolderFromPath( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index c4a268c..104e7d7 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1242,7 +1242,6 @@ static void test_knownFolders(void) } hr = IKnownFolderManager_UnregisterFolder(mgr, &newFolderId); - todo_wine ok(hr == S_OK, "failed to unregister folder: 0x%08x\n", hr); } }

1 0

Mariusz Pluciński : shell32: Add IKnownFolderManager:: RegisterFolder implementation.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 7a3b53ab6821a66eb639e2a6335907cbcd4df24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a3b53ab6821a66eb639e2a63… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 22 16:03:47 2011 +0200 shell32: Add IKnownFolderManager::RegisterFolder implementation. --- dlls/shell32/shellpath.c | 70 ++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shellpath.c | 1 - 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index ef0564c..f602092 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -816,6 +816,7 @@ static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; +static const WCHAR szKnownFolderDescriptions[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','F','o','l','d','e','r','D','e','s','c','r','i','p','t','i','o','n','s','\0'}; static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; typedef enum _CSIDL_Type { @@ -3075,6 +3076,45 @@ HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE toke return hr; } +/* constant values used by known folder functions */ +static const WCHAR szCategory[] = {'C','a','t','e','g','o','r','y',0}; +static const WCHAR szName[] = {'N','a','m','e',0}; + +/* + * Internal function to convert known folder identifier to path of registry key + * associated with known folder. + * + * Parameters: + * rfid [I] pointer to known folder identifier + * lpPath [O] place to store string address. String should be + * later freed using HeapFree(GetProcessHeap(),0, ... ) + */ +static HRESULT get_known_folder_registry_path(REFKNOWNFOLDERID rfid, LPWSTR *lpPath) +{ + static const WCHAR sBackslash[] = {'\\',0}; + HRESULT hr = S_OK; + int length; + WCHAR sGuid[50]; + + TRACE("(%s, %p)\n", debugstr_guid(rfid), lpPath); + + StringFromGUID2(rfid, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + + length = lstrlenW(szKnownFolderDescriptions)+51; + *lpPath = HeapAlloc(GetProcessHeap(), 0, length*sizeof(WCHAR)); + if(!(*lpPath)) + hr = E_OUTOFMEMORY; + + if(SUCCEEDED(hr)) + { + lstrcpyW(*lpPath, szKnownFolderDescriptions); + lstrcatW(*lpPath, sBackslash); + lstrcatW(*lpPath, sGuid); + } + + return hr; +} + struct knownfolder { const struct IKnownFolderVtbl *vtbl; @@ -3403,8 +3443,34 @@ static HRESULT WINAPI foldermanager_RegisterFolder( REFKNOWNFOLDERID rfid, KNOWNFOLDER_DEFINITION const *pKFD) { - FIXME("%p, %p\n", rfid, pKFD); - return E_NOTIMPL; + HRESULT hr; + HKEY hKey = NULL; + DWORD dwDisp; + LPWSTR registryPath = NULL; + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(rfid), pKFD); + + hr = get_known_folder_registry_path(rfid, &registryPath); + TRACE("registry path: %s\n", debugstr_w(registryPath)); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegCreateKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, NULL, 0, KEY_WRITE, 0, &hKey, &dwDisp)); + + if(SUCCEEDED(hr)) + { + if(dwDisp == REG_OPENED_EXISTING_KEY) + hr = E_FAIL; + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szCategory, 0, REG_DWORD, (LPBYTE)&pKFD->category, sizeof(pKFD->category))); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szName, 0, REG_SZ, (LPBYTE)pKFD->pszName, (lstrlenW(pKFD->pszName)+1)*sizeof(WCHAR) )); + + RegCloseKey(hKey); + } + + HeapFree(GetProcessHeap(), 0, registryPath); + return hr; } static HRESULT WINAPI foldermanager_UnregisterFolder( diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ee38e4e..c4a268c 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1168,7 +1168,6 @@ static void test_knownFolders(void) win_skip("No permissions required to register custom known folder\n"); else { - todo_wine ok(hr == S_OK, "failed to register known folder: 0x%08x\n", hr); if(SUCCEEDED(hr)) {

1 0

Mariusz Pluciński : shell32: Fix typo.
by Alexandre Julliard June 22, 2011

June 22, 2011

Module: wine Branch: master Commit: 4fd24bc20eace1694d4204bc7713b201d0e2c8f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd24bc20eace1694d4204bc7… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 22 15:10:25 2011 +0200 shell32: Fix typo. --- dlls/shell32/shellpath.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index ffd1aed..06108ca 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3170,7 +3170,7 @@ static HRESULT WINAPI knownfolder_QueryInterface( return S_OK; } -static HRESULT knowfolder_set_id( +static HRESULT knownfolder_set_id( IKnownFolder *iface, const KNOWNFOLDERID *kfid) { @@ -3438,7 +3438,7 @@ static HRESULT WINAPI foldermanager_GetFolder( } hr = knownfolder_create( (void **)ppkf ); if (SUCCEEDED( hr )) - hr = knowfolder_set_id( *ppkf, rfid ); + hr = knownfolder_set_id( *ppkf, rfid ); return hr; }

1 0