wine-commits May 2018

wine-commits@winehq.org

2 participants
716 discussions

Alistair Leslie-Hughes : gdiplus: Display the GUID of the image type in GdipSaveImageToStream.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: cf3362afb1894d3d5bae700d201cc7329a478234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf3362afb1894d3d5bae700d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 24 04:06:28 2018 +0000 gdiplus: Display the GUID of the image type in GdipSaveImageToStream. Based on a patch by Dmitry Timoshkov. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 5affe03..e9b0b08 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4580,7 +4580,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, encode_image_func encode_image; int i; - TRACE("%p %p %p %p\n", image, stream, clsid, params); + TRACE("%p, %p, %s, %p\n", image, stream, wine_dbgstr_guid(clsid), params); if(!image || !stream) return InvalidParameter;

1 0

Dmitry Timoshkov : gdiplus: Pass the correct GUID to encode_image_wic for GIF images.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: cc119b9464591a23adced3b1bd1cb70872bf0883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc119b9464591a23adced3b1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 04:06:26 2018 +0000 gdiplus: Pass the correct GUID to encode_image_wic for GIF images. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9841857..5affe03 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4567,7 +4567,7 @@ static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, static GpStatus encode_image_gif(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params) { - return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatGif, params); } /*****************************************************************************

1 0

Alexandre Julliard : server: Removed unused visible rect from get_window_rectangles request.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 376c218ad69610dee92ef5ab51b313a90edf514c URL: https://source.winehq.org/git/wine.git/?a=commit;h=376c218ad69610dee92ef5ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 24 14:10:12 2018 +0200 server: Removed unused visible rect from get_window_rectangles request. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 +-- server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 1 - server/window.c | 17 ++--------------- 5 files changed, 5 insertions(+), 22 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 564ae92..98dbcb7 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3682,7 +3682,6 @@ struct get_window_rectangles_reply { struct reply_header __header; rectangle_t window; - rectangle_t visible; rectangle_t client; }; enum coords_relative @@ -6511,6 +6510,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 552 +#define SERVER_PROTOCOL_VERSION 553 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9fb155b..99e7221 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2643,7 +2643,6 @@ enum message_type int relative; /* coords relative to (see below) */ @REPLY rectangle_t window; /* window rectangle */ - rectangle_t visible; /* visible part of the window rectangle */ rectangle_t client; /* client rectangle */ @END enum coords_relative diff --git a/server/request.h b/server/request.h index 3e6183b..2d55dfb 100644 --- a/server/request.h +++ b/server/request.h @@ -1767,9 +1767,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_request, relative) == 16 ); C_ASSERT( sizeof(struct get_window_rectangles_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, window) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, visible) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 40 ); -C_ASSERT( sizeof(struct get_window_rectangles_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_window_rectangles_reply, client) == 24 ); +C_ASSERT( sizeof(struct get_window_rectangles_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_request, handle) == 12 ); C_ASSERT( sizeof(struct get_window_text_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_window_text_reply, length) == 8 ); diff --git a/server/trace.c b/server/trace.c index 44004ad..e2980a3 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3222,7 +3222,6 @@ static void dump_get_window_rectangles_request( const struct get_window_rectangl static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req ) { dump_rectangle( " window=", &req->window ); - dump_rectangle( ", visible=", &req->visible ); dump_rectangle( ", client=", &req->client ); } diff --git a/server/window.c b/server/window.c index 4a1a278..9492a00 100644 --- a/server/window.c +++ b/server/window.c @@ -2346,42 +2346,29 @@ DECL_HANDLER(get_window_rectangles) if (!win) return; reply->window = win->window_rect; - reply->visible = win->visible_rect; reply->client = win->client_rect; switch (req->relative) { case COORDS_CLIENT: offset_rect( &reply->window, -win->client_rect.left, -win->client_rect.top ); - offset_rect( &reply->visible, -win->client_rect.left, -win->client_rect.top ); offset_rect( &reply->client, -win->client_rect.left, -win->client_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->client_rect, &reply->window ); - mirror_rect( &win->client_rect, &reply->visible ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &reply->window ); break; case COORDS_WINDOW: offset_rect( &reply->window, -win->window_rect.left, -win->window_rect.top ); - offset_rect( &reply->visible, -win->window_rect.left, -win->window_rect.top ); offset_rect( &reply->client, -win->window_rect.left, -win->window_rect.top ); - if (win->ex_style & WS_EX_LAYOUTRTL) - { - mirror_rect( &win->window_rect, &reply->visible ); - mirror_rect( &win->window_rect, &reply->client ); - } + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->window_rect, &reply->client ); break; case COORDS_PARENT: if (win->parent && win->parent->ex_style & WS_EX_LAYOUTRTL) { mirror_rect( &win->parent->client_rect, &reply->window ); - mirror_rect( &win->parent->client_rect, &reply->visible ); mirror_rect( &win->parent->client_rect, &reply->client ); } break; case COORDS_SCREEN: client_to_screen_rect( win->parent, &reply->window ); - client_to_screen_rect( win->parent, &reply->visible ); client_to_screen_rect( win->parent, &reply->client ); break; default:

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: fde111043e9fdd03c9fe13f712c4e3e3366decd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fde111043e9fdd03c9fe13f7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu May 24 19:27:33 2018 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/po/fi.po b/po/fi.po index 4bc100e..60bc651 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3684,18 +3684,19 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"Attribuutti 'writable' ei voi olla 'true' tämän objektin ominaisuuksissa" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Ei-konfiguroitavaa ominaisuutta '|' ei voi määritellä uudestaan" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "Ominaisuudella ei voi olla sekä hakufunktiota että arvoa" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -8502,10 +8503,8 @@ msgid "&Browse..." msgstr "&Selaa..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Tiedostotyyppi" +msgstr "Tiedostotyyppi:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8516,16 +8515,12 @@ msgid "Size:" msgstr "Koko:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Luotu" +msgstr "Luotu:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Ominaisuudet:" +msgstr "Ominaisuudet:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8536,28 +8531,20 @@ msgid "&Archive" msgstr "&Arkisto" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Avaa:" +msgstr "Avaa ohjelmalla:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "&Vaihda kuvaketta..." +msgstr "&Vaihda..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Muokattu" +msgstr "Muokattu:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Viimeisin muutos:" +msgstr "Käytetty:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size"

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 100de495d875e12a438faefd884cd2d5b4011ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=100de495d875e12a438faefd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu May 24 20:52:07 2018 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 71 ++++++++++++++++++++-------------------------------------------- 1 file changed, 22 insertions(+), 49 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1d9f9a5..5214893 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-12 22:41+0900\n" +"PO-Revision-Date: 2018-05-24 20:49+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -6665,10 +6665,8 @@ msgid "Connection reset by peer.\n" msgstr "相手側により接続がリセットされました。\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "メッセージ 0x%1 はファイル %2 に見つかりませんでした。\n" +msgstr "ファイルにデジタル署名がありません。\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -8502,10 +8500,8 @@ msgid "&Browse..." msgstr "参照(&B)..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "ファイルの種類" +msgstr "ファイルの種類:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8516,16 +8512,12 @@ msgid "Size:" msgstr "サイズ:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "作成日" +msgstr "作成日:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "属性(&A):" +msgstr "属性:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8536,28 +8528,20 @@ msgid "&Archive" msgstr "アーカイブ(&A)" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "URL:" +msgstr "アプリケーション:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "アイコンの変更(&I)..." +msgstr "変更(&C)..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "更新日時" +msgstr "最終変更日時:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "最終変更日時:" +msgstr "最終アクセス日時:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9167,70 +9151,59 @@ msgid "" msgstr "この証明書には特定できないセキュリティ問題があります。" #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "サービス要求が時間切れとなりました。\n" +msgstr "要求は時間切れとなりました。\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "プリンタエラーが発生しました。" +msgstr "内部エラーが発生しました。\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "パス名が不正です。\n" +msgstr "URL が不正です。\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "URL スキームを認識できなかったかサポートしていません。\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "ユーザ名を見つけられませんでした。\n" +msgstr "サーバ名をを解決できませんでした。\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "ユーザプロファイルが正しくありません。\n" +msgstr "要求された操作は正しくありません。\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"操作は取り消されました。通常は要求が行われたハンドルが操作の完了前にクローズ" +"されたことが原因です。\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "プロファイルを追加できませんでした。\n" +msgstr "要求された項目は見つかりませんでした。\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "LDAP サーバに接続できません" +msgstr "サーバへの接続試行は失敗しました。\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "サーバへの接続は終了されました。\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"サーバから受信した SSL 証明書の日付が不正です。証明書は期限切れです。\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL 証明書の一般名(ホスト名フィールド)が不適切です。\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Dmitry Timoshkov : mstask: Keep the job file uuid across load/ save operations.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 8587b4788bccc7fb4a6be8de348928cb91bf83cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8587b4788bccc7fb4a6be8de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 16:29:26 2018 +0800 mstask: Keep the job file uuid across load/save operations. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 7a110b3..58be83e 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -58,6 +58,7 @@ typedef struct LONG ref; ITaskDefinition *task; IExecAction *action; + UUID uuid; LPWSTR task_name; HRESULT status; WORD idle_minutes, deadline_minutes; @@ -1241,6 +1242,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) if (fixed->file_version != 0x0001) return SCHED_E_INVALID_TASK; + This->uuid = fixed->uuid; + TRACE("name_size_offset %04x\n", fixed->name_size_offset); TRACE("trigger_offset %04x\n", fixed->trigger_offset); TRACE("error_retry_count %u\n", fixed->error_retry_count); @@ -1583,7 +1586,6 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta ver = GetVersion(); fixed.product_version = MAKEWORD(ver >> 8, ver); fixed.file_version = 0x0001; - CoCreateGuid(&fixed.uuid); fixed.name_size_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ fixed.trigger_offset += sizeof(USHORT); /* Application Name */ @@ -1627,6 +1629,11 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta Sleep(100); } + if (GetLastError() == ERROR_ALREADY_EXISTS) + fixed.uuid = This->uuid; + else + CoCreateGuid(&fixed.uuid); + if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) { hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1848,6 +1855,8 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->is_dirty = FALSE; This->instance_count = 0; + CoCreateGuid(&This->uuid); + /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000;

1 0

Dmitry Timoshkov : kerberos: Add ISC_REQ_CONNECTION to the list of supported flags.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: f9f7b775d92019a683db2f97d9e73ceb9dcaad65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9f7b775d92019a683db2f97… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:36:13 2018 +0800 kerberos: Add ISC_REQ_CONNECTION to the list of supported flags. Formatting messages are not supported anyway. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 60042e6..7d532e5 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1020,7 +1020,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE | - ISC_REQ_IDENTIFY; + ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION; OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle;

1 0

Dmitry Timoshkov : kerberos: Translate GSS_C_DCE_STYLE to appropriate ISC_RET and ASC_RET flags.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 1288908ace239c9b440f605025c829b2d5216437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1288908ace239c9b440f6050… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:36:03 2018 +0800 kerberos: Translate GSS_C_DCE_STYLE to appropriate ISC_RET and ASC_RET flags. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 63137d8..60042e6 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -805,6 +805,7 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) if (flags & GSS_C_CONF_FLAG) ret |= ISC_RET_CONFIDENTIALITY; if (flags & GSS_C_INTEG_FLAG) ret |= ISC_RET_INTEGRITY; if (flags & GSS_C_ANON_FLAG) ret |= ISC_RET_NULL_SESSION; + if (flags & GSS_C_DCE_STYLE) ret |= ISC_RET_USED_DCE_STYLE; if (flags & GSS_C_IDENTIFY_FLAG) ret |= ISC_RET_IDENTIFY; return ret; } @@ -819,6 +820,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) if (flags & GSS_C_CONF_FLAG) ret |= ASC_RET_CONFIDENTIALITY; if (flags & GSS_C_INTEG_FLAG) ret |= ASC_RET_INTEGRITY; if (flags & GSS_C_ANON_FLAG) ret |= ASC_RET_NULL_SESSION; + if (flags & GSS_C_DCE_STYLE) ret |= ASC_RET_USED_DCE_STYLE; if (flags & GSS_C_IDENTIFY_FLAG) ret |= ASC_RET_IDENTIFY; return ret; }

1 0

Dmitry Timoshkov : kerberos: Add support for ISC_REQ_IDENTIFY flag.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 1cf45fe554f007077300779f4c484473ef7c2b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf45fe554f007077300779f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 24 14:35:52 2018 +0800 kerberos: Add support for ISC_REQ_IDENTIFY flag. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0ff6ae2..63137d8 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -791,6 +791,7 @@ static ULONG flags_isc_req_to_gss( ULONG flags ) if (flags & ISC_REQ_INTEGRITY) ret |= GSS_C_INTEG_FLAG; if (flags & ISC_REQ_NULL_SESSION) ret |= GSS_C_ANON_FLAG; if (flags & ISC_REQ_USE_DCE_STYLE) ret |= GSS_C_DCE_STYLE; + if (flags & ISC_REQ_IDENTIFY) ret |= GSS_C_IDENTIFY_FLAG; return ret; } @@ -804,6 +805,7 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) if (flags & GSS_C_CONF_FLAG) ret |= ISC_RET_CONFIDENTIALITY; if (flags & GSS_C_INTEG_FLAG) ret |= ISC_RET_INTEGRITY; if (flags & GSS_C_ANON_FLAG) ret |= ISC_RET_NULL_SESSION; + if (flags & GSS_C_IDENTIFY_FLAG) ret |= ISC_RET_IDENTIFY; return ret; } @@ -817,6 +819,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) if (flags & GSS_C_CONF_FLAG) ret |= ASC_RET_CONFIDENTIALITY; if (flags & GSS_C_INTEG_FLAG) ret |= ASC_RET_INTEGRITY; if (flags & GSS_C_ANON_FLAG) ret |= ASC_RET_NULL_SESSION; + if (flags & GSS_C_IDENTIFY_FLAG) ret |= ASC_RET_IDENTIFY; return ret; } @@ -1014,7 +1017,8 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { #ifdef SONAME_LIBGSSAPI_KRB5 static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | - ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE; + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH | ISC_REQ_USE_DCE_STYLE | + ISC_REQ_IDENTIFY; OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle; gss_ctx_id_t ctxt_handle;

1 0

Michael Müller : dxdiagn: Add several more fields for DisplayDevices.
by Alexandre Julliard 24 May '18

24 May '18

Module: wine Branch: master Commit: 3eee8b5594f7063e3c657ad79ec8ea58386edf6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eee8b5594f7063e3c657ad7… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 24 01:48:32 2018 +0000 dxdiagn: Add several more fields for DisplayDevices. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxdiagn/provider.c | 159 +++++++++++++++++++++++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 2 + 2 files changed, 161 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eee8b5594f7063e3c65…

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
72
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 May 2018