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

Francois Gouget : testbot/build: Add an empty line before the GitPull() message.
by Alexandre Julliard June 14, 2018

June 14, 2018

Module: tools Branch: master Commit: 470ba11e3159016d209aca8e0c91b5f925b9efcb URL: https://source.winehq.org/git/tools.git/?a=commit;h=470ba11e3159016d209aca8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 14 10:34:41 2018 +0200 testbot/build: Add an empty line before the GitPull() message. GitPull() is not the first command being run anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 706da25..32cbad7 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -125,7 +125,7 @@ sub BuildTestLauncher() sub GitPull() { - InfoMsg "Updating the Wine source\n"; + InfoMsg "\nUpdating the Wine source\n"; system("cd $DataDir/wine && git pull >>$LogFileName 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/web: One cannot create a test job from a dll.
by Alexandre Julliard June 14, 2018

June 14, 2018

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

André Hentschel : ws2_32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 13, 2018

June 13, 2018

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

Jacek Caban : mshtml.idl: Added IHTMLPerformance test.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: wine Branch: master Commit: 8c48c632fc66c8420331ed9c14f7fd3764aa8a0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c48c632fc66c8420331ed9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 14:23:55 2018 +0200 mshtml.idl: Added IHTMLPerformance test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b120b47..3f08a23 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6742,6 +6742,7 @@ static void test_window(IHTMLDocument2 *doc) { IHTMLWindow2 *window, *window2, *self, *parent; IHTMLWindow5 *window5; + IHTMLWindow7 *window7; IHTMLDocument2 *doc2 = NULL; IDispatch *disp; IUnknown *unk; @@ -6843,6 +6844,29 @@ static void test_window(IHTMLDocument2 *doc) win_skip("IHTMLWindow5 not supported!\n"); } + hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow7, (void**)&window7); + if(SUCCEEDED(hres)) { + IHTMLPerformance *performance; + + ok(window7 != NULL, "window7 == NULL\n"); + + hres = IHTMLWindow7_get_performance(window7, &v); + todo_wine + ok(hres == S_OK, "get_performance failed: %08x\n", hres); + if(SUCCEEDED(hres)) { + ok(V_VT(&v) == VT_DISPATCH, "V_VT(performance) = %u\n", V_VT(&v)); + + hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IHTMLPerformance, + (void**)&performance); + ok(hres == S_OK, "Could not get IHTMLPerformance iface: %08x\n", hres); + + IHTMLPerformance_Release(performance); + IHTMLWindow7_Release(window7); + } + }else { + win_skip("IHTMLWindow7 not supported\n"); + } + IHTMLWindow2_Release(window); }

1 0

Jacek Caban : mshtml.idl: Added IHTMLPerformance declaration.
by Alexandre Julliard June 13, 2018

June 13, 2018

Module: wine Branch: master Commit: 47f92ec07aea3d0b4d25958c118dcbd8cba9c059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f92ec07aea3d0b4d25958c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 13 14:23:39 2018 +0200 mshtml.idl: Added IHTMLPerformance declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 40 +++++++++++++++++ include/mshtml.idl | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 3b1fac6..fa63b6e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -112,6 +112,9 @@ #define DISPID_RULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST #define DISPID_STYLESHEETRULESAPPLIED_COLLECTION DISPID_NORMAL_FIRST #define DISPID_PROCESSINGINSTRUCTION DISPID_NORMAL_FIRST +#define DISPID_PERFORMANCE DISPID_NORMAL_FIRST +#define DISPID_PERFORMANCENAVIGATION DISPID_NORMAL_FIRST +#define DISPID_PERFORMANCETIMING DISPID_NORMAL_FIRST #define DISPID_HTMLSELECTION DISPID_NORMAL_FIRST #define DISPID_DOMRANGE DISPID_NORMAL_FIRST #define DISPID_MEDIA DISPID_NORMAL_FIRST @@ -4025,6 +4028,43 @@ #define DISPID_IDOMPROCESSINGINSTRUCTION_TARGET DISPID_PROCESSINGINSTRUCTION #define DISPID_IDOMPROCESSINGINSTRUCTION_DATA DISPID_PROCESSINGINSTRUCTION+1 +/* IHTMLPerformanceNavigation */ +#define DISPID_IHTMLPERFORMANCENAVIGATION_TYPE DISPID_PERFORMANCENAVIGATION +#define DISPID_IHTMLPERFORMANCENAVIGATION_REDIRECTCOUNT DISPID_PERFORMANCENAVIGATION+1 +#define DISPID_IHTMLPERFORMANCENAVIGATION_TOSTRING DISPID_PERFORMANCENAVIGATION+2 +#define DISPID_IHTMLPERFORMANCENAVIGATION_TOJSON DISPID_PERFORMANCENAVIGATION+3 + +/* IHTMLPerformanceTiming */ +#define DISPID_IHTMLPERFORMANCETIMING_NAVIGATIONSTART DISPID_PERFORMANCETIMING +#define DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTSTART DISPID_PERFORMANCETIMING+1 +#define DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTEND DISPID_PERFORMANCETIMING+2 +#define DISPID_IHTMLPERFORMANCETIMING_REDIRECTSTART DISPID_PERFORMANCETIMING+3 +#define DISPID_IHTMLPERFORMANCETIMING_REDIRECTEND DISPID_PERFORMANCETIMING+4 +#define DISPID_IHTMLPERFORMANCETIMING_FETCHSTART DISPID_PERFORMANCETIMING+5 +#define DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPSTART DISPID_PERFORMANCETIMING+6 +#define DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPEND DISPID_PERFORMANCETIMING+7 +#define DISPID_IHTMLPERFORMANCETIMING_CONNECTSTART DISPID_PERFORMANCETIMING+8 +#define DISPID_IHTMLPERFORMANCETIMING_CONNECTEND DISPID_PERFORMANCETIMING+9 +#define DISPID_IHTMLPERFORMANCETIMING_REQUESTSTART DISPID_PERFORMANCETIMING+10 +#define DISPID_IHTMLPERFORMANCETIMING_RESPONSESTART DISPID_PERFORMANCETIMING+11 +#define DISPID_IHTMLPERFORMANCETIMING_RESPONSEEND DISPID_PERFORMANCETIMING+12 +#define DISPID_IHTMLPERFORMANCETIMING_DOMLOADING DISPID_PERFORMANCETIMING+13 +#define DISPID_IHTMLPERFORMANCETIMING_DOMINTERACTIVE DISPID_PERFORMANCETIMING+14 +#define DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTSTART DISPID_PERFORMANCETIMING+15 +#define DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTEND DISPID_PERFORMANCETIMING+16 +#define DISPID_IHTMLPERFORMANCETIMING_DOMCOMPLETE DISPID_PERFORMANCETIMING+17 +#define DISPID_IHTMLPERFORMANCETIMING_LOADEVENTSTART DISPID_PERFORMANCETIMING+18 +#define DISPID_IHTMLPERFORMANCETIMING_LOADEVENTEND DISPID_PERFORMANCETIMING+19 +#define DISPID_IHTMLPERFORMANCETIMING_MSFIRSTPAINT DISPID_PERFORMANCETIMING+20 +#define DISPID_IHTMLPERFORMANCETIMING_TOSTRING DISPID_PERFORMANCETIMING+21 +#define DISPID_IHTMLPERFORMANCETIMING_TOJSON DISPID_PERFORMANCETIMING+22 + +/* IHTMLPerformance */ +#define DISPID_IHTMLPERFORMANCE_NAVIGATION DISPID_PERFORMANCE +#define DISPID_IHTMLPERFORMANCE_TIMING DISPID_PERFORMANCE+1 +#define DISPID_IHTMLPERFORMANCE_TOSTRING DISPID_PERFORMANCE+2 +#define DISPID_IHTMLPERFORMANCE_TOJSON DISPID_PERFORMANCE+3 + /* IDocumentEvent */ #define DISPID_IDOCUMENTEVENT_CREATEEVENT DISPID_OMDOCUMENT+108 diff --git a/include/mshtml.idl b/include/mshtml.idl index 6c0bd26..ea5d42d 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -17092,6 +17092,135 @@ interface IDOMProcessingInstruction : IDispatch } /***************************************************************************** + * IHTMLPerformanceNavigation interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510750-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLPerformanceNavigation : IDispatch +{ + [propget, id(DISPID_IHTMLPERFORMANCENAVIGATION_TYPE)] + HRESULT type([out, retval] ULONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCENAVIGATION_REDIRECTCOUNT)] + HRESULT redirectCount([out, retval] ULONG *p); + + [id(DISPID_IHTMLPERFORMANCENAVIGATION_TOSTRING)] + HRESULT toString([out, retval] BSTR *string); + + [id(DISPID_IHTMLPERFORMANCENAVIGATION_TOJSON)] + HRESULT toJSON([out, retval] VARIANT *pVar); +} + +/***************************************************************************** + * IHTMLPerformanceTiming interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510752-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLPerformanceTiming : IDispatch +{ + [propget, id(DISPID_IHTMLPERFORMANCETIMING_NAVIGATIONSTART)] + HRESULT navigationStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTSTART)] + HRESULT unloadEventStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_UNLOADEVENTEND)] + HRESULT unloadEventEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_REDIRECTSTART)] + HRESULT redirectStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_REDIRECTEND)] + HRESULT redirectEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_FETCHSTART)] + HRESULT fetchStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPSTART)] + HRESULT domainLookupStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMAINLOOKUPEND)] + HRESULT domainLookupEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_CONNECTSTART)] + HRESULT connectStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_CONNECTEND)] + HRESULT connectEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_REQUESTSTART)] + HRESULT requestStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_RESPONSESTART)] + HRESULT responseStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_RESPONSEEND)] + HRESULT responseEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMLOADING)] + HRESULT domLoading([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMINTERACTIVE)] + HRESULT domInteractive([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTSTART)] + HRESULT domContentLoadedEventStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMCONTENTLOADEDEVENTEND)] + HRESULT domContentLoadedEventEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_DOMCOMPLETE)] + HRESULT domComplete([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_LOADEVENTSTART)] + HRESULT loadEventStart([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_LOADEVENTEND)] + HRESULT loadEventEnd([out, retval] ULONGLONG *p); + + [propget, id(DISPID_IHTMLPERFORMANCETIMING_MSFIRSTPAINT)] + HRESULT msFirstPaint([out, retval] ULONGLONG *p); + + [id(DISPID_IHTMLPERFORMANCETIMING_TOSTRING)] + HRESULT toString([out, retval] BSTR *string); + + [id(DISPID_IHTMLPERFORMANCETIMING_TOJSON)] + HRESULT toJSON([out, retval] VARIANT *pVar); +} + +/***************************************************************************** + * IHTMLPerformance interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051074e-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLPerformance : IDispatch +{ + [propget, id(DISPID_IHTMLPERFORMANCE_NAVIGATION)] + HRESULT navigation([out, retval] IHTMLPerformanceNavigation **p); + + [propget, id(DISPID_IHTMLPERFORMANCE_TIMING)] + HRESULT timing([out, retval] IHTMLPerformanceTiming **p); + + [id(DISPID_IHTMLPERFORMANCE_TOSTRING)] + HRESULT toString([out, retval] BSTR *string); + + [id(DISPID_IHTMLPERFORMANCE_TOJSON)] + HRESULT toJSON([out, retval] VARIANT *pVar); +} + +/***************************************************************************** * IHTMLDocument interface */ [

1 0

Nikolay Sivov : user32: Fix returned class name for other process windows.
by Alexandre Julliard June 13, 2018

June 13, 2018

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

Zhiyi Zhang : comctl32/taskdialog: Create buttons without templates.
by Alexandre Julliard June 13, 2018

June 13, 2018

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

Piotr Caban : msvcr100: Fix lldiv implementation.
by Alexandre Julliard June 13, 2018

June 13, 2018

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 : msxml3/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 13, 2018

June 13, 2018

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 : include: Add an option to disable line numbers in the tests.
by Alexandre Julliard June 13, 2018

June 13, 2018

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