June 2018 - Wine-commits - list.winehq.org

Francois Gouget : testbot/web: One cannot create a test job from a dll.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: 674ba8e869cbe9824a66eb8fc38b0ef31eff6e4b URL: https://source.winehq.org/git/tools.git/?a=commit;h=674ba8e869cbe9824a66eb8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:35:41 2018 +0200 testbot/web: One cannot create a test job from a dll. DetermineFileType() transforms these file types to unknown so they get rejected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index ac9a384..97f31d1 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -240,7 +240,7 @@ sub GenerateFields($) print "</th><tbody>\n"; my $VMs = CreateVMs(); - if ($self->{FileType} eq "exe64" || $self->{FileType} eq "dll64") + if ($self->{FileType} eq "exe64") { $VMs->AddFilter("Type", ["win64"]); }

1 0

Francois Gouget : testbot/build: Let PatchUtils.pm generate testlist.txt.
by Alexandre Julliard 14 Jun '18

14 Jun '18

Module: tools Branch: master Commit: 494539d0f6a3fec4c1176ed76379d1f3f7c2dc42 URL: https://source.winehq.org/git/tools.git/?a=commit;h=494539d0f6a3fec4c1176ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:36:48 2018 +0200 testbot/build: Let PatchUtils.pm generate testlist.txt. This makes it possible to reuse the code in other build scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 18 +++++------------- testbot/lib/WineTestBot/PatchUtils.pm | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 32cbad7..c950d49 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -41,6 +41,7 @@ sub BEGIN } use WineTestBot::Config; +use WineTestBot::PatchUtils; my $LogFileName = "$LogDir/Reconfig.log"; @@ -133,20 +134,11 @@ sub GitPull() return !1; } - if (open(my $fh, ">", "$DataDir/testlist.txt")) + my $ErrMessage = UpdateWineData("$DataDir/wine"); + if ($ErrMessage) { - foreach my $TestFile (glob("$DataDir/wine/*/*/tests/*.c"), - glob("$DataDir/wine/*/*/tests/*.spec")) - { - next if ($TestFile =~ m=/testlist\.c$=); - $TestFile =~ s=^$DataDir/wine/==; - print $fh "$TestFile\n"; - } - close($fh); - } - else - { - LogMsg "Could not open 'testlist.txt' for writing: $!\n"; + LogMsg "$ErrMessage\n"; + return !1; } return 1; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 833394a..3a555af 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -31,7 +31,7 @@ the Wine builds. =cut use Exporter 'import'; -our @EXPORT = qw(GetPatchImpact); +our @EXPORT = qw(GetPatchImpact UpdateWineData); use WineTestBot::Config; @@ -39,6 +39,37 @@ use WineTestBot::Config; =pod =over 12 +=item C<UpdateWineData()> + +Updates the summary information about the Wine source such as the list of +tests (testlist.txt). + +=back +=cut + +sub UpdateWineData($) +{ + my ($WineDir) = @_; + + if (open(my $fh, ">", "$DataDir/testlist.txt")) + { + foreach my $TestFile (glob("$WineDir/*/*/tests/*.c"), + glob("$WineDir/*/*/tests/*.spec")) + { + next if ($TestFile =~ m=/testlist\.c$=); + $TestFile =~ s=^$WineDir/==; + print $fh "$TestFile\n"; + } + close($fh); + return undef; + } + + return "Could not open 'testlist.txt' for writing: $!"; +} + +=pod +=over 12 + =item C<GetTestList()> Returns a hashtable containing the list of the source files for a given module.

1 0

Michael Stefaniuc : msi/tests: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 74b0dec3c1be0e16c7c2d487e0780a150d15e75c URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b0dec3c1be0e16c7c2d487… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jun 12 23:25:45 2018 +0200 msi/tests: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 4 +--- dlls/msi/tests/install.c | 4 +--- dlls/msi/tests/patch.c | 12 +++--------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 477ab0a..ff54a95 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3033,8 +3033,6 @@ static const struct { { name9, data9, sizeof data9 }, }; -#define NUM_TRANSFORM_TABLES (sizeof table_transform_data/sizeof table_transform_data[0]) - static void generate_transform_manual(void) { IStorage *stg = NULL; @@ -3056,7 +3054,7 @@ static void generate_transform_manual(void) r = IStorage_SetClass( stg, &CLSID_MsiTransform ); ok(r == S_OK, "failed to set storage type\n"); - for (i=0; i<NUM_TRANSFORM_TABLES; i++) + for (i=0; i<ARRAY_SIZE(table_transform_data); i++) { r = IStorage_CreateStream( stg, table_transform_data[i].name, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3eb6c80..951f0e7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3671,8 +3671,6 @@ static const struct { { name3, data3, sizeof data3 }, }; -#define NUM_TRANSFORM_TABLES (sizeof table_transform_data/sizeof table_transform_data[0]) - static void generate_transform_manual(void) { IStorage *stg = NULL; @@ -3694,7 +3692,7 @@ static void generate_transform_manual(void) r = IStorage_SetClass(stg, &CLSID_MsiTransform); ok(r == S_OK, "failed to set storage type\n"); - for (i=0; i<NUM_TRANSFORM_TABLES; i++) + for (i=0; i<ARRAY_SIZE(table_transform_data); i++) { r = IStorage_CreateStream(stg, table_transform_data[i].name, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index b6e990b..a090840 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -446,8 +446,6 @@ static const struct table_data table_patch_data[] = { { p_name6, p_data6, sizeof p_data6 } }; -#define NUM_PATCH_TABLES (sizeof table_patch_data/sizeof table_patch_data[0]) - static const WCHAR t1_name0[] = { 0x4840, 0x430f, 0x422f, 0 }; /* File */ static const WCHAR t1_name1[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3b6a, 0x45e4, 0x4824, 0 }; /* _StringData */ static const WCHAR t1_name2[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3e6a, 0x44b2, 0x482f, 0 }; /* _StringPool */ @@ -519,8 +517,6 @@ static const struct table_data table_transform1_data[] = { { t1_name3, t1_data3, sizeof t1_data3 } }; -#define NUM_TRANSFORM1_TABLES (sizeof table_transform1_data/sizeof table_transform1_data[0]) - static const WCHAR t2_name0[] = { 0x4840, 0x430f, 0x422f, 0 }; /* File */ static const WCHAR t2_name1[] = { 0x4840, 0x4216, 0x4327, 0x4824, 0 }; /* Media */ static const WCHAR t2_name2[] = { 0x4840, 0x3b3f, 0x43f2, 0x4438, 0x45b1, 0 }; /* _Columns */ @@ -644,8 +640,6 @@ static const struct table_data table_transform2_data[] = { { t2_name9, t2_data9, sizeof t2_data9 } }; -#define NUM_TRANSFORM2_TABLES (sizeof table_transform2_data/sizeof table_transform2_data[0]) - static void write_tables( IStorage *stg, const struct table_data *tables, UINT num_tables ) { IStream *stm; @@ -692,7 +686,7 @@ static void create_patch( const char *filename ) r = IStorage_SetClass( stg, &CLSID_MsiPatch ); ok( r == S_OK, "failed to set storage type 0x%08x\n", r ); - write_tables( stg, table_patch_data, NUM_PATCH_TABLES ); + write_tables( stg, table_patch_data, ARRAY_SIZE( table_patch_data )); r = IStorage_CreateStorage( stg, p_name7, mode, 0, 0, &stg1 ); ok( r == S_OK, "failed to create substorage 0x%08x\n", r ); @@ -700,7 +694,7 @@ static void create_patch( const char *filename ) r = IStorage_SetClass( stg1, &CLSID_MsiTransform ); ok( r == S_OK, "failed to set storage type 0x%08x\n", r ); - write_tables( stg1, table_transform1_data, NUM_TRANSFORM1_TABLES ); + write_tables( stg1, table_transform1_data, ARRAY_SIZE( table_transform1_data )); IStorage_Release( stg1 ); r = IStorage_CreateStorage( stg, p_name8, mode, 0, 0, &stg2 ); @@ -709,7 +703,7 @@ static void create_patch( const char *filename ) r = IStorage_SetClass( stg2, &CLSID_MsiTransform ); ok( r == S_OK, "failed to set storage type 0x%08x\n", r ); - write_tables( stg2, table_transform2_data, NUM_TRANSFORM2_TABLES ); + write_tables( stg2, table_transform2_data, ARRAY_SIZE( table_transform2_data )); IStorage_Release( stg2 ); IStorage_Release( stg ); }

1 0

Michael Stefaniuc : msxml3/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 39bd2c96ba6ebe70a66d97caa91ceae77ad6bb36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39bd2c96ba6ebe70a66d97ca… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 11 23:29:16 2018 +0200 msxml3/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 24 ++++++++++++------------ dlls/msxml3/tests/httpreq.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 32 ++++++++++++++++---------------- dlls/msxml3/tests/schema.c | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39bd2c96ba6ebe70a66d…

1 0

Michael Stefaniuc : ole32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 77376000bab6192b2daafb02b2058e885b0bd689 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77376000bab6192b2daafb02… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 13 20:30:25 2018 +0200 ole32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 6 +++--- dlls/ole32/tests/dragdrop.c | 2 +- dlls/ole32/tests/marshal.c | 4 ++-- dlls/ole32/tests/moniker.c | 19 ++++++++++--------- dlls/ole32/tests/ole2.c | 8 ++++---- dlls/ole32/tests/ole_server.c | 2 +- dlls/ole32/tests/propvariant.c | 2 +- dlls/ole32/tests/storage32.c | 6 +++--- 8 files changed, 25 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77376000bab6192b2daa…

1 0

André Hentschel : ws2_32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 48a7d4d0a44c2760fef21621a8642c6e520c12ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a7d4d0a44c2760fef21621… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 11 21:44:41 2018 +0200 ws2_32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 4 +-- dlls/ws2_32/tests/sock.c | 58 +++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48a7d4d0a44c2760fef2…

1 0

Piotr Caban : msvcr100: Fix lldiv implementation.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: b22faf3d0bf68d4b8eb4fd60c6369251595e346e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b22faf3d0bf68d4b8eb4fd60… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 15:06:59 2018 +0200 msvcr100: Fix lldiv implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 9 ++++----- dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a3af78a..8d5b687 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1938,12 +1938,11 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) /********************************************************************* * lldiv (MSVCR100.@) */ -MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) +MSVCRT_lldiv_t* CDECL MSVCRT_lldiv(MSVCRT_lldiv_t *ret, + MSVCRT_longlong num, MSVCRT_longlong denom) { - MSVCRT_lldiv_t ret; - - ret.quot = num / denom; - ret.rem = num % denom; + ret->quot = num / denom; + ret->rem = num % denom; return ret; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 18838a3..354fab1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -114,7 +114,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); -static MSVCRT_lldiv_t (CDECL *p_lldiv)(LONGLONG,LONGLONG); +static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); @@ -504,7 +504,7 @@ static void test_lldiv(void) { MSVCRT_lldiv_t r; - r = p_lldiv((LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + p_lldiv(&r, (LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); ok(r.quot == 0x111, "quot = %s\n", wine_dbgstr_longlong(r.quot)); ok(r.rem == 0x222, "rem = %s\n", wine_dbgstr_longlong(r.rem)); }

1 0

Michael Stefaniuc : include: Add an option to disable line numbers in the tests.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: f0edfa3d752b84b2c0c7d9efd7f256ea3970d2de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0edfa3d752b84b2c0c7d9ef… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 6 20:36:14 2018 +0200 include: Add an option to disable line numbers in the tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 476b4d9..e73f40d 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -113,10 +113,17 @@ extern void __winetest_cdecl winetest_skip( const char *msg, ... ) WINETEST_PRIN extern void __winetest_cdecl winetest_win_skip( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); extern void __winetest_cdecl winetest_trace( const char *msg, ... ) WINETEST_PRINTF_ATTR(1,2); -#define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok -#define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip -#define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip -#define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +#ifdef WINETEST_NO_LINE_NUMBERS +# define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace +#else +# define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok +# define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip +# define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip +# define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace +#endif #define ok ok_(__FILE__, __LINE__) #define skip skip_(__FILE__, __LINE__)

1 0

Zhiyi Zhang : comctl32/taskdialog: Create buttons without templates.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 6dd9b83822f9b9e067363350551ff99c2ea4ad9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd9b83822f9b9e067363350… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 13 15:08:40 2018 +0800 comctl32/taskdialog: Create buttons without templates. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 293 ++++++++++++--------------------------------- 1 file changed, 74 insertions(+), 219 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6dd9b83822f9b9e06736…

1 0

Nikolay Sivov : user32: Fix returned class name for other process windows.
by Alexandre Julliard 13 Jun '18

13 Jun '18

Module: wine Branch: master Commit: 7a45d2fa781852d5f1b8c2f8433dd9054ec1797f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a45d2fa781852d5f1b8c2f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 13 13:47:41 2018 +0300 user32: Fix returned class name for other process windows. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 14 +++++++++++++- include/wine/server_protocol.h | 8 +++++--- server/class.c | 1 + server/protocol.def | 5 +++-- server/request.h | 13 +++++++------ server/trace.c | 5 +++-- 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 2b2d07f..07d36f0 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -1194,8 +1194,20 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) if (class == CLASS_OTHER_PROCESS) { WCHAR tmpbuf[MAX_ATOM_LEN + 1]; + ATOM atom = 0; - ret = GlobalGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), tmpbuf, MAX_ATOM_LEN + 1 ); + SERVER_START_REQ( set_class_info ) + { + req->window = wine_server_user_handle( hwnd ); + req->flags = 0; + req->extra_offset = -1; + req->extra_size = 0; + if (!wine_server_call_err( req )) + atom = reply->base_atom; + } + SERVER_END_REQ; + + ret = GlobalGetAtomNameW( atom, tmpbuf, MAX_ATOM_LEN + 1 ); if (ret) { ret = min(count - 1, ret); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e4c2d92..511ad5c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4525,11 +4525,13 @@ struct set_class_info_reply { struct reply_header __header; atom_t old_atom; + atom_t base_atom; + mod_handle_t old_instance; + lparam_t old_extra_value; unsigned int old_style; int old_extra; int old_win_extra; - mod_handle_t old_instance; - lparam_t old_extra_value; + char __pad_44[4]; }; #define SET_CLASS_ATOM 0x0001 #define SET_CLASS_STYLE 0x0002 @@ -6512,6 +6514,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 554 +#define SERVER_PROTOCOL_VERSION 555 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/class.c b/server/class.c index d5f6712..6a7de78 100644 --- a/server/class.c +++ b/server/class.c @@ -276,6 +276,7 @@ DECL_HANDLER(set_class_info) reply->old_extra = class->nb_extra_bytes; reply->old_win_extra = class->win_extra; reply->old_instance = class->instance; + reply->base_atom = class->base_atom; if (req->flags & SET_CLASS_ATOM) { diff --git a/server/protocol.def b/server/protocol.def index c533f1b..5d89c2b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3179,11 +3179,12 @@ enum caret_state lparam_t extra_value; /* value to set in extra bytes */ @REPLY atom_t old_atom; /* previous class atom */ + atom_t base_atom; /* base class atom */ + mod_handle_t old_instance; /* previous module instance */ + lparam_t old_extra_value; /* old value in extra bytes */ unsigned int old_style; /* previous class style */ int old_extra; /* previous number of class extra bytes */ int old_win_extra; /* previous number of window extra bytes */ - mod_handle_t old_instance; /* previous module instance */ - lparam_t old_extra_value; /* old value in extra bytes */ @END #define SET_CLASS_ATOM 0x0001 #define SET_CLASS_STYLE 0x0002 diff --git a/server/request.h b/server/request.h index 8b823ba..10fd850 100644 --- a/server/request.h +++ b/server/request.h @@ -2056,12 +2056,13 @@ C_ASSERT( FIELD_OFFSET(struct set_class_info_request, extra_size) == 44 ); C_ASSERT( FIELD_OFFSET(struct set_class_info_request, extra_value) == 48 ); C_ASSERT( sizeof(struct set_class_info_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_atom) == 8 ); -C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_style) == 12 ); -C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_extra) == 16 ); -C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_win_extra) == 20 ); -C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_instance) == 24 ); -C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_extra_value) == 32 ); -C_ASSERT( sizeof(struct set_class_info_reply) == 40 ); +C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, base_atom) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_instance) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_extra_value) == 24 ); +C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_style) == 32 ); +C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_extra) == 36 ); +C_ASSERT( FIELD_OFFSET(struct set_class_info_reply, old_win_extra) == 40 ); +C_ASSERT( sizeof(struct set_class_info_reply) == 48 ); C_ASSERT( FIELD_OFFSET(struct open_clipboard_request, window) == 12 ); C_ASSERT( sizeof(struct open_clipboard_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_clipboard_reply, owner) == 8 ); diff --git a/server/trace.c b/server/trace.c index c602043..e6ed964 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3795,11 +3795,12 @@ static void dump_set_class_info_request( const struct set_class_info_request *re static void dump_set_class_info_reply( const struct set_class_info_reply *req ) { fprintf( stderr, " old_atom=%04x", req->old_atom ); + fprintf( stderr, ", base_atom=%04x", req->base_atom ); + dump_uint64( ", old_instance=", &req->old_instance ); + dump_uint64( ", old_extra_value=", &req->old_extra_value ); fprintf( stderr, ", old_style=%08x", req->old_style ); fprintf( stderr, ", old_extra=%d", req->old_extra ); fprintf( stderr, ", old_win_extra=%d", req->old_win_extra ); - dump_uint64( ", old_instance=", &req->old_instance ); - dump_uint64( ", old_extra_value=", &req->old_extra_value ); } static void dump_open_clipboard_request( const struct open_clipboard_request *req )

1 0