December 2017 - Wine-Commits

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 35e45b9401c6f87ba5bfbba4181f26098d9f0462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e45b9401c6f87ba5bfbba41… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 7 17:08:50 2017 +0200 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 | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9809abe..0c4fa20 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11993,17 +11993,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12019,7 +12008,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, IMPORT, QUERY\n" +" ADD, DELETE, IMPORT, EXPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -12163,22 +12152,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Tuntematon merkintä [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT tiedosto.reg\n" +msgstr "REG EXPORT avaimen_nimi tiedosto.reg\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Järjestelmäavain [%1] ei kelpaa\n" +msgstr "reg: Järjestelmäavain [%1] ei kelpaa\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" +msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" #: regedit.rc:34 msgid "&Registry"

1 0

Andrew Eikum : ntdll: Report NtReadFileScatter results asynchronously.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 52627611359fa74409c67dd4879003a5f410a2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=52627611359fa74409c67dd48… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 6 15:07:45 2017 -0600 ntdll: Report NtReadFileScatter results asynchronously. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 104 ++++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/file.c | 29 ++++++------- 2 files changed, 108 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef2..4980e02 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4347,13 +4347,16 @@ static void test_SetFileValidData(void) static void test_WriteFileGather(void) { char temp_path[MAX_PATH], filename[MAX_PATH]; - HANDLE hfile, hiocp1, hiocp2; - DWORD ret, size; + HANDLE hfile, hiocp1, hiocp2, evt; + DWORD ret, size, tx; ULONG_PTR key; FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; + + evt = CreateEventW( NULL, TRUE, FALSE, NULL ); ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4374,18 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + fse[0].Buffer = wbuf; + memset( wbuf, 0x42, si.dwPageSize ); + SetLastError( 0xdeadbeef ); if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4393,95 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ResetEvent( evt ); + + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + ResetEvent( evt ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + SetLastError( 0xdeadbeef ); + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == FALSE, "GetOverlappedResult should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + } + else + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + + ResetEvent( evt ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + + /* file handle must be overlapped */ + hfile = CreateFileA( filename, GENERIC_READ, 0, 0, OPEN_EXISTING, + FILE_FLAG_NO_BUFFERING | FILE_ATTRIBUTE_NORMAL, 0 ); + ok( hfile != INVALID_HANDLE_VALUE, "CreateFile failed err %u\n", GetLastError() ); + + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "ReadFileScatter failed err %u\n", GetLastError() ); + + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); + CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0..9df15ff 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1086,25 +1086,24 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap send_completion = cvalue != 0; - error: if (needs_close) close( unix_handle ); - if (status == STATUS_SUCCESS) - { - io_status->u.Status = status; - io_status->Information = total; - TRACE("= SUCCESS (%u)\n", total); - if (event) NtSetEvent( event, NULL ); - if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, - (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); - } - else - { - TRACE("= 0x%08x\n", status); - if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); - } + io_status->u.Status = status; + io_status->Information = total; + TRACE("= 0x%08x (%u)\n", status, total); + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); + return STATUS_PENDING; + +error: + if (needs_close) close( unix_handle ); + + TRACE("= 0x%08x\n", status); + if (event) NtResetEvent( event, NULL ); + return status; }

1 0

Jacek Caban : bcrypt: Added support for MD4 hashes.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: e73d4e55a9f5337bf5673339aaf301b64afd060a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e73d4e55a9f5337bf5673339a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:58 2017 +0100 bcrypt: Added support for MD4 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 11 +++++++++++ dlls/bcrypt/bcrypt_main.c | 17 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++++++ include/bcrypt.h | 1 + 4 files changed, 35 insertions(+) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index c58ede8..a75f92a 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -61,6 +61,17 @@ void md2_update(MD2_CTX *ctx, const unsigned char *buf, ULONG len) DECLSPEC_HIDD void md2_finalize(MD2_CTX *ctx, unsigned char *hash) DECLSPEC_HIDDEN; /* Definitions from advapi32 */ +typedef struct tagMD4_CTX { + unsigned int buf[4]; + unsigned int i[2]; + unsigned char in[64]; + unsigned char digest[16]; +} MD4_CTX; + +VOID WINAPI MD4Init(MD4_CTX *ctx); +VOID WINAPI MD4Update(MD4_CTX *ctx, const unsigned char *buf, unsigned int len); +VOID WINAPI MD4Final(MD4_CTX *ctx); + typedef struct { unsigned int i[2]; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b202184..931db2b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -146,6 +146,7 @@ enum alg_id { ALG_ID_AES, ALG_ID_MD2, + ALG_ID_MD4, ALG_ID_MD5, ALG_ID_RNG, ALG_ID_SHA1, @@ -165,6 +166,7 @@ static const struct { } alg_props[] = { /* ALG_ID_AES */ { 654, 0, 0, BCRYPT_AES_ALGORITHM }, /* ALG_ID_MD2 */ { 270, 16, 128, BCRYPT_MD2_ALGORITHM }, + /* ALG_ID_MD4 */ { 270, 16, 512, BCRYPT_MD4_ALGORITHM }, /* ALG_ID_MD5 */ { 274, 16, 512, BCRYPT_MD5_ALGORITHM }, /* ALG_ID_RNG */ { 0, 0, 0, BCRYPT_RNG_ALGORITHM }, /* ALG_ID_SHA1 */ { 278, 20, 512, BCRYPT_SHA1_ALGORITHM }, @@ -238,6 +240,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR if (!strcmpW( id, BCRYPT_AES_ALGORITHM )) alg_id = ALG_ID_AES; else if (!strcmpW( id, BCRYPT_MD2_ALGORITHM )) alg_id = ALG_ID_MD2; + else if (!strcmpW( id, BCRYPT_MD4_ALGORITHM )) alg_id = ALG_ID_MD4; else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_RNG_ALGORITHM )) alg_id = ALG_ID_RNG; else if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; @@ -291,6 +294,7 @@ struct hash_impl union { MD2_CTX md2; + MD4_CTX md4; MD5_CTX md5; SHA_CTX sha1; SHA256_CTX sha256; @@ -306,6 +310,10 @@ static NTSTATUS hash_init( struct hash_impl *hash, enum alg_id alg_id ) md2_init( &hash->u.md2 ); break; + case ALG_ID_MD4: + MD4Init( &hash->u.md4 ); + break; + case ALG_ID_MD5: MD5Init( &hash->u.md5 ); break; @@ -342,6 +350,10 @@ static NTSTATUS hash_update( struct hash_impl *hash, enum alg_id alg_id, md2_update( &hash->u.md2, input, size ); break; + case ALG_ID_MD4: + MD4Update( &hash->u.md4, input, size ); + break; + case ALG_ID_MD5: MD5Update( &hash->u.md5, input, size ); break; @@ -378,6 +390,11 @@ static NTSTATUS hash_finish( struct hash_impl *hash, enum alg_id alg_id, md2_finalize( &hash->u.md2, output ); break; + case ALG_ID_MD4: + MD4Final( &hash->u.md4 ); + memcpy( output, hash->u.md4.digest, 16 ); + break; + case ALG_ID_MD5: MD5Final( &hash->u.md5 ); memcpy( output, hash->u.md5.digest, 16 ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index de04190..6fa04b0 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -329,6 +329,12 @@ static void test_hashes(void) "7f05b0638d77f4a27f3a9c4d353cd648" }, { + "MD4", + 16, + "74b5db93c0b41e36ca7074338fc0b637", + "bc2e8ac4d8248ed21b8d26227a30ea3a" + }, + { "MD5", 16, "e2a3e68d23ce348b8f68b3079de3d4c9", diff --git a/include/bcrypt.h b/include/bcrypt.h index 70928c5..7c3c8d0 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -65,6 +65,7 @@ typedef LONG NTSTATUS; #define BCRYPT_AES_ALGORITHM (const WCHAR []){'A','E','S',0} #define BCRYPT_MD2_ALGORITHM (const WCHAR []){'M','D','2',0} +#define BCRYPT_MD4_ALGORITHM (const WCHAR []){'M','D','4',0} #define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_RNG_ALGORITHM (const WCHAR []){'R','N','G',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0}

1 0

Józef Kucia : wined3d: Do not call wined3d_from_cs() in shader_resource_view_generate_mipmaps().
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 0879b1730e584337fdedc38b3fb1b191e5af9c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0879b1730e584337fdedc38b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:39:56 2017 +0100 wined3d: Do not call wined3d_from_cs() in shader_resource_view_generate_mipmaps(). The context_acquire() function does that. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4463fab..a8651ab 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -833,8 +833,6 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * TRACE("view %p.\n", view); - wined3d_from_cs(view->resource->device->cs); - context = context_acquire(view->resource->device, NULL, 0); gl_info = context->gl_info; layer_count = view->desc.u.texture.layer_count;

1 0

Józef Kucia : ddraw: Set depth test state while resetting device.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 46fa862dc47cbd0ca40b29ab2ee63f63f612c62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fa862dc47cbd0ca40b29ab2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:23 2017 +0100 ddraw: Set depth test state while resetting device. wined3d will not do this anymore. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 394e915..26d83cd 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6002,6 +6002,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return hr_ddraw_from_wined3d(hr); } + + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, + !!swapchain_desc.enable_auto_depth_stencil); } }

1 0

Józef Kucia : wined3d: Fix relative addressing for SM4+ vertex shader inputs.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 72ecfb0ae41c5e27e9eed433d43f48d90fd616d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ecfb0ae41c5e27e9eed433d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 7 12:14:18 2017 +0100 wined3d: Fix relative addressing for SM4+ vertex shader inputs. Relative addressing doesn't necessarily work for SM3. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 - dlls/wined3d/glsl_shader.c | 24 +++++++++++++++++++++--- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 96b3b05..7d317dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12339,7 +12339,6 @@ static void test_vs_input_relative_addressing(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, index, 0, 0); ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); draw_quad(&test_context); - todo_wine_if(i > 0) check_texture_color(test_context.backbuffer, colors[i], 1); } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 18822c5..32a75bf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2854,10 +2854,18 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; if (reg->idx[0].rel_addr) - FIXME("VS3+ input registers relative addressing.\n"); + FIXME("VS3 input registers relative addressing.\n"); if (priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) *is_color = TRUE; - sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); + if (reg->idx[0].rel_addr) + { + sprintf(register_name, "%s_in[%s + %u]", + prefix, rel_param0.param_str, reg->idx[0].offset); + } + else + { + sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); + } break; } @@ -7850,7 +7858,17 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "void main()\n{\n"); - /* Base Shader Body */ + if (reg_maps->input_rel_addressing) + { + unsigned int highest_input_register = wined3d_log2i(reg_maps->input_registers); + shader_addline(buffer, "vec4 vs_in[%u];\n", highest_input_register + 1); + for (i = 0; i < shader->input_signature.element_count; ++i) + { + const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; + shader_addline(buffer, "vs_in[%u] = vs_in%u;\n", e->register_idx, e->register_idx); + } + } + if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, NULL, NULL))) return 0; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d976573..04ced90 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -709,6 +709,8 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w break; case WINED3DSPR_INPUT: + if (reg->idx[0].rel_addr) + reg_maps->input_rel_addressing = 1; if (shader_type == WINED3D_SHADER_TYPE_PIXEL) { /* If relative addressing is used, we must assume that all @@ -721,7 +723,9 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w shader->u.ps.input_reg_used |= 1u << reg->idx[0].offset; } else + { reg_maps->input_registers |= 1u << reg->idx[0].offset; + } break; case WINED3DSPR_RASTOUT: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a79a68f..3c6a347 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1024,7 +1024,8 @@ struct wined3d_shader_reg_maps DWORD usespow : 1; DWORD point_size : 1; DWORD vocp : 1; - DWORD padding : 17; + DWORD input_rel_addressing : 1; + DWORD padding : 16; DWORD rt_mask; /* Used render targets, 32 max. */

1 0

Austin English : loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: f1512cf25f0c8ef3df192bc1980d047cfa650059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1512cf25f0c8ef3df192bc19… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 6 17:35:49 2017 -0600 loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https. Missed in 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.pl.UTF-8.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 9f1f2cf..c487d0a 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -305,7 +305,7 @@ można pobrać ze strony Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/git +https://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine

1 0

Andrew Eikum : ntdll: Don't require full-page reads in NtReadFileScatter.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: f87a2f0e4cd4d36f3a218ac499d7a8f1933335a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87a2f0e4cd4d36f3a218ac49… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 6 15:08:00 2017 -0600 ntdll: Don't require full-page reads in NtReadFileScatter. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 94feee6..410c3f0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4492,6 +4492,34 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + ResetEvent( evt ); + + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize / 2, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d4a949..570e46c 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) {

1 0

Andrew Eikum : ntdll: Don' t return an error when reading past EOF in NtReadFileScatter.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 64edbfa6fe3f27de8519a5548f996ca2c6319ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64edbfa6fe3f27de8519a5548… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 6 15:07:54 2017 -0600 ntdll: Don't return an error when reading past EOF in NtReadFileScatter. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 34 +++++++++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4980e02..94feee6 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4380,6 +4380,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); @@ -4461,6 +4464,34 @@ static void test_WriteFileGather(void) ResetEvent( evt ); + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); @@ -4481,6 +4512,7 @@ static void test_WriteFileGather(void) VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9df15ff..3d4a949 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; if (needs_close) close( unix_handle );

1 0

Jacek Caban : rsaenh: Use bcrypt for MD2 hashes.
by Alexandre Julliard Dec. 7, 2017

Dec. 7, 2017

Module: wine Branch: master Commit: 8009091f111523dfc04c8acdb29787ce07ba5d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8009091f111523dfc04c8acdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 7 19:46:33 2017 +0100 rsaenh: Use bcrypt for MD2 hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/implglue.c | 13 +---- dlls/rsaenh/implglue.h | 1 - dlls/rsaenh/md2.c | 151 ------------------------------------------------ dlls/rsaenh/tomcrypt.h | 9 --- 5 files changed, 2 insertions(+), 173 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index c9cb007..9997752 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ des.c \ handle.c \ implglue.c \ - md2.c \ mpi.c \ rc2.c \ rc4.c \ diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 1dfc896..58fd727 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -56,8 +56,8 @@ BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) switch (aiAlgid) { case CALG_MD2: - md2_init(&pHashContext->md2); - return TRUE; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_MD2_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + break; case CALG_MD4: MD4Init(&pHashContext->md4); @@ -99,10 +99,6 @@ BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pb { switch (aiAlgid) { - case CALG_MD2: - md2_process(&pHashContext->md2, pbData, dwDataLen); - break; - case CALG_MD4: MD4Update(&pHashContext->md4, pbData, dwDataLen); break; @@ -126,10 +122,6 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash { switch (aiAlgid) { - case CALG_MD2: - md2_done(&pHashContext->md2, pbHashValue); - break; - case CALG_MD4: MD4Final(&pHashContext->md4); memcpy(pbHashValue, pHashContext->md4.digest, 16); @@ -158,7 +150,6 @@ BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, { switch (aiAlgid) { - case CALG_MD2: case CALG_MD4: case CALG_MD5: case CALG_SHA: diff --git a/dlls/rsaenh/implglue.h b/dlls/rsaenh/implglue.h index 5353810a..446f843 100644 --- a/dlls/rsaenh/implglue.h +++ b/dlls/rsaenh/implglue.h @@ -56,7 +56,6 @@ typedef struct tagSHA_CTX } SHA_CTX, *PSHA_CTX; typedef union tagHASH_CONTEXT { - md2_state md2; MD4_CTX md4; MD5_CTX md5; SHA_CTX sha; diff --git a/dlls/rsaenh/md2.c b/dlls/rsaenh/md2.c deleted file mode 100644 index 187d114..0000000 --- a/dlls/rsaenh/md2.c +++ /dev/null @@ -1,151 +0,0 @@ -/* - * dlls/rsaenh/md2.c - * MD2 (RFC 1319) hash function implementation by Tom St Denis - * - * Copyright 2004 Michael Jung - * Based on public domain code by Tom St Denis (tomstdenis(a)iahu.ca) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* - * This file contains code from the LibTomCrypt cryptographic - * library written by Tom St Denis (tomstdenis(a)iahu.ca). LibTomCrypt - * is in the public domain. The code in this file is tailored to - * special requirements. Take a look at http://libtomcrypt.org for the - * original version. - */ - -#include "tomcrypt.h" - -static const unsigned char PI_SUBST[256] = { - 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, - 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, - 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, - 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, - 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, - 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, - 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, - 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, - 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, - 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, - 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, - 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, - 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, - 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, - 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, - 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, - 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, - 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 -}; - -/* adds 16 bytes to the checksum */ -static void md2_update_chksum(md2_state *md2) -{ - int j; - unsigned char L; - L = md2->chksum[15]; - for (j = 0; j < 16; j++) { - -/* caution, the RFC says its "C[j] = S[M[i*16+j] xor L]" but the reference source code [and test vectors] say - otherwise. -*/ - L = (md2->chksum[j] ^= PI_SUBST[(int)(md2->buf[j] ^ L)] & 255); - } -} - -static void md2_compress(md2_state *md2) -{ - int j, k; - unsigned char t; - - /* copy block */ - for (j = 0; j < 16; j++) { - md2->X[16+j] = md2->buf[j]; - md2->X[32+j] = md2->X[j] ^ md2->X[16+j]; - } - - t = 0; - - /* do 18 rounds */ - for (j = 0; j < 18; j++) { - for (k = 0; k < 48; k++) { - t = (md2->X[k] ^= PI_SUBST[(int)(t & 255)]); - } - t = (t + (unsigned char)j) & 255; - } -} - -int md2_init(md2_state *md2) -{ - /* MD2 uses a zero'ed state... */ - memset(md2->X, 0, sizeof(md2->X)); - memset(md2->chksum, 0, sizeof(md2->chksum)); - memset(md2->buf, 0, sizeof(md2->buf)); - md2->curlen = 0; - return CRYPT_OK; -} - -int md2_process(md2_state *md2, const unsigned char *buf, unsigned long len) -{ - unsigned long n; - - if (md2->curlen > sizeof(md2->buf)) { - return CRYPT_INVALID_ARG; - } - while (len > 0) { - n = MIN(len, (16 - md2->curlen)); - memcpy(md2->buf + md2->curlen, buf, (size_t)n); - md2->curlen += n; - buf += n; - len -= n; - - /* is 16 bytes full? */ - if (md2->curlen == 16) { - md2_compress(md2); - md2_update_chksum(md2); - md2->curlen = 0; - } - } - return CRYPT_OK; -} - -int md2_done(md2_state * md2, unsigned char *hash) -{ - unsigned long i, k; - - if (md2->curlen >= sizeof(md2->buf)) { - return CRYPT_INVALID_ARG; - } - - /* pad the message */ - k = 16 - md2->curlen; - for (i = md2->curlen; i < 16; i++) { - md2->buf[i] = (unsigned char)k; - } - - /* hash and update */ - md2_compress(md2); - md2_update_chksum(md2); - - /* hash checksum */ - memcpy(md2->buf, md2->chksum, 16); - md2_compress(md2); - - /* output is lower 16 bytes of X */ - memcpy(hash, md2->X, 16); - - return CRYPT_OK; -} diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index 49fb352..3e1db9a 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -150,15 +150,6 @@ int aes_setup(const unsigned char *key, int keylen, int rounds, aes_key *skey); void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_key *skey); void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_key *skey); -typedef struct tag_md2_state { - unsigned char chksum[16], X[48], buf[16]; - unsigned long curlen; -} md2_state; - -int md2_init(md2_state * md); -int md2_process(md2_state * md, const unsigned char *buf, unsigned long len); -int md2_done(md2_state * md, unsigned char *hash); - struct rc4_prng { int x, y; unsigned char buf[256];

1 0