wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Vincas Miliūnas : msvcp90: Added basic_string<wchar_t> ::swap implementation.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 96e4e219971143fbfafa6e35d4c918d9c5667db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e4e219971143fbfafa6e35d… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Tue Nov 16 20:58:44 2010 +0200 msvcp90: Added basic_string<wchar_t>::swap implementation. --- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index ec1458f..79dc7e4 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5481,8 +5481,8 @@ @ cdecl -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z (ptr ptr) msvcp90.?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z +@ cdecl -arch=win64 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAXAEAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?sync@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ @ stub -arch=win64 ?sync@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ @ stub -arch=win32 ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEHXZ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 2520ab3..dbbf0b5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5512,8 +5512,8 @@ @ cdecl -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z(ptr ptr) MSVCP_basic_string_char_swap @ stub -arch=win32 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXAEAV12@@Z -@ stub -arch=win32 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z(ptr ptr) MSVCP_basic_string_wchar_swap +@ cdecl -arch=win64 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAXAEAV12@@Z(ptr ptr) MSVCP_basic_string_wchar_swap @ stub -arch=win32 ?sync@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ @ stub -arch=win64 ?sync@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ @ stub -arch=win32 ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEHXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 68eb921..fb51ae4 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1039,3 +1039,25 @@ void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_stri str->res = res; } } + +/* ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_swap, 8) +void __thiscall MSVCP_basic_string_wchar_swap(basic_string_wchar *this, basic_string_wchar *str) +{ + if(this != str) { + char tmp[sizeof(this->data)]; + const size_t size = this->size; + const size_t res = this->res; + + memcpy(tmp, this->data.buf, sizeof(this->data)); + memcpy(this->data.buf, str->data.buf, sizeof(this->data)); + memcpy(str->data.buf, tmp, sizeof(this->data)); + + this->size = str->size; + this->res = str->res; + + str->size = size; + str->res = res; + } +}

1 0

Vincas Miliūnas : msvcp90/tests: Added basic_string< char>::swap tests.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: af780d888fe8c22bd70948bbffa80cb1f193c72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af780d888fe8c22bd70948bbf… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Tue Nov 16 20:58:29 2010 +0200 msvcp90/tests: Added basic_string<char>::swap tests. --- dlls/msvcp90/tests/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index cb0b74b..73bc881 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -60,6 +60,7 @@ static basic_string_char* (WINAPI *p_basic_string_char_assign_cstr_len)(const ch static const char* (WINAPI *p_basic_string_char_cstr)(void); static const char* (WINAPI *p_basic_string_char_data)(void); static size_t (WINAPI *p_basic_string_char_size)(void); +static void (WINAPI *p_basic_string_char_swap)(basic_string_char*); static basic_string_wchar* (WINAPI *p_basic_string_wchar_ctor)(void); static basic_string_wchar* (WINAPI *p_basic_string_wchar_copy_ctor)(basic_string_wchar*); @@ -80,6 +81,7 @@ static basic_string_char* (__cdecl *p_basic_string_char_assign_cstr_len)(basic_s static const char* (__cdecl *p_basic_string_char_cstr)(basic_string_char*); static const char* (__cdecl *p_basic_string_char_data)(basic_string_char*); static size_t (__cdecl *p_basic_string_char_size)(basic_string_char*); +static void (__cdecl *p_basic_string_char_swap)(basic_string_char*, basic_string_char*); static basic_string_wchar* (__cdecl *p_basic_string_wchar_ctor)(basic_string_wchar*); static basic_string_wchar* (__cdecl *p_basic_string_wchar_copy_ctor)(basic_string_wchar*, basic_string_wchar*); @@ -240,6 +242,8 @@ static BOOL init(void) "?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ"); p_basic_string_char_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ"); + p_basic_string_char_swap = (void*)GetProcAddress(msvcp, + "?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QEAA@XZ"); @@ -279,6 +283,8 @@ static BOOL init(void) "?data@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ"); p_basic_string_char_size = (void*)GetProcAddress(msvcp, "?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ"); + p_basic_string_char_swap = (void*)GetProcAddress(msvcp, + "?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAE@XZ"); @@ -375,6 +381,40 @@ static void test_basic_string_char(void) { call_func1(p_basic_string_char_dtor, &str2); } +static void test_basic_string_char_swap(void) { + basic_string_char str1, str2; + char atmp1[32], atmp2[32]; + + if(!p_basic_string_char_ctor_cstr || !p_basic_string_char_dtor || + !p_basic_string_char_swap || !p_basic_string_char_cstr) { + win_skip("basic_string<char> unavailable\n"); + return; + } + + /* Swap self, local */ + strcpy(atmp1, "qwerty"); + call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); + call_func2(p_basic_string_char_swap, &str1, &str1); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + call_func2(p_basic_string_char_swap, &str1, &str1); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + call_func1(p_basic_string_char_dtor, &str1); + + /* str1 allocated, str2 local */ + strcpy(atmp1, "qwerty12345678901234567890"); + strcpy(atmp2, "asd"); + call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); + call_func2(p_basic_string_char_ctor_cstr, &str2, atmp2); + call_func2(p_basic_string_char_swap, &str1, &str2); + ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + call_func2(p_basic_string_char_swap, &str1, &str2); + ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + call_func1(p_basic_string_char_dtor, &str1); + call_func1(p_basic_string_char_dtor, &str2); +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -456,6 +496,7 @@ START_TEST(string) return; test_basic_string_char(); + test_basic_string_char_swap(); test_basic_string_wchar(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Vincas Miliūnas : msvcp90: Added basic_string<char>:: swap implementation.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 676d0d41f5662538478fa80312dde49bf923e3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=676d0d41f5662538478fa8031… Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Tue Nov 16 20:58:15 2010 +0200 msvcp90: Added basic_string<char>::swap implementation. --- dlls/msvcp80/msvcp80.spec | 4 ++-- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index f05b53d..ec1458f 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5477,8 +5477,8 @@ @ stub -arch=win64 ?sungetc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAAGXZ @ stub -arch=win32 ?sungetc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAEGXZ @ stub -arch=win64 ?sungetc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAAGXZ -@ stub -arch=win32 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z(ptr ptr) msvcp90.?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z +@ cdecl -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z (ptr ptr) msvcp90.?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 9ed37ec..2520ab3 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5508,8 +5508,8 @@ @ stub -arch=win64 ?sungetc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAAGXZ @ stub -arch=win32 ?sungetc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QAEGXZ @ stub -arch=win64 ?sungetc@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@QEAAGXZ -@ stub -arch=win32 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z -@ stub -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z +@ thiscall -arch=win32 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z(ptr ptr) MSVCP_basic_string_char_swap +@ cdecl -arch=win64 ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z(ptr ptr) MSVCP_basic_string_char_swap @ stub -arch=win32 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXAAV12@@Z @ stub -arch=win64 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXAEAV12@@Z @ stub -arch=win32 ?swap@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@QAEXAAV12@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index cc4ff1b..68eb921 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1017,3 +1017,25 @@ size_t __thiscall MSVCP_basic_string_wchar_length(basic_string_wchar *this) TRACE("%p\n", this); return this->size; } + +/* ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXAAV12@@Z */ +/* ?swap@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAXAEAV12@@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_swap, 8) +void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_string_char *str) +{ + if(this != str) { + char tmp[sizeof(this->data)]; + const size_t size = this->size; + const size_t res = this->res; + + memcpy(tmp, this->data.buf, sizeof(this->data)); + memcpy(this->data.buf, str->data.buf, sizeof(this->data)); + memcpy(str->data.buf, tmp, sizeof(this->data)); + + this->size = str->size; + this->res = str->res; + + str->size = size; + str->res = res; + } +}

1 0

Jörg Höhle : mciseq: Bogus sizeof led to incorrect positioning.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 129778803ec4a72e05665acee761da0d0c461efa URL: http://source.winehq.org/git/wine.git/?a=commit;h=129778803ec4a72e05665acee… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 16 21:39:17 2010 +0100 mciseq: Bogus sizeof led to incorrect positioning. --- dlls/mciseq/mcimidi.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index aa351f3..6bf7f4d 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -952,7 +952,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) } if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(LPMCI_PLAY_PARMS)); + return MCI_SendCommandAsync(wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } if (lpParms && (dwFlags & MCI_FROM)) { @@ -1191,8 +1191,6 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) midiOutReset((HMIDIOUT)wmm->hMidi); dwRet = midiOutClose((HMIDIOUT)wmm->hMidi); - /* to restart playing at beginning when it's over */ - wmm->dwPositionMS = 0; if (dwFlags & MCI_NOTIFY) oldcb = InterlockedExchangePointer(&wmm->hCallback, NULL);

1 0

Jörg Höhle : mciseq: Rework MCI notification system.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 896b74380b4d70cc88063165d865cc15b04a9715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896b74380b4d70cc88063165d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Dec 5 05:40:59 2009 +0100 mciseq: Rework MCI notification system. --- dlls/mciseq/mcimidi.c | 105 ++++++++++++++++++++++++++++-------------------- 1 files changed, 61 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=896b74380b4d70cc88063…

1 0

André Hentschel : winemaker: Add spec file dependency for dlls.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 189a5d0978c036032aed4f06362d6e1d1efa2677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189a5d0978c036032aed4f063… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 22:43:55 2010 +0100 winemaker: Add spec file dependency for dlls. --- tools/winemaker | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index bd46380..68483b8 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.7.4"; +my $version="0.7.5"; use Cwd; use File::Basename; @@ -2475,7 +2475,11 @@ sub generate_project_files($) my $canon=canonize("@$target[$T_NAME]"); $canon =~ s/_so$//; - print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; + if (@$target[$T_TYPE] == $TT_DLL) { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS) \$(${canon}_MODULE:.dll=.spec)\n"; + } else { + print FILEO "\$(${canon}_MODULE).so: \$(${canon}_OBJS)\n"; + } if (@{@$target[$T_SOURCES_CXX]} > 0 or @{@$project_settings[$T_SOURCES_CXX]} > 0) { print FILEO "\t\$(CXX)"; } else {

1 0

Nikolay Sivov : comctl32/listview: Use a code set by dispinfo holder to convert data encoding after LVN_GETDISPINFO .
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 119860b05f8c22d1525b573e461afe95e430a63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=119860b05f8c22d1525b573e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 16 23:55:23 2010 +0300 comctl32/listview: Use a code set by dispinfo holder to convert data encoding after LVN_GETDISPINFO. --- dlls/comctl32/listview.c | 130 ++++++++++++++++++++++++--------------- dlls/comctl32/tests/listview.c | 41 +++++++++++++ 2 files changed, 121 insertions(+), 50 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6c4165d..fd9a499 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -928,74 +928,104 @@ static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem) Send notification. depends on dispinfoW having same structure as dispinfoA. infoPtr : listview struct - notificationCode : *Unicode* notification code + code : *Unicode* notification code pdi : dispinfo structure (can be unicode or ansi) isW : TRUE if dispinfo is Unicode */ -static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW) +static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISPINFOW pdi, BOOL isW) { - BOOL bResult = FALSE; - BOOL convertToAnsi = FALSE, convertToUnicode = FALSE; - INT cchTempBufMax = 0, savCchTextMax = 0; - UINT realNotifCode; - LPWSTR pszTempBuf = NULL, savPszText = NULL; + INT length = 0, ret_length; + LPWSTR buffer = NULL, ret_text; + BOOL return_ansi = FALSE; + BOOL return_unicode = FALSE; + BOOL ret; if ((pdi->item.mask & LVIF_TEXT) && is_text(pdi->item.pszText)) { - convertToAnsi = (isW && infoPtr->notifyFormat == NFR_ANSI); - convertToUnicode = (!isW && infoPtr->notifyFormat == NFR_UNICODE); + return_unicode = ( isW && infoPtr->notifyFormat == NFR_ANSI); + return_ansi = (!isW && infoPtr->notifyFormat == NFR_UNICODE); } - if (convertToAnsi || convertToUnicode) + ret_length = pdi->item.cchTextMax; + ret_text = pdi->item.pszText; + + if (return_unicode || return_ansi) { - if (notificationCode != LVN_GETDISPINFOW) - { - cchTempBufMax = convertToUnicode ? + if (code != LVN_GETDISPINFOW) + { + length = return_ansi ? MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, NULL, 0): WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); - } - else - { - cchTempBufMax = pdi->item.cchTextMax; - *pdi->item.pszText = 0; /* make sure we don't process garbage */ - } - - pszTempBuf = Alloc( (convertToUnicode ? sizeof(WCHAR) : sizeof(CHAR)) * cchTempBufMax); - if (!pszTempBuf) return FALSE; - - if (convertToUnicode) - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, - pszTempBuf, cchTempBufMax); - else - WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) pszTempBuf, - cchTempBufMax, NULL, NULL); + } + else + { + length = pdi->item.cchTextMax; + *pdi->item.pszText = 0; /* make sure we don't process garbage */ + } - savCchTextMax = pdi->item.cchTextMax; - savPszText = pdi->item.pszText; - pdi->item.pszText = pszTempBuf; - pdi->item.cchTextMax = cchTempBufMax; + buffer = Alloc( (return_ansi ? sizeof(WCHAR) : sizeof(CHAR)) * length); + if (!buffer) return FALSE; + + if (return_ansi) + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, + buffer, length); + else + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) buffer, + length, NULL, NULL); + + pdi->item.pszText = buffer; + pdi->item.cchTextMax = length; } if (infoPtr->notifyFormat == NFR_ANSI) - realNotifCode = get_ansi_notification(notificationCode); - else - realNotifCode = notificationCode; + code = get_ansi_notification(code); + TRACE(" pdi->item=%s\n", debuglvitem_t(&pdi->item, infoPtr->notifyFormat != NFR_ANSI)); - bResult = notify_hdr(infoPtr, realNotifCode, &pdi->hdr); + ret = notify_hdr(infoPtr, code, &pdi->hdr); + TRACE(" resulting code=0x%08x\n", pdi->hdr.code); - if (convertToUnicode || convertToAnsi) + if (return_ansi || return_unicode) { - if (convertToUnicode) /* note : pointer can be changed by app ! */ - WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) savPszText, - savCchTextMax, NULL, NULL); - else - MultiByteToWideChar(CP_ACP, 0, (LPSTR) pdi->item.pszText, -1, - savPszText, savCchTextMax); - pdi->item.pszText = savPszText; /* restores our buffer */ - pdi->item.cchTextMax = savCchTextMax; - Free (pszTempBuf); + if (return_ansi && (pdi->hdr.code == LVN_GETDISPINFOA)) + { + strcpy((char*)ret_text, (char*)pdi->item.pszText); + } + else if (return_unicode && (pdi->hdr.code == LVN_GETDISPINFOW)) + { + strcpyW(ret_text, pdi->item.pszText); + } + else if (return_ansi) /* note : pointer can be changed by app ! */ + { + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) ret_text, + ret_length, NULL, NULL); + } + else + MultiByteToWideChar(CP_ACP, 0, (LPSTR) pdi->item.pszText, -1, + ret_text, ret_length); + + pdi->item.pszText = ret_text; /* restores our buffer */ + pdi->item.cchTextMax = ret_length; + + Free(buffer); + return ret; } - return bResult; + + /* if dipsinfo holder changed notification code then convert */ + if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW)) + { + length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); + + buffer = Alloc(length * sizeof(CHAR)); + if (!buffer) return FALSE; + + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) buffer, + ret_length, NULL, NULL); + + strcpy((LPSTR)pdi->item.pszText, (LPSTR)buffer); + Free(buffer); + } + + return ret; } static void customdraw_fill(NMLVCUSTOMDRAW *lpnmlvcd, const LISTVIEW_INFO *infoPtr, HDC hdc, @@ -6490,7 +6520,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, if (lpLVItem->mask & LVIF_STATE) dispInfo.item.stateMask = lpLVItem->stateMask & infoPtr->uCallbackMask; /* could be zeroed on LVIF_NORECOMPUTE case */ - if (dispInfo.item.mask != 0) + if (dispInfo.item.mask) { notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); dispInfo.item.stateMask = lpLVItem->stateMask; @@ -6596,7 +6626,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* If we don't have all the requested info, query the application */ - if (dispInfo.item.mask != 0) + if (dispInfo.item.mask) { dispInfo.item.iItem = lpLVItem->iItem; dispInfo.item.iSubItem = lpLVItem->iSubItem; /* yes: the original subitem */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0223167..89619f7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -59,6 +59,8 @@ static INT notifyFormat; static BOOL g_is_below_5; /* item data passed to LVN_GETDISPINFOA */ static LVITEMA g_itema; +/* alter notification code A->W */ +static BOOL g_disp_A_to_W; static HWND subclass_editbox(HWND hwndListview); @@ -372,6 +374,13 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP { NMLVDISPINFOA *dispinfo = (NMLVDISPINFOA*)lParam; g_itema = dispinfo->item; + + if (g_disp_A_to_W && (dispinfo->item.mask & LVIF_TEXT)) + { + static const WCHAR testW[] = {'T','E','S','T',0}; + dispinfo->hdr.code = LVN_GETDISPINFOW; + memcpy(dispinfo->item.pszText, testW, sizeof(testW)); + } } break; case NM_HOVER: @@ -4538,6 +4547,37 @@ static void test_createdragimage(void) DestroyWindow(list); } +static void test_dispinfo(void) +{ + static const char testA[] = "TEST"; + WCHAR buff[10]; + LVITEMA item; + HWND hwnd; + INT ret; + + hwnd = create_listview_control(LVS_ICON); + ok(hwnd != 0, "failed to create listview window\n"); + + insert_item(hwnd, 0); + + memset(&item, 0, sizeof(item)); + item.pszText = LPSTR_TEXTCALLBACKA; + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + + g_disp_A_to_W = TRUE; + item.pszText = (char*)buff; + item.cchTextMax = sizeof(buff)/sizeof(WCHAR); + ret = SendMessageA(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); + ok(ret == sizeof(testA)-1, "got %d, expected 4\n", ret); + g_disp_A_to_W = FALSE; + + ok(memcmp(item.pszText, testA, sizeof(testA)) == 0, + "got %s, expected %s\n", item.pszText, testA); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4601,6 +4641,7 @@ START_TEST(listview) test_hover(); test_destroynotify(); test_createdragimage(); + test_dispinfo(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Juan Lang : crypt32: Add CertFindChainInStore stub.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 107a95d86bffdf8a9519bff5af9c3b82f32a7aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107a95d86bffdf8a9519bff5a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 15 11:26:01 2010 -0800 crypt32: Add CertFindChainInStore stub. --- dlls/crypt32/chain.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index fa739fe..1fb368b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2901,6 +2901,15 @@ VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) } } +PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE store, + DWORD certEncodingType, DWORD findFlags, DWORD findType, + const void *findPara, PCCERT_CHAIN_CONTEXT prevChainContext) +{ + FIXME("(%p, %08x, %08x, %d, %p, %p): stub\n", store, certEncodingType, + findFlags, findType, findPara, prevChainContext); + return NULL; +} + static void find_element_with_error(PCCERT_CHAIN_CONTEXT chain, DWORD error, LONG *iChain, LONG *iElement) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index d9cd9a8..dedcb4f 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -40,6 +40,7 @@ @ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) +@ stdcall CertFindChainInStore(ptr long long long ptr ptr) @ stdcall CertFindCRLInStore(ptr long long long ptr ptr) @ stdcall CertFindCTLInStore(ptr long long long ptr ptr) @ stdcall CertFindCertificateInStore(ptr long long long ptr ptr)

1 0

André Hentschel : include: Add some relocation types.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: f6692721524d5d4b9f0401d4e2e11c5b26e2b3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6692721524d5d4b9f0401d4e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 20:58:52 2010 +0100 include: Add some relocation types. --- include/winnt.h | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e6f9b3c..b72a952 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3274,6 +3274,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_I386_SEG12 9 #define IMAGE_REL_I386_SECTION 10 #define IMAGE_REL_I386_SECREL 11 +#define IMAGE_REL_I386_TOKEN 12 +#define IMAGE_REL_I386_SECREL7 13 #define IMAGE_REL_I386_REL32 20 /* MIPS relocation types */ @@ -3289,7 +3291,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_MIPS_SECREL 0x000B #define IMAGE_REL_MIPS_SECRELLO 0x000C #define IMAGE_REL_MIPS_SECRELHI 0x000D -#define IMAGE_REL_MIPS_JMPADDR16 0x0010 +#define IMAGE_REL_MIPS_TOKEN 0x000E +#define IMAGE_REL_MIPS_JMPADDR16 0x0010 #define IMAGE_REL_MIPS_REFWORDNB 0x0022 #define IMAGE_REL_MIPS_PAIR 0x0025 @@ -3342,6 +3345,7 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_PPC_SECRELLO 0x0013 #define IMAGE_REL_PPC_SECRELHI 0x0014 #define IMAGE_REL_PPC_GPREL 0x0015 +#define IMAGE_REL_PPC_TOKEN 0x0016 #define IMAGE_REL_PPC_TYPEMASK 0x00FF /* modifier bits */ #define IMAGE_REL_PPC_NEG 0x0100 @@ -3367,6 +3371,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_SH3_SECTION 0x000E #define IMAGE_REL_SH3_SECREL 0x000F #define IMAGE_REL_SH3_DIRECT32_NB 0x0010 +#define IMAGE_REL_SH3_GPREL4_LONG 0x0011 +#define IMAGE_REL_SH3_TOKEN 0x0012 /* ARM (Archimedes?) relocation types */ #define IMAGE_REL_ARM_ABSOLUTE 0x0000 @@ -3374,6 +3380,11 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_ARM_ADDR32NB 0x0002 #define IMAGE_REL_ARM_BRANCH24 0x0003 #define IMAGE_REL_ARM_BRANCH11 0x0004 +#define IMAGE_REL_ARM_TOKEN 0x0005 +#define IMAGE_REL_ARM_GPREL12 0x0006 +#define IMAGE_REL_ARM_GPREL7 0x0007 +#define IMAGE_REL_ARM_BLX24 0x0008 +#define IMAGE_REL_ARM_BLX11 0x0009 #define IMAGE_REL_ARM_SECTION 0x000E #define IMAGE_REL_ARM_SECREL 0x000F @@ -3395,12 +3406,18 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_IA64_SECREL 0x000E #define IMAGE_REL_IA64_LTOFF64 0x000F #define IMAGE_REL_IA64_DIR32NB 0x0010 -#define IMAGE_REL_IA64_RESERVED_11 0x0011 -#define IMAGE_REL_IA64_RESERVED_12 0x0012 -#define IMAGE_REL_IA64_RESERVED_13 0x0013 -#define IMAGE_REL_IA64_RESERVED_14 0x0014 -#define IMAGE_REL_IA64_RESERVED_15 0x0015 -#define IMAGE_REL_IA64_RESERVED_16 0x0016 +#define IMAGE_REL_IA64_SREL14 0x0011 +#define IMAGE_REL_IA64_SREL22 0x0012 +#define IMAGE_REL_IA64_SREL32 0x0013 +#define IMAGE_REL_IA64_UREL32 0x0014 +#define IMAGE_REL_IA64_PCREL60X 0x0015 +#define IMAGE_REL_IA64_PCREL60B 0x0016 +#define IMAGE_REL_IA64_PCREL60F 0x0017 +#define IMAGE_REL_IA64_PCREL60I 0x0018 +#define IMAGE_REL_IA64_PCREL60M 0x0019 +#define IMAGE_REL_IA64_IMMGPREL64 0x001A +#define IMAGE_REL_IA64_TOKEN 0x001B +#define IMAGE_REL_IA64_GPREL32 0x001C #define IMAGE_REL_IA64_ADDEND 0x001F /* AMD64 relocation types */

1 0

André Hentschel : winemaker: Catch special case in Workspace file.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: c9ff0c5382cf25ca101ce21c22e9420ccf69fb78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ff0c5382cf25ca101ce21c2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 19:59:32 2010 +0100 winemaker: Catch special case in Workspace file. Some sln files use that as a section to keep things like changelogs, which we are not interested in. --- tools/winemaker | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 317b07a..bd46380 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1186,6 +1186,7 @@ sub source_scan_workspace_file($) if (/^Project(.*)=\s*"(.*)",\s*"(.*)",\s*"(.*)"/) { $prj_name=$2; $prj_path=$3; + if ($prj_path eq "Solution Items") { next; } @components=split /[\/\\]+/, $3; $prj_path=search_from($path, \@components); print "Name: $prj_name\nPath: $prj_path\n";

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
87
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 November 2010