wine-commits February 2019

1 participants
672 discussions

Alexandre Julliard : winebuild: Make thiscall an entry point flag instead of a function type.

by Alexandre Julliard

Module: wine Branch: master Commit: 28debd82fc90e551e8fa8fbee8858df237cb3301 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28debd82fc90e551e8fa8fbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 17:09:51 2019 +0100 winebuild: Make thiscall an entry point flag instead of a function type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 +- tools/winebuild/import.c | 2 -- tools/winebuild/parser.c | 40 +++++++++++++++++++++++++++------------- tools/winebuild/spec32.c | 12 +++++------- tools/winebuild/winebuild.man.in | 11 ++++++----- 5 files changed, 39 insertions(+), 28 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index fbc2cd9..15d22a0 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -47,7 +47,6 @@ typedef enum TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ - TYPE_THISCALL, /* thiscall function (Win32 on i386) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; @@ -173,6 +172,7 @@ struct strarray #define FLAG_REGISTER 0x10 /* use register calling convention */ #define FLAG_PRIVATE 0x20 /* function is private (cannot be imported) */ #define FLAG_ORDINAL 0x40 /* function should be imported by ordinal */ +#define FLAG_THISCALL 0x80 /* use thiscall calling convention */ #define FLAG_FORWARD 0x100 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5e5866c..893691e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -466,7 +466,6 @@ static void check_undefined_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_CDECL: case TYPE_VARARGS: - case TYPE_THISCALL: if (link_ext_symbols) { odp->flags |= FLAG_EXT_LINK; @@ -1444,7 +1443,6 @@ static void build_unix_import_lib( DLLSPEC *spec ) case TYPE_VARARGS: case TYPE_CDECL: case TYPE_STDCALL: - case TYPE_THISCALL: prefix = (!odp->name || (odp->flags & FLAG_ORDINAL)) ? import_ord_prefix : import_func_prefix; new_output_as_file( spec->file_name ); output( "\t.text\n" ); diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index ad99654..11b05aa 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -56,7 +56,6 @@ static const char * const TypeNames[TYPE_NBTYPES] = "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ - "thiscall", /* TYPE_THISCALL */ "extern" /* TYPE_EXTERN */ }; @@ -69,6 +68,7 @@ static const char * const FlagNames[] = "register", /* FLAG_REGISTER */ "private", /* FLAG_PRIVATE */ "ordinal", /* FLAG_ORDINAL */ + "thiscall", /* FLAG_THISCALL */ NULL }; @@ -287,10 +287,18 @@ static int parse_spec_arguments( ORDDEF *odp, DLLSPEC *spec, int optional ) } odp->u.func.nb_args = i; - if (odp->type == TYPE_THISCALL && (!i || odp->u.func.args[0] != ARG_PTR)) + if (odp->flags & FLAG_THISCALL) { - error( "First argument of a thiscall function must be a pointer\n" ); - return 0; + if (odp->type != TYPE_STDCALL) + { + error( "A thiscall function must use the stdcall convention\n" ); + return 0; + } + if (!i || odp->u.func.args[0] != ARG_PTR) + { + error( "First argument of a thiscall function must be a pointer\n" ); + return 0; + } } return 1; } @@ -311,11 +319,6 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) error( "'stdcall' not supported for Win16\n" ); return 0; } - if (!is_win32 && odp->type == TYPE_THISCALL) - { - error( "'thiscall' not supported for Win16\n" ); - return 0; - } if (is_win32 && odp->type == TYPE_PASCAL) { error( "'pascal' not supported for Win32\n" ); @@ -327,6 +330,9 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) if (odp->type == TYPE_VARARGS) odp->flags |= FLAG_NORELAY; /* no relay debug possible for varags entry point */ + if (target_cpu != CPU_x86) + odp->flags &= ~FLAG_THISCALL; + if (!(token = GetToken(1))) { if (!strcmp( odp->name, "@" )) @@ -349,7 +355,7 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->flags |= FLAG_FORWARD; } } - if (target_cpu == CPU_x86 && odp->type == TYPE_THISCALL && !(odp->flags & FLAG_FORWARD)) + if ((odp->flags & FLAG_THISCALL) && !(odp->flags & FLAG_FORWARD)) { char *link_name = strmake( "__thiscall_%s", odp->link_name ); free( odp->link_name ); @@ -506,6 +512,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) error( "Flag '%s' is not supported in Win32\n", FlagNames[i] ); break; case FLAG_RET64: + case FLAG_THISCALL: if (spec->type == SPEC_WIN16) error( "Flag '%s' is not supported in Win16\n", FlagNames[i] ); break; @@ -538,8 +545,16 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) if (odp->type >= TYPE_NBTYPES) { - error( "Expected type after ordinal, found '%s' instead\n", token ); - goto error; + if (!strcmp( token, "thiscall" )) /* for backwards compatibility */ + { + odp->type = TYPE_STDCALL; + odp->flags |= FLAG_THISCALL; + } + else + { + error( "Expected type after ordinal, found '%s' instead\n", token ); + goto error; + } } if (!(token = GetToken(0))) goto error; @@ -571,7 +586,6 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: - case TYPE_THISCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 3552eca..1b4e534 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -58,7 +58,6 @@ static inline int needs_relay( const ORDDEF *odp ) { case TYPE_STDCALL: case TYPE_CDECL: - case TYPE_THISCALL: break; case TYPE_STUB: if (odp->u.func.nb_args != -1) break; @@ -129,7 +128,7 @@ static void get_arg_string( ORDDEF *odp, char str[MAX_ARGUMENTS + 1] ) break; } } - if (target_cpu == CPU_x86 && odp->type == TYPE_THISCALL) str[0] = 't'; + if (odp->flags & FLAG_THISCALL) str[0] = 't'; /* append return value */ if (get_ptr_size() == 4 && (odp->flags & FLAG_RET64)) @@ -225,7 +224,7 @@ static void output_relay_debug( DLLSPEC *spec ) switch (target_cpu) { case CPU_x86: - if (odp->type == TYPE_THISCALL) /* add the this pointer */ + if (odp->flags & FLAG_THISCALL) /* add the this pointer */ { output( "\tpopl %%eax\n" ); output( "\tpushl %%ecx\n" ); @@ -246,7 +245,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tcall *4(%%eax)\n" ); output_cfi( ".cfi_adjust_cfa_offset -8" ); - if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL) + if (odp->type == TYPE_STDCALL) output( "\tret $%u\n", get_args_size( odp )); else output( "\tret\n" ); @@ -392,7 +391,6 @@ void output_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: - case TYPE_THISCALL: if (odp->flags & FLAG_FORWARD) { output( "\t%s .L__wine_spec_forwards+%u\n", get_asm_ptr_keyword(), fwd_size ); @@ -953,7 +951,6 @@ void output_def_file( DLLSPEC *spec, int include_private ) /* fall through */ case TYPE_VARARGS: case TYPE_CDECL: - case TYPE_THISCALL: /* try to reduce output */ if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); @@ -969,7 +966,8 @@ void output_def_file( DLLSPEC *spec, int include_private ) else if (strcmp(name, odp->link_name)) /* try to reduce output */ { output( "=%s", odp->link_name ); - if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86 && !(odp->flags & FLAG_THISCALL)) + output( "@%d", at_param ); } break; } diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 51ad544..4455e63 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -299,6 +299,12 @@ accessed through GetProcAddress. The entry point will be imported by ordinal instead of by name. The name is still exported. .TP +.B -thiscall +The function uses the +.I thiscall +calling convention (first parameter in %ecx register on i386). +.TP +.RE .BI -arch= cpu\fR[\fB,\fIcpu\fR] The entry point is only available on the specified CPU architecture(s). The names \fBwin32\fR and \fBwin64\fR match all @@ -335,11 +341,6 @@ for a Win16 or Win32 function using the C calling convention .B varargs for a Win16 or Win32 function using the C calling convention with a variable number of arguments -.TP -.B thiscall -for a Win32 function using the -.I thiscall -calling convention (first parameter in %ecx register on i386) .RE .PP .I args

5 years, 2 months

Józef Kucia : vkd3d: Use vkCmdResolveImage() to resolve typeless resources if possible.

by Alexandre Julliard

Module: vkd3d Branch: master Commit: 02ca005ada09abd40dafe05de1ed74ef99d3633b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02ca005ada09abd40dafe05… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 27 18:03:20 2019 +0100 vkd3d: Use vkCmdResolveImage() to resolve typeless resources if possible. 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> --- libs/vkd3d/command.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5b11c3c..4999280 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2855,8 +2855,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi ID3D12Resource *src, UINT src_sub_resource_idx, DXGI_FORMAT format) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + const struct vkd3d_format *src_format, *dst_format, *vk_format; struct d3d12_resource *dst_resource, *src_resource; - const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; VkImageResolve vk_image_resolve; @@ -2876,13 +2876,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi d3d12_command_list_end_current_render_pass(list); - if (dxgi_format_is_typeless(dst_resource->desc.Format) - || dxgi_format_is_typeless(src_resource->desc.Format)) - { - FIXME("Not implemented for typeless resources.\n"); - return; - } - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) { WARN("Invalid format %#x.\n", dst_resource->desc.Format); @@ -2894,6 +2887,20 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi return; } + if (dxgi_format_is_typeless(dst_resource->desc.Format) || dxgi_format_is_typeless(src_resource->desc.Format)) + { + if (!(vk_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, format))) + { + WARN("Invalid format %#x.\n", format); + return; + } + if (dst_format->vk_format != src_format->vk_format || dst_format->vk_format != vk_format->vk_format) + { + FIXME("Not implemented for typeless resources.\n"); + return; + } + } + /* Resolve of depth/stencil images is not supported in Vulkan. */ if ((dst_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) || (src_format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)))

5 years, 2 months

Huw Davies : ntoskrnl.exe: Add stubs for PsSuspendProcess() and PsResumeProcess().

by Alexandre Julliard

Module: wine Branch: master Commit: d88f12950761e9ff8d125a579de6e743979f4945 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88f12950761e9ff8d125a57… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 27 13:05:35 2019 +0000 ntoskrnl.exe: Add stubs for PsSuspendProcess() and PsResumeProcess(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 ++ 2 files changed, 22 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 010f9f7..c21bc2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2966,6 +2966,26 @@ NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS status) /*********************************************************************** + * PsSuspendProcess (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsSuspendProcess(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * PsResumeProcess (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsResumeProcess(PEPROCESS process) +{ + FIXME("stub: %p\n", process); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * MmGetSystemRoutineAddress (NTOSKRNL.EXE.@) */ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4dcd553..902ae2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -922,6 +922,7 @@ @ stdcall PsRemoveCreateThreadNotifyRoutine(ptr) @ stdcall PsRemoveLoadImageNotifyRoutine(ptr) @ stub PsRestoreImpersonation +@ stdcall PsResumeProcess(ptr) @ stub PsReturnPoolQuota @ stub PsReturnProcessNonPagedPoolQuota @ stub PsReturnProcessPagedPoolQuota @@ -941,6 +942,7 @@ @ stub PsSetProcessWindowStation @ stub PsSetThreadHardErrorsAreDisabled @ stub PsSetThreadWin32Thread +@ stdcall PsSuspendProcess(ptr) @ stdcall PsTerminateSystemThread(long) @ extern PsThreadType @ stdcall READ_REGISTER_BUFFER_UCHAR(ptr ptr long)

5 years, 2 months

Vijay Kiran Kamuju : user32: Add DlgDirList wildcard checks.

by Alexandre Julliard

Module: wine Branch: master Commit: 7a6b00dc25880bd7e8515551b7c3fa7917776eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a6b00dc25880bd7e8515551… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 22 14:25:59 2019 +0100 user32: Add DlgDirList wildcard checks. Based on a patch from Christian Lupien. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8226 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 6 +++--- dlls/user32/dialog.c | 9 ++++++++- dlls/user32/tests/listbox.c | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index de73ad2..70e2128 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -1941,7 +1941,7 @@ static void test_listbox_dlgdir(void) strcpy(pathBuffer, "C:\\"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + ok(!strcmp(pathBuffer, "*"), "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); @@ -1952,8 +1952,8 @@ static void test_listbox_dlgdir(void) SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd); diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index deaeb84..88c2930 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1821,6 +1821,7 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, HWND hwnd; LPWSTR orig_spec = spec; WCHAR any[] = {'*','.','*',0}; + WCHAR star[] = {'*',0}; #define SENDMSG(msg,wparam,lparam) \ ((attrib & DDL_POSTMSGS) ? PostMessageW( hwnd, msg, wparam, lparam ) \ @@ -1829,10 +1830,16 @@ static INT DIALOG_DlgDirListW( HWND hDlg, LPWSTR spec, INT idLBox, TRACE("%p %s %d %d %04x\n", hDlg, debugstr_w(spec), idLBox, idStatic, attrib ); /* If the path exists and is a directory, chdir to it */ - if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = any; + if (!spec || !spec[0] || SetCurrentDirectoryW( spec )) spec = star; else { WCHAR *p, *p2; + + if (!strchrW(spec, '*') && !strchrW(spec, '?')) + { + SetLastError(ERROR_NO_WILDCARD_CHARACTERS); + return FALSE; + } p = spec; if ((p2 = strchrW( p, ':' ))) p = p2 + 1; if ((p2 = strrchrW( p, '\\' ))) p = p2; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d15b18a..8d81151 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1836,7 +1836,7 @@ static void test_listbox_dlgdir(void) strcpy(pathBuffer, "C:\\"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); - todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); strcpy(pathBuffer, "C:\\*"); @@ -1849,8 +1849,8 @@ static void test_listbox_dlgdir(void) SetLastError(0xdeadbeef); strcpy(pathBuffer, "C:\\INVALID$$DIR"); res = DlgDirListA(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); - todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); - todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, "GetLastError should return 0x589, got 0x%X\n",GetLastError()); DestroyWindow(hWnd);

5 years, 2 months

Michael Stefaniuc : gdi.exe16: Remove an unused return variable ( coccinelle).

by Alexandre Julliard

Module: wine Branch: master Commit: 7272bd8994ea2cfeecf8a2d2c2bdf10d5e175761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7272bd8994ea2cfeecf8a2d2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 26 23:14:57 2019 +0100 gdi.exe16: Remove an unused return variable (coccinelle). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index bd7f053..2e1ace8 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -518,9 +518,8 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob) */ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) { - DWORD retval = 0; TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption); - return retval; + return 0; }

5 years, 2 months

Michael Stefaniuc : crypt32: Remove an unused return variable (coccinelle) .

by Alexandre Julliard

Module: wine Branch: master Commit: 3e8720ae5ac0e19b26965f0b11fbf2ea9144431f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e8720ae5ac0e19b26965f0b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 26 23:14:56 2019 +0100 crypt32: Remove an unused return variable (coccinelle). returnvar.cocci from the Linux kernel. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/oid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 6dc894e..bf0ad32 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -190,7 +190,6 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList) { - BOOL ret = TRUE; struct OIDFunctionSet *set = hFuncSet; char *keyName; HKEY key; @@ -228,7 +227,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, } CryptMemFree(keyName); - return ret; + return TRUE; } BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule,

5 years, 2 months

Piotr Caban : msvcrt: Fix buffer overflow in _get_tzname.

by Alexandre Julliard

Module: wine Branch: master Commit: 79188582f067b16e3aaebfad4a853d84f3a310cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=79188582f067b16e3aaebfad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 27 18:37:10 2019 +0100 msvcrt: Fix buffer overflow in _get_tzname. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46481 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 14f4ba0..e6493b0 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -939,6 +939,11 @@ int CDECL MSVCRT__get_tzname(MSVCRT_size_t *ret, char *buf, MSVCRT_size_t bufsiz *ret = strlen(timezone)+1; if(!buf && !bufsize) return 0; + if(*ret > bufsize) + { + buf[0] = 0; + return MSVCRT_ERANGE; + } strcpy(buf, timezone); return 0;

5 years, 2 months

Hans Leidekker : fusion: Use bcrypt to compute the assembly token.

by Alexandre Julliard

Module: wine Branch: master Commit: 358fb2f4d83345cb97a66e4072fe4d2d70f58349 URL: https://source.winehq.org/git/wine.git/?a=commit;h=358fb2f4d83345cb97a66e40… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 27 11:36:02 2019 +0100 fusion: Use bcrypt to compute the assembly token. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46728 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/Makefile.in | 2 +- dlls/fusion/assembly.c | 35 ++++++++++------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in index 50815df..093b64c 100644 --- a/dlls/fusion/Makefile.in +++ b/dlls/fusion/Makefile.in @@ -1,5 +1,5 @@ MODULE = fusion.dll -IMPORTS = advapi32 dbghelp shlwapi version user32 +IMPORTS = bcrypt dbghelp shlwapi version user32 C_SRCS = \ asmcache.c \ diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index ec380ef..78f5278 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -21,11 +21,13 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winver.h" -#include "wincrypt.h" +#include "bcrypt.h" #include "dbghelp.h" #include "ole2.h" #include "fusion.h" @@ -807,9 +809,8 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { ULONG i, size; LONG offset; - BYTE *hashdata, *pubkey, *ptr; - HCRYPTPROV crypt; - HCRYPTHASH hash; + BYTE hashdata[20], *pubkey, *ptr; + BCRYPT_ALG_HANDLE alg; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; LPWSTR tok; @@ -833,29 +834,16 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) pubkey = assembly_get_blob(assembly, idx, &size); - if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL, - CRYPT_VERIFYCONTEXT)) + if (BCryptOpenAlgorithmProvider(&alg, BCRYPT_SHA1_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0) != STATUS_SUCCESS) return E_FAIL; - if (!CryptCreateHash(crypt, CALG_SHA1, 0, 0, &hash)) - return E_FAIL; - - if (!CryptHashData(hash, pubkey, size, 0)) - return E_FAIL; - - size = 0; - if (!CryptGetHashParam(hash, HP_HASHVAL, NULL, &size, 0)) - return E_FAIL; - - if (!(hashdata = heap_alloc(size))) + if (BCryptHash(alg, NULL, 0, pubkey, size, hashdata, sizeof(hashdata)) != STATUS_SUCCESS) { - hr = E_OUTOFMEMORY; + hr = E_FAIL; goto done; } - if (!CryptGetHashParam(hash, HP_HASHVAL, hashdata, &size, 0)) - goto done; - + size = sizeof(hashdata); for (i = size - 1; i >= size - 8; i--) tokbytes[size - i - 1] = hashdata[i]; @@ -871,10 +859,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) hr = S_OK; done: - heap_free(hashdata); - CryptDestroyHash(hash); - CryptReleaseContext(crypt, 0); - + BCryptCloseAlgorithmProvider(alg, 0); return hr; }

5 years, 2 months

Zebediah Figura : quartz/tests/avisplit: Add some tests for querying pin information.

by Alexandre Julliard

Module: wine Branch: master Commit: eabd670c03a6abc6e364a8fbe6a76d56989152d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eabd670c03a6abc6e364a8fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 26 22:56:30 2019 -0600 quartz/tests/avisplit: Add some tests for querying pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index a13660f..633f164 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -333,6 +333,81 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_pin_info(void) +{ + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + ULONG ref, expect_ref; + IFilterGraph2 *graph; + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + BOOL ret; + + graph = connect_input(filter, filename); + + hr = IBaseFilter_FindPin(filter, sink_name, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_ref = get_refcount(filter); + ref = get_refcount(pin); + ok(ref == expect_ref, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); +todo_wine + ok(ref == expect_ref + 1, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_name), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, source0_name, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IMediaSeeking, TRUE); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, source0_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, source0_name), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -582,6 +657,7 @@ START_TEST(avisplit) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_filter_graph(); CoUninitialize();

5 years, 2 months

Zebediah Figura : quartz/tests/avisplit: Add some tests for IBaseFilter_FindPin().

by Alexandre Julliard

Module: wine Branch: master Commit: 7965bd2f450504ef7b77654d03a7b56c8ad56041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7965bd2f450504ef7b77654d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 26 22:56:29 2019 -0600 quartz/tests/avisplit: Add some tests for IBaseFilter_FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplit.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 418fcb9..a13660f 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -24,6 +24,7 @@ #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; +static const WCHAR source0_name[] = {'S','t','r','e','a','m',' ','0','0',0}; static IBaseFilter *create_avi_splitter(void) { @@ -277,6 +278,61 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_find_pin(void) +{ + static const WCHAR inputW[] = {'I','n','p','u','t',0}; + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + IFilterGraph2 *graph; + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + BOOL ret; + + hr = IBaseFilter_FindPin(filter, sink_name, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, source0_name, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, inputW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + graph = connect_input(filter, filename); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, source0_name, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_name, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); +todo_wine + ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); + IPin_Release(pin); + IPin_Release(pin2); + + IEnumPins_Release(enum_pins); + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -525,6 +581,7 @@ START_TEST(avisplit) test_interfaces(); test_enum_pins(); + test_find_pin(); test_filter_graph(); CoUninitialize();

5 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
...
68
Older →

Jump to page:

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 February 2019