February 2019 - Wine-commits

Alistair Leslie-Hughes : oleaut32: Support VT_DECIMAL in VarRound.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 0c738d900a8daccf2c5460972033766d34d59aed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c738d900a8daccf2c546097… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 14 03:39:57 2019 +0000 oleaut32: Support VT_DECIMAL in VarRound. Based on a patch by Carlos Chiriboga Calderon. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26653 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 62b4852..0b1ac0f 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -3630,7 +3630,8 @@ static const struct decimal_round_t decimal_round_data[] = { {{ 2, 0, 0, 0, 199 }, { 2, 0, 0, 0, 199 }, 2}, {{ 2, DECIMAL_NEG, 0, 0, 199 }, { 2, DECIMAL_NEG, 0, 0, 199 }, 2}, {{ 2, DECIMAL_NEG, 0, 0, 55 }, { 2, DECIMAL_NEG, 0, 0, 6 }, 1}, - {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1} + {{ 2, 0, 0, 0, 55 }, { 2, 0, 0, 0, 6 }, 1}, + {{ 2, 0, 0, 0, 1999 }, { 1, 0, 0, 0, 200 }, 1}, }; static void test_VarRound(void) @@ -3733,7 +3734,6 @@ static void test_VarRound(void) S1(U1(*pdec)).Lo32 = ptr->source.Lo32; VariantInit(&vDst); hres = pVarRound(&v, ptr->dec, &vDst); - todo_wine ok(hres == S_OK, "%d: got 0x%08x\n", i, hres); if (hres == S_OK) { diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8781f3e..fcbef53 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5134,7 +5134,21 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) } V_VT(pVarOut) = V_VT(pVarIn); break; + case VT_DECIMAL: + { + double dbl; + VarR8FromDec(&V_DECIMAL(pVarIn), &dbl); + + if (dbl>0.0f) + dbl = floor(dbl*pow(10,deci)+0.5); + else + dbl = ceil(dbl*pow(10,deci)-0.5); + + V_VT(pVarOut)=VT_DECIMAL; + VarDecFromR8(dbl, &V_DECIMAL(pVarOut)); + break; + } /* cases we don't know yet */ default: FIXME("unimplemented part, V_VT(pVarIn) == 0x%X, deci == %d\n",

1 0

Vijay Kiran Kamuju : crypt32: Add CMSG_SIGNER_UNAUTH_ATTR_PARAM implementation.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 0d0906b56d5ffec3a6ae57570860f00dc5e053cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d0906b56d5ffec3a6ae5757… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Feb 13 05:56:20 2019 +0100 crypt32: Add CMSG_SIGNER_UNAUTH_ATTR_PARAM implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37837 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/msg.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4132390..ea96248 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -2999,6 +2999,37 @@ static BOOL CDecodeEnvelopedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, return ret; } +static BOOL CRYPT_CopyUnauthAttr(void *pvData, DWORD *pcbData, + const CMSG_CMS_SIGNER_INFO *in) +{ + DWORD size; + BOOL ret; + + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + + size = CRYPT_SizeOfAttributes(&in->UnauthAttrs); + if (!pvData) + { + *pcbData = size; + ret = TRUE; + } + else if (*pcbData < size) + { + *pcbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + CRYPT_ATTRIBUTES *out = pvData; + + CRYPT_ConstructAttributes(out,&in->UnauthAttrs); + ret = TRUE; + } + TRACE("returning %d\n", ret); + return ret; +} + static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { @@ -3172,6 +3203,18 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_SIGNER_UNAUTH_ATTR_PARAM: + if (msg->u.signed_data.info) + { + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CRYPT_CopyUnauthAttr(pvData, pcbData, + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); + } + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; default: FIXME("unimplemented for %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE);

1 0

Daniel Lehman : kernel32/tests: Add tests for SpecialCasing.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 8acdd597d03100aefddee42abbe55461c0a0f4b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8acdd597d03100aefddee42a… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Feb 13 18:39:48 2019 -0800 kernel32/tests: Add tests for SpecialCasing. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 186 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8acdd597d03100aefdde…

1 0

Paul Gofman : kernel32/tests: Add test for overlapped file read.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 3117370acceeb2606d0f6dde420a735fa6854a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3117370acceeb2606d0f6dde… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:37 2019 +0300 kernel32/tests: Add test for overlapped file read. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b47b2b9..c9c2dd2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5140,6 +5140,70 @@ static void test_post_completion(void) CloseHandle( port ); } +#define TEST_OVERLAPPED_READ_SIZE 4096 + +static void test_overlapped_read(void) +{ + DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char buffer[TEST_OVERLAPPED_READ_SIZE]; + static const char prefix[] = "pfx"; + char temp_path[MAX_PATH]; + char file_name[MAX_PATH]; + DWORD bytes_count; + OVERLAPPED ov; + HANDLE hfile; + DWORD err; + DWORD ret; + + ret = GetTempPathA(MAX_PATH, temp_path); + ok(ret, "Unexpect error %u.\n", GetLastError()); + ret = GetTempFileNameA(temp_path, prefix, 0, file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); + + hfile = CreateFileA(file_name, GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + memset(buffer, 0x55, sizeof(buffer)); + ret = WriteFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, NULL); + ok(ret && bytes_count == TEST_OVERLAPPED_READ_SIZE, + "Unexpected WriteFile result, ret %#x, bytes_count %u, GetLastError() %u.\n", + ret, bytes_count, GetLastError()); + CloseHandle(hfile); + + hfile = CreateFileA(file_name, GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Failed to create file, GetLastError() %u.\n", GetLastError()); + + memset(&ov, 0, sizeof(ov)); + + bytes_count = 0xffffffff; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + todo_wine ok(!ret && GetLastError() == ERROR_IO_PENDING, + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + todo_wine ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(ret, "Unexpected error %u.\n", GetLastError()); + ok(bytes_count == TEST_OVERLAPPED_READ_SIZE, "Unexpected read size %u.\n", bytes_count); + + S(U(ov)).Offset = bytes_count; + ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); + err = GetLastError(); + /* Win8+ return ERROR_IO_PENDING like stated in MSDN, while older ones + * return ERROR_HANDLE_EOF right away. */ + ok(!ret && (err == ERROR_HANDLE_EOF || err == ERROR_IO_PENDING), + "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); + if (err == ERROR_IO_PENDING) + { + ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); + ok(!ret && GetLastError() == ERROR_HANDLE_EOF, "Unexpected result %#x, GetLasttError() %u.\n", + ret, GetLastError()); + } + ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + + CloseHandle(hfile); + ret = DeleteFileA(file_name); + ok(ret, "Unexpected error %u.\n", GetLastError()); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5209,4 +5273,5 @@ START_TEST(file) test_SetFileInformationByHandle(); test_GetFileAttributesExW(); test_post_completion(); + test_overlapped_read(); }

1 0

Paul Gofman : ntdll/tests: Add more tests for overlapped file read.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 9dc63ca9813b9aec1384160afb19a8be9061d9ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dc63ca9813b9aec1384160a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:38 2019 +0300 ntdll/tests: Add more tests for overlapped file read. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8391570..7b35569 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -598,8 +598,11 @@ static void delete_file_test(void) pRtlFreeUnicodeString( &nameW ); } +#define TEST_OVERLAPPED_READ_SIZE 4096 + static void read_file_test(void) { + DECLSPEC_ALIGN(TEST_OVERLAPPED_READ_SIZE) static unsigned char aligned_buffer[TEST_OVERLAPPED_READ_SIZE]; const char text[] = "foobar"; HANDLE handle; IO_STATUS_BLOCK iosb; @@ -711,7 +714,45 @@ static void read_file_test(void) CloseHandle( handle ); - CloseHandle( event ); + if (!(handle = create_temp_file(FILE_FLAG_OVERLAPPED | FILE_FLAG_NO_BUFFERING))) + return; + + apc_count = 0; + offset.QuadPart = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + offset.QuadPart = 0; + ResetEvent(event); + status = pNtWriteFile(handle, event, apc, &apc_count, &iosb, + aligned_buffer, sizeof(aligned_buffer), &offset, NULL); + ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || status == STATUS_SUCCESS, + "Wrong status %x.\n", status); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + ok(is_signaled(event), "event is not signaled.\n"); + ok(!apc_count, "apc was called.\n"); + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called.\n"); + + apc_count = 0; + offset.QuadPart = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + offset.QuadPart = 0; + ResetEvent(event); + status = pNtReadFile(handle, event, apc, &apc_count, &iosb, + aligned_buffer, sizeof(aligned_buffer), &offset, NULL); + todo_wine ok(status == STATUS_PENDING, "Wrong status %x.\n", status); + WaitForSingleObject(event, 1000); + ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); + ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); + ok(is_signaled(event), "event is not signaled.\n"); + ok(!apc_count, "apc was called.\n"); + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called.\n"); + + CloseHandle(handle); + CloseHandle(event); } static void append_file_test(void)

1 0

Paul Gofman : ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of no buffering.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 7ce2a8e0ae3d107f7dbeeeebb4b1189d34d27827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce2a8e0ae3d107f7dbeeeeb… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 15 20:41:39 2019 +0300 ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of no buffering. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31954 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 4 ++-- dlls/ntdll/file.c | 3 ++- dlls/ntdll/tests/file.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c9c2dd2..18cd18d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5177,9 +5177,9 @@ static void test_overlapped_read(void) bytes_count = 0xffffffff; ret = ReadFile(hfile, buffer, TEST_OVERLAPPED_READ_SIZE, &bytes_count, &ov); - todo_wine ok(!ret && GetLastError() == ERROR_IO_PENDING, + ok(!ret && GetLastError() == ERROR_IO_PENDING, "Unexpected ReadFile result, ret %#x, GetLastError() %u.\n", ret, GetLastError()); - todo_wine ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); + ok(!bytes_count, "Unexpected read size %u.\n", bytes_count); ret = GetOverlappedResult(hfile, &ov, &bytes_count, TRUE); ok(ret, "Unexpected error %u.\n", GetLastError()); ok(bytes_count == TEST_OVERLAPPED_READ_SIZE, "Unexpected read size %u.\n", bytes_count); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a43fe71..1cf3ae2 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1014,7 +1014,8 @@ err: } if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total ); - + if (async_read && (options & FILE_NO_INTERMEDIATE_BUFFERING) && status == STATUS_SUCCESS) + return STATUS_PENDING; return status; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7b35569..e210a6e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -742,7 +742,7 @@ static void read_file_test(void) ResetEvent(event); status = pNtReadFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - todo_wine ok(status == STATUS_PENDING, "Wrong status %x.\n", status); + ok(status == STATUS_PENDING, "Wrong status %x.\n", status); WaitForSingleObject(event, 1000); ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information);

1 0

Michael Stefaniuc : winmm/tests: Floating point numeric constants are by default doubles.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 0388828edf1891af68985f1cc2e786917ec5608c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0388828edf1891af68985f1c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Feb 18 21:14:03 2019 +0100 winmm/tests: Floating point numeric constants are by default doubles. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index c106594..9c114c8 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -102,11 +102,11 @@ static char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size) for (i=0;i<nb_samples;i++) { double y=sin(440.0*2*PI*i/wfx->nSamplesPerSec); if (wfx->wBitsPerSample==8) { - unsigned char sample=(unsigned char)((double)127.5*(y+1.0)); + unsigned char sample=(unsigned char)(127.5*(y+1.0)); for (j = 0; j < wfx->nChannels; j++) *b++=sample; } else if (wfx->wBitsPerSample==16) { - signed short sample=(signed short)((double)32767.5*y-0.5); + signed short sample=(signed short)(32767.5*y-0.5); for (j = 0; j < wfx->nChannels; j++) { b[0]=sample & 0xff; b[1]=sample >> 8;

1 0

Andrey Gusev : ext-ms-win-gdi-draw-l1-1-0: Add dll.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: c62db16787d62cf38af79aee8646ee18b902f737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c62db16787d62cf38af79aee… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:50 2019 +0200 ext-ms-win-gdi-draw-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-draw-l1-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 23 insertions(+) diff --git a/configure b/configure index f3739a4..2161c57 100755 --- a/configure +++ b/configure @@ -1266,6 +1266,7 @@ enable_ext_ms_win_gdi_dc_create_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +enable_ext_ms_win_gdi_draw_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 @@ -19569,6 +19570,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-0 enable_ext_ms_win_g wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-0 enable_ext_ms_win_gdi_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 diff --git a/configure.ac b/configure.ac index f7eb42b..300c4e2 100644 --- a/configure.ac +++ b/configure.ac @@ -3304,6 +3304,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000..1a0efdf --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-draw-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec new file mode 100644 index 0000000..6f1f587 --- /dev/null +++ b/dlls/ext-ms-win-gdi-draw-l1-1-0/ext-ms-win-gdi-draw-l1-1-0.spec @@ -0,0 +1,18 @@ +@ stdcall BitBlt(long long long long long long long long long) gdi32.BitBlt +@ stdcall CreateBitmap(long long long long ptr) gdi32.CreateBitmap +@ stdcall CreateCompatibleBitmap(long long long) gdi32.CreateCompatibleBitmap +@ stdcall CreateDIBSection(long ptr long ptr long long) gdi32.CreateDIBSection +@ stdcall CreateSolidBrush(long) gdi32.CreateSolidBrush +@ stdcall GdiFlush() gdi32.GdiFlush +@ stdcall GetBitmapBits(long long ptr) gdi32.GetBitmapBits +@ stdcall GetDIBits(long long long long ptr ptr long) gdi32.GetDIBits +@ stdcall GetWorldTransform(long ptr) gdi32.GetWorldTransform +@ stdcall LineTo(long long long) gdi32.LineTo +@ stdcall MoveToEx(long long long ptr) gdi32.MoveToEx +@ stdcall PolyBezierTo(long ptr long) gdi32.PolyBezierTo +@ stdcall SetDIBits(long long long long ptr ptr long) gdi32.SetDIBits +@ stdcall SetGraphicsMode(long long) gdi32.SetGraphicsMode +@ stdcall SetLayout(long long) gdi32.SetLayout +@ stdcall SetWorldTransform(long ptr) gdi32.SetWorldTransform +@ stdcall StretchBlt(long long long long long long long long long long long) gdi32.StretchBlt +@ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) gdi32.StretchDIBits diff --git a/tools/make_specfiles b/tools/make_specfiles index d93723d..c00f3bf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -435,6 +435,7 @@ my @dll_groups = "ext-ms-win-gdi-dc-create-l1-1-1", "ext-ms-win-gdi-dc-l1-2-0", "ext-ms-win-gdi-devcaps-l1-1-0", + "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0",

1 0

Andrey Gusev : ext-ms-win-ntuser-gui-l1-1-0: Add dll.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 2764f8c12bc8873bca0b1ed5fd598ea94cc6249e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2764f8c12bc8873bca0b1ed5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:51 2019 +0200 ext-ms-win-ntuser-gui-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in | 1 + .../ext-ms-win-ntuser-gui-l1-1-0.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index 2161c57..2217ebd 100755 --- a/configure +++ b/configure @@ -1272,6 +1272,7 @@ enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 enable_ext_ms_win_ntuser_draw_l1_1_0 +enable_ext_ms_win_ntuser_gui_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 @@ -19576,6 +19577,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_ wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntuser_draw_l1_1_0 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-1-0 enable_ext_ms_win_ntuser_gui_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 diff --git a/configure.ac b/configure.ac index 300c4e2..6c6e708 100644 --- a/configure.ac +++ b/configure.ac @@ -3310,6 +3310,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in new file mode 100644 index 0000000..919be10 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-gui-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-gui-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-gui-l1-1-0/ext-ms-win-ntuser-gui-l1-1-0.spec b/dlls/ext-ms-win-ntuser-gui-l1-1-0/ext-ms-win-ntuser-gui-l1-1-0.spec new file mode 100644 index 0000000..212f509 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-gui-l1-1-0/ext-ms-win-ntuser-gui-l1-1-0.spec @@ -0,0 +1,16 @@ +@ stdcall ClientToScreen(long ptr) user32.ClientToScreen +@ stdcall DestroyCursor(long) user32.DestroyCursor +@ stdcall DestroyIcon(long) user32.DestroyIcon +@ stdcall DrawIconEx(long long long long long long long long long) user32.DrawIconEx +@ stdcall FillRect(long ptr long) user32.FillRect +@ stdcall GetCursor() user32.GetCursor +@ stdcall GetCursorInfo(ptr) user32.GetCursorInfo +@ stdcall GetIconInfo(long ptr) user32.GetIconInfo +@ stdcall LoadCursorW(long wstr) user32.LoadCursorW +@ stdcall LoadIconA(long str) user32.LoadIconA +@ stdcall LoadIconW(long wstr) user32.LoadIconW +@ stdcall LoadImageA(long str long long long long) user32.LoadImageA +@ stdcall LoadImageW(long wstr long long long long) user32.LoadImageW +@ stdcall MapWindowPoints(long long ptr long) user32.MapWindowPoints +@ stdcall ScreenToClient(long ptr) user32.ScreenToClient +@ stdcall SetCursor(long) user32.SetCursor diff --git a/tools/make_specfiles b/tools/make_specfiles index c00f3bf..9fe4dd1 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -377,6 +377,7 @@ my @dll_groups = "api-ms-win-rtcore-ntuser-wmpointer-l1-1-0", "api-ms-win-rtcore-ntuser-wmpointer-l1-1-3", "ext-ms-win-ntuser-draw-l1-1-0", + "ext-ms-win-ntuser-gui-l1-1-0", "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1",

1 0

Andrey Gusev : ext-ms-win-gdi-font-l1-1-0: Add dll.
by Alexandre Julliard 19 Feb '19

19 Feb '19

Module: wine Branch: master Commit: 5de4a5bc2ff0001680521863ef0c3200137bee04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5de4a5bc2ff0001680521863… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 19 14:29:52 2019 +0200 ext-ms-win-gdi-font-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in | 1 + .../ext-ms-win-gdi-font-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 1 + 5 files changed, 17 insertions(+) diff --git a/configure b/configure index 2217ebd..9f9f438 100755 --- a/configure +++ b/configure @@ -1268,6 +1268,7 @@ enable_ext_ms_win_gdi_dc_l1_2_0 enable_ext_ms_win_gdi_devcaps_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_0 enable_ext_ms_win_gdi_draw_l1_1_1 +enable_ext_ms_win_gdi_font_l1_1_0 enable_ext_ms_win_gdi_render_l1_1_0 enable_ext_ms_win_kernel32_package_current_l1_1_0 enable_ext_ms_win_kernel32_package_l1_1_1 @@ -19573,6 +19574,7 @@ wine_fn_config_makefile dlls/ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l wine_fn_config_makefile dlls/ext-ms-win-gdi-devcaps-l1-1-0 enable_ext_ms_win_gdi_devcaps_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-0 enable_ext_ms_win_gdi_draw_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-draw-l1-1-1 enable_ext_ms_win_gdi_draw_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-gdi-font-l1-1-0 enable_ext_ms_win_gdi_font_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-gdi-render-l1-1-0 enable_ext_ms_win_gdi_render_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-current-l1-1-0 enable_ext_ms_win_kernel32_package_current_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-kernel32-package-l1-1-1 enable_ext_ms_win_kernel32_package_l1_1_1 diff --git a/configure.ac b/configure.ac index 6c6e708..f8cce37 100644 --- a/configure.ac +++ b/configure.ac @@ -3306,6 +3306,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-devcaps-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-draw-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-font-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) diff --git a/dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in b/dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in new file mode 100644 index 0000000..2361294 --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-gdi-font-l1-1-0.dll diff --git a/dlls/ext-ms-win-gdi-font-l1-1-0/ext-ms-win-gdi-font-l1-1-0.spec b/dlls/ext-ms-win-gdi-font-l1-1-0/ext-ms-win-gdi-font-l1-1-0.spec new file mode 100644 index 0000000..8b7c518 --- /dev/null +++ b/dlls/ext-ms-win-gdi-font-l1-1-0/ext-ms-win-gdi-font-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stdcall CreateFontIndirectA(ptr) gdi32.CreateFontIndirectA +@ stdcall CreateFontIndirectW(ptr) gdi32.CreateFontIndirectW +@ stdcall EnumFontFamiliesA(long str ptr long) gdi32.EnumFontFamiliesA +@ stdcall EnumFontFamiliesExA(long ptr ptr long long) gdi32.EnumFontFamiliesExA +@ stdcall EnumFontFamiliesExW(long ptr ptr long long) gdi32.EnumFontFamiliesExW +@ stdcall GetFontData(long long long ptr long) gdi32.GetFontData +@ stdcall GetFontFileData(long long int64 ptr long) gdi32.GetFontFileData +@ stdcall GetFontFileInfo(long long ptr long ptr) gdi32.GetFontFileInfo +@ stdcall GetFontRealizationInfo(long ptr) gdi32.GetFontRealizationInfo +@ stdcall GetTextFaceA(long long ptr) gdi32.GetTextFaceA +@ stdcall GetTextMetricsW(long ptr) gdi32.GetTextMetricsW +@ stdcall TranslateCharsetInfo(ptr ptr long) gdi32.TranslateCharsetInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index 9fe4dd1..9201be4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -438,6 +438,7 @@ my @dll_groups = "ext-ms-win-gdi-devcaps-l1-1-0", "ext-ms-win-gdi-draw-l1-1-0", "ext-ms-win-gdi-draw-l1-1-1", + "ext-ms-win-gdi-font-l1-1-0", "ext-ms-win-gdi-render-l1-1-0", "ext-ms-win-rtcore-gdi-devcaps-l1-1-0", "ext-ms-win-rtcore-gdi-object-l1-1-0",

1 0