July 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : gdiplus: Use nameless unions/structs.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 313e4d0efc9f40246cee831007d88970a0d62fdc URL: https://gitlab.winehq.org/wine/wine/-/commit/313e4d0efc9f40246cee831007d889… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:07 2023 +0200 gdiplus: Use nameless unions/structs. --- dlls/gdiplus/image.c | 2 -- dlls/gdiplus/metafile.c | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3b9ce3c14f1..50a666c5bc9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -20,8 +20,6 @@ #include <stdarg.h> #include <assert.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4880211ad87..0664aa5fc89 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -20,8 +20,6 @@ #include <math.h> #include <assert.h> -#define NONAMELESSUNION - #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -1702,7 +1700,7 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) BYTE* buffer; UINT buffer_size; - gdi_bounds_rc = header.u.EmfHeader.rclBounds; + gdi_bounds_rc = header.EmfHeader.rclBounds; if (gdi_bounds_rc.right > gdi_bounds_rc.left && gdi_bounds_rc.bottom > gdi_bounds_rc.top) { @@ -4156,7 +4154,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE hemf, header->Y = gdip_round((REAL)emfheader.rclFrame.top / 2540.0 * header->DpiY); header->Width = gdip_round((REAL)(emfheader.rclFrame.right - emfheader.rclFrame.left) / 2540.0 * header->DpiX); header->Height = gdip_round((REAL)(emfheader.rclFrame.bottom - emfheader.rclFrame.top) / 2540.0 * header->DpiY); - header->u.EmfHeader = emfheader; + header->EmfHeader = emfheader; if (metafile_type == MetafileTypeEmfPlusDual || metafile_type == MetafileTypeEmfPlusOnly) { @@ -4259,11 +4257,11 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, (*metafile)->image.frame_count = 1; (*metafile)->image.xres = header.DpiX; (*metafile)->image.yres = header.DpiY; - (*metafile)->bounds.X = (REAL)header.u.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; - (*metafile)->bounds.Y = (REAL)header.u.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; - (*metafile)->bounds.Width = (REAL)(header.u.EmfHeader.rclFrame.right - header.u.EmfHeader.rclFrame.left) + (*metafile)->bounds.X = (REAL)header.EmfHeader.rclFrame.left / 2540.0 * header.DpiX; + (*metafile)->bounds.Y = (REAL)header.EmfHeader.rclFrame.top / 2540.0 * header.DpiY; + (*metafile)->bounds.Width = (REAL)(header.EmfHeader.rclFrame.right - header.EmfHeader.rclFrame.left) / 2540.0 * header.DpiX; - (*metafile)->bounds.Height = (REAL)(header.u.EmfHeader.rclFrame.bottom - header.u.EmfHeader.rclFrame.top) + (*metafile)->bounds.Height = (REAL)(header.EmfHeader.rclFrame.bottom - header.EmfHeader.rclFrame.top) / 2540.0 * header.DpiY; (*metafile)->unit = UnitPixel; (*metafile)->metafile_type = header.Type;

1 0

Alexandre Julliard : hhctrl.ocx: Use nameless unions/structs.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: a40b2139f7c5b5fa23ac606dc789c2672524451c URL: https://gitlab.winehq.org/wine/wine/-/commit/a40b2139f7c5b5fa23ac606dc789c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:18 2023 +0200 hhctrl.ocx: Use nameless unions/structs. --- dlls/hhctrl.ocx/content.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 8ad088c16ff..c6f01b80d97 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "hhctrl.h" #include "stream.h" #include "resource.h" @@ -267,12 +265,12 @@ static void insert_content_item(HWND hwnd, ContentItem *parent, ContentItem *ite TVINSERTSTRUCTW tvis; memset(&tvis, 0, sizeof(tvis)); - tvis.u.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; - tvis.u.item.cchTextMax = lstrlenW(item->name)+1; - tvis.u.item.pszText = item->name; - tvis.u.item.lParam = (LPARAM)item; - tvis.u.item.iImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; - tvis.u.item.iSelectedImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; + tvis.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; + tvis.item.cchTextMax = lstrlenW(item->name)+1; + tvis.item.pszText = item->name; + tvis.item.lParam = (LPARAM)item; + tvis.item.iImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; + tvis.item.iSelectedImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; tvis.hParent = parent ? parent->id : 0; tvis.hInsertAfter = TVI_LAST;

1 0

Alexandre Julliard : ieframe: Use nameless unions/structs.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: c48816400b300f830767b14207292d8efc0cfa31 URL: https://gitlab.winehq.org/wine/wine/-/commit/c48816400b300f830767b14207292d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 13 11:57:35 2023 +0200 ieframe: Use nameless unions/structs. --- dlls/ieframe/intshcut.c | 10 ++++------ dlls/ieframe/navigate.c | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index d250fb051ea..b992305a724 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -29,8 +29,6 @@ #include <stdio.h> -#define NONAMELESSUNION - #include "ieframe.h" #include "shlobj.h" @@ -507,7 +505,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam PROPSPEC ps; PROPVARIANT pv; ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONFILE; + ps.propid = PID_IS_ICONFILE; pv.vt = VT_LPWSTR; pv.pwszVal = iconfile; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); @@ -523,7 +521,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam PROPVARIANT pv; iconindex = wcstol(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONINDEX; + ps.propid = PID_IS_ICONINDEX; pv.vt = VT_I4; pv.iVal = iconindex; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); @@ -583,9 +581,9 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam PROPSPEC ps[2]; PROPVARIANT pvread[2]; ps[0].ulKind = PRSPEC_PROPID; - ps[0].u.propid = PID_IS_ICONFILE; + ps[0].propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; - ps[1].u.propid = PID_IS_ICONINDEX; + ps[1].propid = PID_IS_ICONINDEX; WriteFile(file, str_header, ARRAY_SIZE(str_header) - 1, &bytesWritten, NULL); WriteFile(file, str_eol, ARRAY_SIZE(str_eol) - 1, &bytesWritten, NULL); diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 8f8b1f3f192..488ac62fbdf 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION - #include "ieframe.h" #include "exdispid.h" @@ -80,7 +78,7 @@ static void dump_BINDINFO(BINDINFO *bi) "}\n", bi->cbSize, debugstr_w(bi->szExtraInfo), - bi->stgmedData.tymed, bi->stgmedData.u.hGlobal, bi->stgmedData.pUnkForRelease, + bi->stgmedData.tymed, bi->stgmedData.hGlobal, bi->stgmedData.pUnkForRelease, bi->grfBindInfoF > BINDINFOF_URLENCODEDEXTRAINFO ? "unknown" : BINDINFOF_str[bi->grfBindInfoF], bi->dwBindVerb > BINDVERB_CUSTOM @@ -392,7 +390,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface, pbindinfo->dwBindVerb = BINDVERB_POST; pbindinfo->stgmedData.tymed = TYMED_HGLOBAL; - pbindinfo->stgmedData.u.hGlobal = This->post_data; + pbindinfo->stgmedData.hGlobal = This->post_data; pbindinfo->cbstgmedData = This->post_data_len; pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)&This->IBindStatusCallback_iface; IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); @@ -1040,7 +1038,7 @@ static HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, if(bindinfo.dwBindVerb == BINDVERB_POST) { post_data_len = bindinfo.cbstgmedData; if(post_data_len) - post_data = bindinfo.stgmedData.u.hGlobal; + post_data = bindinfo.stgmedData.hGlobal; } if(This->doc_navigate) {

1 0

Eric Pouech : conhost: Fix ctrl-c handling.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: wine Branch: master Commit: 10aaff9245509b751553e7c17ec396de279fc746 URL: https://gitlab.winehq.org/wine/wine/-/commit/10aaff9245509b751553e7c17ec396… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jul 12 10:41:00 2023 +0200 conhost: Fix ctrl-c handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55197 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/conhost/conhost.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 21fc8838502..eb3c574789f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1502,22 +1502,16 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor console->records = new_rec; console->record_size = console->record_size * 2 + count; } - memcpy( console->records + console->record_count, records, count * sizeof(INPUT_RECORD) ); if (console->mode & ENABLE_PROCESSED_INPUT) { - unsigned int i = 0; - while (i < count) + unsigned int i; + for (i = 0; i < count; i++) { unsigned int event; - if (map_to_ctrlevent(console, &records[i], &event)) + if (map_to_ctrlevent( console, &records[i], &event )) { - if (i != count - 1) - memcpy( &console->records[console->record_count + i], - &console->records[console->record_count + i + 1], - (count - i - 1) * sizeof(INPUT_RECORD) ); - count--; if (records[i].Event.KeyEvent.bKeyDown) { struct condrv_ctrl_event ctrl_event; @@ -1527,13 +1521,17 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor ctrl_event.group_id = 0; NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_CTRL_EVENT, &ctrl_event, sizeof(ctrl_event), NULL, 0 ); - } } - else i++; + else + console->records[console->record_count++] = records[i]; } } - console->record_count += count; + else + { + memcpy( console->records + console->record_count, records, count * sizeof(INPUT_RECORD) ); + console->record_count += count; + } return flush ? process_console_input( console ) : STATUS_SUCCESS; } @@ -1768,6 +1766,11 @@ static DWORD WINAPI tty_input( void *param ) switch (ch) { case 3: /* end of text */ + if (console->is_unix && (console->mode & ENABLE_PROCESSED_INPUT)) + { + key_press( console, ch, 'C', LEFT_CTRL_PRESSED ); + break; + } LeaveCriticalSection( &console_section ); goto done; case '\n':

1 0

Zebediah Figura : vkd3d-shader/hlsl: Skip unallocated variables when looking for reservation conflicts.
by Alexandre Julliard 13 Jul '23

13 Jul '23

Module: vkd3d Branch: master Commit: d4b5e79c8b676024c5aee3f8dadbc8eea4c9d9ec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d4b5e79c8b676024c5aee3f8dadbc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 27 13:14:37 2023 -0500 vkd3d-shader/hlsl: Skip unallocated variables when looking for reservation conflicts. --- libs/vkd3d-shader/hlsl_codegen.c | 13 ++++++++++--- tests/hlsl/register-reservations.shader_test | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 8927e291..755bc8fa 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3689,7 +3689,7 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum hlsl_regset regset, - uint32_t index) + uint32_t index, bool allocated_only) { const struct hlsl_ir_var *var; unsigned int start, count; @@ -3703,6 +3703,9 @@ static const struct hlsl_ir_var *get_allocated_object(struct hlsl_ctx *ctx, enum * bound there even if the reserved vars aren't used. */ start = var->reg_reservation.reg_index; count = var->data_type->reg_size[regset]; + + if (!var->regs[regset].allocated && allocated_only) + continue; } else if (var->regs[regset].allocated) { @@ -3743,6 +3746,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset) if (count == 0) continue; + /* The variable was already allocated if it has a reservation. */ if (var->regs[regset].allocated) { const struct hlsl_ir_var *reserved_object, *last_reported = NULL; @@ -3761,7 +3765,10 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset) { index = var->regs[regset].id + i; - reserved_object = get_allocated_object(ctx, regset, index); + /* get_allocated_object() may return "var" itself, but we + * actually want that, otherwise we'll end up reporting the + * same conflict between the same two variables twice. */ + reserved_object = get_allocated_object(ctx, regset, index, true); if (reserved_object && reserved_object != var && reserved_object != last_reported) { hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, @@ -3780,7 +3787,7 @@ static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_regset regset) while (available < count) { - if (get_allocated_object(ctx, regset, index)) + if (get_allocated_object(ctx, regset, index, false)) available = 0; else ++available; diff --git a/tests/hlsl/register-reservations.shader_test b/tests/hlsl/register-reservations.shader_test index d885b209..7e109eca 100644 --- a/tests/hlsl/register-reservations.shader_test +++ b/tests/hlsl/register-reservations.shader_test @@ -144,7 +144,7 @@ draw quad probe all rgba (2.0, 2.0, 2.0, 99.0) -[pixel shader todo] +[pixel shader] Texture2D tex1 : register(t2); Texture2D tex2 : register(t2); @@ -154,5 +154,5 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad probe all rgba (2.0, 2.0, 2.0, 99.0)

1 0

Maxim Karasev : include: Add UNICODE_NULL.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: 062cf6e2f1b943393e9b215010d0e3597ce5f4d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/062cf6e2f1b943393e9b215010d0e3… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Fri Jul 7 18:49:42 2023 +0300 include: Add UNICODE_NULL. --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index f431753e46a..ab14bcc80d5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -871,6 +871,8 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { #define MAXDWORD 0xffffffff #define MAXLONGLONG (((LONGLONG)0x7fffffff << 32) | 0xffffffff) +#define UNICODE_NULL ((WCHAR)0) + #define UNICODE_STRING_MAX_CHARS 32767 #define FIELD_OFFSET(type, field) ((LONG)offsetof(type, field))

1 0

Maxim Karasev : include: Update _SECURITY_INTEGER.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: cecd03130894af60bd00c5de63d91e26b9813df8 URL: https://gitlab.winehq.org/wine/wine/-/commit/cecd03130894af60bd00c5de63d91e… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Fri Jul 7 18:51:40 2023 +0300 include: Update _SECURITY_INTEGER. In Windows it works that way. --- include/sspi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/sspi.h b/include/sspi.h index e2da48cd720..6d7ea5a5ef2 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -69,11 +69,16 @@ typedef SecHandle CtxtHandle; typedef PSecHandle PCtxtHandle; #endif +#if defined(_NTDEF_) || defined(_WINNT_) +typedef LARGE_INTEGER _SECURITY_INTEGER, SECURITY_INTEGER,*PSECURITY_INTEGER; +#else typedef struct _SECURITY_INTEGER { ULONG LowPart; LONG HighPart; } SECURITY_INTEGER, *PSECURITY_INTEGER; +#endif + typedef SECURITY_INTEGER TimeStamp, *PTimeStamp; #ifndef __UNICODE_STRING_DEFINED__

1 0

Maxim Karasev : include: Add missing Kerberos related defines.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: cb33d402bb7fc44a51cd96adfbe740d4b2d7a134 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb33d402bb7fc44a51cd96adfbe740… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Fri Jul 7 18:52:14 2023 +0300 include: Add missing Kerberos related defines. --- include/ntsecapi.h | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index ffaa8028596..2b78156bdfb 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -427,6 +427,40 @@ typedef struct _KERB_TICKET_CACHE_INFO ULONG TicketFlags; } KERB_TICKET_CACHE_INFO, *PKERB_TICKET_CACHE_INFO; +typedef struct _KERB_CRYPTO_KEY +{ + LONG KeyType; + ULONG Length; + PUCHAR Value; +} KERB_CRYPTO_KEY, *PKERB_CRYPTO_KEY; + +typedef struct _KERB_EXTERNAL_NAME +{ + SHORT NameType; + USHORT NameCount; + UNICODE_STRING Names[ANYSIZE_ARRAY]; +} KERB_EXTERNAL_NAME, *PKERB_EXTERNAL_NAME; + +typedef struct _KERB_EXTERNAL_TICKET +{ + PKERB_EXTERNAL_NAME ServiceName; + PKERB_EXTERNAL_NAME TargetName; + PKERB_EXTERNAL_NAME ClientName; + UNICODE_STRING DomainName; + UNICODE_STRING TargetDomainName; + UNICODE_STRING AltTargetDomainName; + KERB_CRYPTO_KEY SessionKey; + ULONG TicketFlags; + ULONG Flags; + LARGE_INTEGER KeyExpirationTime; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewUntil; + LARGE_INTEGER TimeSkew; + ULONG EncodedTicketSize; + PUCHAR EncodedTicket; +} KERB_EXTERNAL_TICKET, *PKERB_EXTERNAL_TICKET; + typedef struct _KERB_QUERY_TKT_CACHE_REQUEST { KERB_PROTOCOL_MESSAGE_TYPE MessageType; @@ -451,6 +485,11 @@ typedef struct _KERB_RETRIEVE_TKT_REQUEST SecHandle CredentialsHandle; } KERB_RETRIEVE_TKT_REQUEST, *PKERB_RETRIEVE_TKT_REQUEST; +typedef struct _KERB_RETRIEVE_TKT_RESPONSE +{ + KERB_EXTERNAL_TICKET Ticket; +} KERB_RETRIEVE_TKT_RESPONSE,*PKERB_RETRIEVE_TKT_RESPONSE; + typedef struct _KERB_PURGE_TKT_CACHE_REQUEST { KERB_PROTOCOL_MESSAGE_TYPE MessageType; @@ -459,6 +498,50 @@ typedef struct _KERB_PURGE_TKT_CACHE_REQUEST UNICODE_STRING RealmName; } KERB_PURGE_TKT_CACHE_REQUEST, *PKERB_PURGE_TKT_CACHE_REQUEST; +#define KERB_ETYPE_NULL 0 +#define KERB_ETYPE_DES_CBC_CRC 1 +#define KERB_ETYPE_DES_CBC_MD4 2 +#define KERB_ETYPE_DES_CBC_MD5 3 +#define KERB_ETYPE_AES128_CTS_HMAC_SHA1_96 17 +#define KERB_ETYPE_AES256_CTS_HMAC_SHA1_96 18 + +#define KERB_ETYPE_RC4_MD4 -128 +#define KERB_ETYPE_RC4_PLAIN2 -129 +#define KERB_ETYPE_RC4_LM -130 +#define KERB_ETYPE_RC4_SHA -131 +#define KERB_ETYPE_DES_PLAIN -132 +#define KERB_ETYPE_RC4_HMAC_OLD -133 +#define KERB_ETYPE_RC4_PLAIN_OLD -134 +#define KERB_ETYPE_RC4_HMAC_OLD_EXP -135 +#define KERB_ETYPE_RC4_PLAIN_OLD_EXP -136 +#define KERB_ETYPE_RC4_PLAIN -140 +#define KERB_ETYPE_RC4_PLAIN_EXP -141 +#define KERB_ETYPE_AES128_CTS_HMAC_SHA1_96_PLAIN -148 +#define KERB_ETYPE_AES256_CTS_HMAC_SHA1_96_PLAIN -149 + +#define KERB_ETYPE_DSA_SHA1_CMS 9 +#define KERB_ETYPE_RSA_MD5_CMS 10 +#define KERB_ETYPE_RSA_SHA1_CMS 11 +#define KERB_ETYPE_RC2_CBC_ENV 12 +#define KERB_ETYPE_RSA_ENV 13 +#define KERB_ETYPE_RSA_ES_OEAP_ENV 14 +#define KERB_ETYPE_DES_EDE3_CBC_ENV 15 + +#define KERB_ETYPE_DSA_SIGN 8 +#define KERB_ETYPE_RSA_PRIV 9 +#define KERB_ETYPE_RSA_PUB 10 +#define KERB_ETYPE_RSA_PUB_MD5 11 +#define KERB_ETYPE_RSA_PUB_SHA1 12 +#define KERB_ETYPE_PKCS7_PUB 13 + +#define KERB_ETYPE_DES3_CBC_MD5 5 +#define KERB_ETYPE_DES3_CBC_SHA1 7 +#define KERB_ETYPE_DES3_CBC_SHA1_KD 16 + +#define KERB_ETYPE_DES_CBC_MD5_NT 20 +#define KERB_ETYPE_RC4_HMAC_NT 23 +#define KERB_ETYPE_RC4_HMAC_NT_EXP 24 + #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041

1 0

Victor Chiletto : msvcr110/tests: Add tests for new setlocale behaviors.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: fbbe8e26be898770e98307ed3a9789ba06b5cff9 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbbe8e26be898770e98307ed3a9789… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Mon Jun 5 19:59:14 2023 -0300 msvcr110/tests: Add tests for new setlocale behaviors. A bunch of locales had changes >= msvcr 110. --- dlls/msvcr110/tests/msvcr110.c | 78 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 255c68b0796..cf76720d806 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -152,6 +152,84 @@ static void test_setlocale(void) ret = p_setlocale(LC_ALL, "en-us.1250"); ok(!ret, "setlocale(en-us.1250) succeeded (%s)\n", ret); + ret = p_setlocale(LC_ALL, "zh-Hans"); + todo_wine ok((ret != NULL + || broken(ret == NULL)), /* Vista */ + "expected success, but got NULL\n"); + if (ret) + ok(!strcmp(ret, "zh-Hans"), "setlocale zh-Hans failed\n"); + + ret = p_setlocale(LC_ALL, "zh-Hant"); + todo_wine ok((ret != NULL + || broken(ret == NULL)), /* Vista */ + "expected success, but got NULL\n"); + if (ret) + ok(!strcmp(ret, "zh-Hant"), "setlocale zh-Hant failed\n"); + + /* used to return Chinese (Simplified)_China.936 */ + ret = p_setlocale(LC_ALL, "chinese"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Chinese_China.936") + || broken(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")) /* Vista */ + || broken(!strcmp(ret, "Chinese_People's Republic of China.936"))), /* 7 */ + "setlocale chinese failed, got %s\n", ret); + + /* used to return Chinese (Simplified)_China.936 */ + ret = p_setlocale(LC_ALL, "Chinese_China.936"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Chinese_China.936") + || broken(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936")) /* Vista */ + || broken(!strcmp(ret, "Chinese_People's Republic of China.936"))), /* 7 */ + "setlocale Chinese_China.936 failed, got %s\n", ret); + + /* used to return Chinese (Simplified)_China.936 */ + ret = p_setlocale(LC_ALL, "chinese-simplified"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Chinese_China.936") + || broken(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936"))), /* Vista */ + "setlocale chinese-simplified failed, got %s\n", ret); + + /* used to return Chinese (Simplified)_China.936 */ + ret = p_setlocale(LC_ALL, "chs"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Chinese_China.936") + || broken(!strcmp(ret, "Chinese (Simplified)_People's Republic of China.936"))), /* Vista */ + "setlocale chs failed, got %s\n", ret); + + /* used to return Chinese (Traditional)_Taiwan.950 */ + ret = p_setlocale(LC_ALL, "cht"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Chinese (Traditional)_Hong Kong SAR.950") + || broken(!strcmp(ret, "Chinese (Traditional)_Taiwan.950"))), /* Vista - 7 */ + "setlocale cht failed, got %s\n", ret); + + /* used to return Chinese (Traditional)_Taiwan.950 */ + ret = p_setlocale(LC_ALL, "chinese-traditional"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Chinese (Traditional)_Hong Kong SAR.950") + || broken(!strcmp(ret, "Chinese (Traditional)_Taiwan.950"))), /* Vista - 7 */ + "setlocale chinese-traditional failed, got %s\n", ret); + + ret = p_setlocale(LC_ALL, "norwegian-nynorsk"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Norwegian Nynorsk_Norway.1252") + || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252"))), /* Vista - 7 */ + "setlocale norwegian-nynorsk failed, got %s\n", ret); + + ret = p_setlocale(LC_ALL, "non"); + ok(ret != NULL, "expected success, but got NULL\n"); + if (ret) + todo_wine ok((!strcmp(ret, "Norwegian Nynorsk_Norway.1252") + || broken(!strcmp(ret, "Norwegian (Nynorsk)_Norway.1252"))), /* Vista - 7 */ + "setlocale norwegian-nynorsk failed, got %s\n", ret); + p_setlocale(LC_ALL, "C"); }

1 0

Victor Chiletto : msvcr120/tests: Check ___lc_locale_name_func with neutral Chinese locales.
by Alexandre Julliard 12 Jul '23

12 Jul '23

Module: wine Branch: master Commit: 969e3626bbcc7bd9ad6bca2d368f0bb67e306786 URL: https://gitlab.winehq.org/wine/wine/-/commit/969e3626bbcc7bd9ad6bca2d368f0b… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed Jun 7 17:46:59 2023 -0300 msvcr120/tests: Check ___lc_locale_name_func with neutral Chinese locales. --- dlls/msvcr120/tests/msvcr120.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e5a5ff0435d..04870632853 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -596,6 +596,14 @@ static void test____lc_locale_name_func(void) } } + p_setlocale(LC_ALL, "zh-Hans"); + lc_names = p____lc_locale_name_func(); + todo_wine ok(!lstrcmpW(lc_names[1], L"zh-Hans"), "lc_names[1] expected zh-Hans got %s\n", wine_dbgstr_w(lc_names[1])); + + p_setlocale(LC_ALL, "zh-Hant"); + lc_names = p____lc_locale_name_func(); + todo_wine ok(!lstrcmpW(lc_names[1], L"zh-Hant"), "lc_names[1] expected zh-Hant got %s\n", wine_dbgstr_w(lc_names[1])); + p_setlocale(LC_ALL, "C"); lc_names = p____lc_locale_name_func(); ok(!lc_names[1], "___lc_locale_name_func()[1] = %s\n", wine_dbgstr_w(lc_names[1]));

1 0