March 2019 - Wine-commits - list.winehq.org

Hans Leidekker : advapi32: Add a stub implementation of SaferIdentifyLevel.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 8021d449f4a02aa5e44476e9f9c98e5641e596a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8021d449f4a02aa5e44476e9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 6 10:14:27 2019 +0100 advapi32: Add a stub implementation of SaferIdentifyLevel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 11 +++++++++++ include/winsafer.h | 30 ++++++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e870a5d..eb1f546 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -717,7 +717,7 @@ @ stdcall SaferCreateLevel(long long long ptr ptr) # @ stub SaferGetLevelInformation @ stdcall SaferGetPolicyInformation(long long long ptr ptr ptr) -# @ stub SaferIdentifyLevel +@ stdcall SaferIdentifyLevel(long ptr ptr ptr) # @ stub SaferRecordEventLogEntry @ stdcall SaferSetLevelInformation(ptr long ptr long) # @ stub SaferSetPolicyInformation diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 70e2da4..6891fee 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6185,6 +6185,17 @@ BOOL WINAPI SaferGetPolicyInformation(DWORD scope, SAFER_POLICY_INFO_CLASS class } /****************************************************************************** + * SaferIdentifyLevel [ADVAPI32.@] + */ +BOOL WINAPI SaferIdentifyLevel(DWORD count, SAFER_CODE_PROPERTIES *properties, SAFER_LEVEL_HANDLE *handle, + void *reserved) +{ + FIXME("(%u %p %p %p) stub\n", count, properties, handle, reserved); + *handle = (SAFER_LEVEL_HANDLE)0xdeadbeef; + return TRUE; +} + +/****************************************************************************** * SaferSetLevelInformation [ADVAPI32.@] */ BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE handle, SAFER_OBJECT_INFO_CLASS infotype, diff --git a/include/winsafer.h b/include/winsafer.h index 4855f53..2565484 100644 --- a/include/winsafer.h +++ b/include/winsafer.h @@ -30,6 +30,32 @@ extern "C" { DECLARE_HANDLE(SAFER_LEVEL_HANDLE); +#define SAFER_MAX_HASH_SIZE 64 + +#include <pshpack8.h> +typedef struct _SAFER_CODE_PROPERTIES_V2 { + DWORD cbSize; + DWORD dwCheckFlags; + LPCWSTR ImagePath; + HANDLE hImageFileHandle; + DWORD UrlZoneId; + BYTE ImageHash[SAFER_MAX_HASH_SIZE]; + DWORD dwImageHashSize; + LARGE_INTEGER ImageSize; + ALG_ID HashAlgorithm; + LPBYTE pByteBlock; + HWND hWndParent; + DWORD dwWVTUIChoice; + LPCWSTR PackageMoniker; + LPCWSTR PackagePublisher; + LPCWSTR PackageName; + ULONG64 PackageVersion; + BOOL PackageIsFramework; +} SAFER_CODE_PROPERTIES_V2, *PSAFER_CODE_PROPERTIES_V2; + +typedef SAFER_CODE_PROPERTIES_V2 SAFER_CODE_PROPERTIES, *PSAFER_CODE_PROPERTIES; +#include <poppack.h> + #define SAFER_SCOPEID_MACHINE 1 #define SAFER_SCOPEID_USER 2 @@ -41,8 +67,6 @@ DECLARE_HANDLE(SAFER_LEVEL_HANDLE); #define SAFER_LEVEL_OPEN 1 -WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); - typedef enum _SAFER_POLICY_INFO_CLASS { SaferPolicyLevelList = 1, SaferPolicyEnableTransparentEnforcement, @@ -70,7 +94,9 @@ typedef enum _SAFER_OBJECT_INFO_CLASS { SaferObjectExtendedError } SAFER_OBJECT_INFO_CLASS; +WINADVAPI BOOL WINAPI SaferCreateLevel(DWORD,DWORD,DWORD,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferGetPolicyInformation(DWORD,SAFER_POLICY_INFO_CLASS,DWORD,PVOID,PDWORD,LPVOID); +WINADVAPI BOOL WINAPI SaferIdentifyLevel(DWORD,PSAFER_CODE_PROPERTIES,SAFER_LEVEL_HANDLE*,LPVOID); WINADVAPI BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE,SAFER_OBJECT_INFO_CLASS,LPVOID,DWORD); #ifdef __cplusplus

1 0

Zebediah Figura : strmbase/transform: Fix pin IDs.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: f5a8694c1a2f049b2e2cad3b84db17cc0dd06aaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a8694c1a2f049b2e2cad3b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 5 23:28:38 2019 -0600 strmbase/transform: Fix pin IDs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 58533bd..c62e49a 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -39,8 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); -static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; -static const WCHAR wcsOutputPinName[] = {'o','u','t','p','u','t',' ','p','i','n',0}; +static const WCHAR wcsInputPinName[] = {'I','n',0}; +static const WCHAR wcsOutputPinName[] = {'O','u','t',0}; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl;

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_FindPin() on the AVI decompressor.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 6824f2464c3269bf8225e41786863d4c77b1bc79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6824f2464c3269bf8225e417… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 5 23:28:39 2019 -0600 quartz/tests: Add some tests for IBaseFilter_FindPin() on the AVI decompressor. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 39882db..67e10be 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -22,6 +22,11 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n',0}; +static const WCHAR source_id[] = {'O','u','t',0}; +static const WCHAR sink_name[] = {'X','F','o','r','m',' ','I','n',0}; +static const WCHAR source_name[] = {'X','F','o','r','m',' ','O','u','t',0}; + static IBaseFilter *create_avi_dec(void) { IBaseFilter *filter = NULL; @@ -203,12 +208,56 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + static const WCHAR output_pinW[] = {'o','u','t','p','u','t',' ','p','i','n',0}; + IBaseFilter *filter = create_avi_dec(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + 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); + ok(pin == pin2, "Pins didn't match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IBaseFilter_FindPin(filter, source_id, &pin); + 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); + ok(pin == pin2, "Pins didn't match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + hr = IBaseFilter_FindPin(filter, sink_name, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + hr = IBaseFilter_FindPin(filter, source_name, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + hr = IBaseFilter_FindPin(filter, output_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(avidec) { CoInitialize(NULL); test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add some tests for querying AVI decompressor pin information.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 4576a93b5d160e4d418af1908fc5da64662e0ef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4576a93b5d160e4d418af190… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 5 23:28:40 2019 -0600 quartz/tests: Add some tests for querying AVI decompressor pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 67e10be..0506544 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -251,6 +251,79 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_avi_dec(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "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); + todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == 3, "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_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, source_id, &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); + todo_wine ok(!lstrcmpW(info.achName, source_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, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(avidec) { CoInitialize(NULL); @@ -258,6 +331,7 @@ START_TEST(avidec) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Alexandre Julliard : winebuild: Rename BuildSpec32File() for consistency.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 0cdab409adef2fe2e36b7ea47d313af20573df3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdab409adef2fe2e36b7ea4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:10:30 2019 +0100 winebuild: Rename BuildSpec32File() for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 3 +-- tools/winebuild/main.c | 2 +- tools/winebuild/spec32.c | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index d7b46a6..fe92522 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -299,6 +299,7 @@ extern void output_exports( DLLSPEC *spec ); extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( DLLSPEC *spec ); extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); +extern void output_spec32_file( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec ); extern void output_def_file( DLLSPEC *spec, int include_private ); extern void load_res16_file( const char *name, DLLSPEC *spec ); @@ -311,8 +312,6 @@ extern void output_fake_module16( DLLSPEC *spec16 ); extern void output_res_o_file( DLLSPEC *spec ); extern void output_asm_relays16(void); -extern void BuildSpec32File( DLLSPEC *spec ); - extern void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ); extern int parse_spec_file( FILE *file, DLLSPEC *spec ); extern int parse_def_file( FILE *file, DLLSPEC *spec ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 7769641..d7bc39f 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -645,7 +645,7 @@ int main(int argc, char **argv) output_spec16_file( spec ); break; case SPEC_WIN32: - BuildSpec32File( spec ); + output_spec32_file( spec ); break; default: assert(0); } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 89f33c8..0547ba2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -695,11 +695,11 @@ void output_module( DLLSPEC *spec ) /******************************************************************* - * BuildSpec32File + * output_spec32_file * * Build a Win32 C file from a spec file. */ -void BuildSpec32File( DLLSPEC *spec ) +void output_spec32_file( DLLSPEC *spec ) { needs_get_pc_thunk = 0; resolve_imports( spec );

1 0

Alexandre Julliard : winebuild: Output the module filename along with the stub data.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: a3229faf59d9e562a5eb1e73cd38a21183978d72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3229faf59d9e562a5eb1e73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:10:49 2019 +0100 winebuild: Output the module filename along with the stub data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 45 ++++++++++++++++----------------------------- tools/winebuild/spec32.c | 1 - 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6ab7765..2816c65 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1187,14 +1187,14 @@ static void output_external_link_imports( DLLSPEC *spec ) void output_stubs( DLLSPEC *spec ) { const char *name, *exp_name; - int i, count; + int i; if (!has_stubs( spec )) return; output( "\n/* stub functions */\n\n" ); output( "\t.text\n" ); - for (i = count = 0; i < spec->nb_entry_points; i++) + for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; if (odp->type != TYPE_STUB) continue; @@ -1231,7 +1231,6 @@ void output_stubs( DLLSPEC *spec ) { output( "\tleal .L%s_string-1b(%%eax),%%ecx\n", name ); output( "\tmovl %%ecx,4(%%esp)\n" ); - count++; } else output( "\tmovl $%d,4(%%esp)\n", odp->ordinal ); @@ -1241,10 +1240,7 @@ void output_stubs( DLLSPEC *spec ) else { if (exp_name) - { output( "\tmovl $.L%s_string,4(%%esp)\n", name ); - count++; - } else output( "\tmovl $%d,4(%%esp)\n", odp->ordinal ); output( "\tmovl $.L__wine_spec_file_name,(%%esp)\n" ); @@ -1256,10 +1252,7 @@ void output_stubs( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset 8" ); output( "\tleaq .L__wine_spec_file_name(%%rip),%%rdi\n" ); if (exp_name) - { output( "leaq .L%s_string(%%rip),%%rsi\n", name ); - count++; - } else output( "\tmovq $%d,%%rsi\n", odp->ordinal ); output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); @@ -1269,24 +1262,19 @@ void output_stubs( DLLSPEC *spec ) output( "\tadd r0,PC\n"); output( "\tldr r1,2f+4\n"); output( "1:" ); - if (exp_name) - { - output( "\tadd r1,PC\n"); - count++; - } + if (exp_name) output( "\tadd r1,PC\n"); output( "\tbl %s\n", asm_name("__wine_spec_unimplemented_stub") ); output( "2:\t.long .L__wine_spec_file_name-1b\n" ); if (exp_name) output( "\t.long .L%s_string-2b\n", name ); else output( "\t.long %u\n", odp->ordinal ); break; case CPU_ARM64: - output( "\tadrp x0, %s\n", asm_name("__wine_spec_file_name") ); - output( "\tadd x0, x0, #:lo12:%s\n", asm_name("__wine_spec_file_name") ); + output( "\tadrp x0, .L__wine_spec_file_name\n" ); + output( "\tadd x0, x0, #:lo12:.L__wine_spec_file_name\n" ); if (exp_name) { output( "\tadrp x1, .L%s_string\n", name ); output( "\tadd x1, x1, #:lo12:.L%s_string\n", name ); - count++; } else output( "\tmov x1, %u\n", odp->ordinal ); @@ -1301,20 +1289,19 @@ void output_stubs( DLLSPEC *spec ) output_function_size( name ); } - if (count) + output( "\t%s\n", get_asm_string_section() ); + output( ".L__wine_spec_file_name:\n" ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); + for (i = 0; i < spec->nb_entry_points; i++) { - output( "\t%s\n", get_asm_string_section() ); - for (i = 0; i < spec->nb_entry_points; i++) + ORDDEF *odp = &spec->entry_points[i]; + if (odp->type != TYPE_STUB) continue; + exp_name = odp->name ? odp->name : odp->export_name; + if (exp_name) { - ORDDEF *odp = &spec->entry_points[i]; - if (odp->type != TYPE_STUB) continue; - exp_name = odp->name ? odp->name : odp->export_name; - if (exp_name) - { - name = get_stub_name( odp, spec ); - output( ".L%s_string:\n", name ); - output( "\t%s \"%s\"\n", get_asm_string_keyword(), exp_name ); - } + name = get_stub_name( odp, spec ); + output( ".L%s_string:\n", name ); + output( "\t%s \"%s\"\n", get_asm_string_keyword(), exp_name ); } } } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 0547ba2..80124f0 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -685,7 +685,6 @@ void output_module( DLLSPEC *spec ) output( "\n\t%s\n", get_asm_string_section() ); output( "%s\n", asm_globl("__wine_spec_file_name") ); - output( ".L__wine_spec_file_name:\n" ); output( "\t%s \"%s\"\n", get_asm_string_keyword(), spec->file_name ); if (target_platform == PLATFORM_APPLE) output( "\t.lcomm %s,4\n", asm_name("_end") );

1 0

Alexandre Julliard : winebuild: Add a helper for decorating stdcall function names.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: ef9bda4c960204c81882f53792ee3e83729024c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef9bda4c960204c81882f537… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:12:55 2019 +0100 winebuild: Add a helper for decorating stdcall function names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 2 +- tools/winebuild/spec32.c | 10 ++-------- tools/winebuild/utils.c | 15 +++++++++++++++ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index fe92522..e76a87a 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -268,6 +268,7 @@ extern DLLSPEC *alloc_dll_spec(void); extern void free_dll_spec( DLLSPEC *spec ); extern char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); +extern const char *get_link_name( const ORDDEF *odp ); extern int get_cpu_from_name( const char *name ); extern unsigned int get_alignment(unsigned int align); extern unsigned int get_page_size(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 2816c65..5c4de1c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -498,7 +498,7 @@ static char *create_undef_symbols_file( DLLSPEC *spec ) ORDDEF *odp = &spec->entry_points[i]; if (odp->type == TYPE_STUB || odp->type == TYPE_ABS || odp->type == TYPE_VARIABLE) continue; if (odp->flags & FLAG_FORWARD) continue; - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( odp ))); } for (j = 0; j < extra_ld_symbols.count; j++) output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(extra_ld_symbols.str[j]) ); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 80124f0..69b6d2f 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -419,7 +419,7 @@ void output_exports( DLLSPEC *spec ) } else { - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(odp->link_name) ); + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( odp ))); } break; case TYPE_STUB: @@ -977,15 +977,9 @@ void output_def_file( DLLSPEC *spec, int include_private ) int at_param = get_args_size( odp ); if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) - { output( "=%s", odp->link_name ); - } else if (strcmp(name, odp->link_name)) /* try to reduce output */ - { - output( "=%s", odp->link_name ); - if (!kill_at && target_cpu == CPU_x86 && !(odp->flags & FLAG_THISCALL)) - output( "@%d", at_param ); - } + output( "=%s", get_link_name( odp )); break; } default: diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 06c3d39..63be3af 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -894,6 +894,21 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) return buffer; } +/* return the stdcall-decorated name for an entry point */ +const char *get_link_name( const ORDDEF *odp ) +{ + static char *buffer; + + if (!kill_at && target_platform == PLATFORM_WINDOWS && target_cpu == CPU_x86 && + odp->type == TYPE_STDCALL && !(odp->flags & FLAG_THISCALL)) + { + free( buffer ); + buffer = strmake( "%s@%u", odp->link_name, get_args_size( odp )); + return buffer; + } + return odp->link_name; +} + /* parse a cpu name and return the corresponding value */ int get_cpu_from_name( const char *name ) {

1 0

Alexandre Julliard : winebuild: Add a helper for generating RVA pointers.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 7555fd57e3956d7cfc0fa5a43b87bd7d20101087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7555fd57e3956d7cfc0fa5a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:13:45 2019 +0100 winebuild: Add a helper for generating RVA pointers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 9 +++------ tools/winebuild/res32.c | 6 ++++-- tools/winebuild/spec32.c | 31 ++++++++++++++++++------------- tools/winebuild/utils.c | 22 ++++++++++++++++++++++ 5 files changed, 49 insertions(+), 21 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e76a87a..44fa317 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -248,6 +248,8 @@ extern int output( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void output_cfi( const char *format, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); +extern void output_rva( const char *format, ... ) + __attribute__ ((__format__ (__printf__, 1, 2))); extern void spawn( struct strarray array ); extern struct strarray find_tool( const char *name, const char * const *names ); extern struct strarray get_as_command(void); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 5c4de1c..984bffd 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -722,14 +722,11 @@ static void output_immediate_imports(void) j = 0; LIST_FOR_EACH_ENTRY( import, &dll_imports, struct import, entry ) { - output( "\t.long .L__wine_spec_import_data_names+%d-.L__wine_spec_rva_base\n", /* OriginalFirstThunk */ - j * get_ptr_size() ); + output_rva( ".L__wine_spec_import_data_names + %d", j * get_ptr_size() ); /* OriginalFirstThunk */ output( "\t.long 0\n" ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* ForwarderChain */ - output( "\t.long .L__wine_spec_import_name_%s-.L__wine_spec_rva_base\n", /* Name */ - import->c_name ); - output( "\t.long .L__wine_spec_import_data_ptrs+%d-.L__wine_spec_rva_base\n", /* FirstThunk */ - j * get_ptr_size() ); + output_rva( ".L__wine_spec_import_name_%s", import->c_name ); /* Name */ + output_rva( ".L__wine_spec_import_data_ptrs + %d", j * get_ptr_size() ); /* FirstThunk */ j += import->nb_imports + 1; } output( "\t.long 0\n" ); /* OriginalFirstThunk */ diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index b20dfb4..16e5c65 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -476,8 +476,10 @@ void output_resources( DLLSPEC *spec ) /* dump the resource data entries */ for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) - output( "\t.long .L__wine_spec_res_%d-.L__wine_spec_rva_base,%u,0,0\n", - i, res->data_size ); + { + output_rva( ".L__wine_spec_res_%d", i ); + output( "\t.long %u,0,0\n", res->data_size ); + } /* dump the name strings */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 69b6d2f..ee38702 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -378,15 +378,15 @@ void output_exports( DLLSPEC *spec ) output( "\t.long 0\n" ); /* Characteristics */ output( "\t.long 0\n" ); /* TimeDateStamp */ output( "\t.long 0\n" ); /* MajorVersion/MinorVersion */ - output( "\t.long .L__wine_spec_exp_names-.L__wine_spec_rva_base\n" ); /* Name */ + output_rva( ".L__wine_spec_exp_names" ); /* Name */ output( "\t.long %u\n", spec->base ); /* Base */ output( "\t.long %u\n", nr_exports ); /* NumberOfFunctions */ output( "\t.long %u\n", spec->nb_names ); /* NumberOfNames */ - output( "\t.long .L__wine_spec_exports_funcs-.L__wine_spec_rva_base\n" ); /* AddressOfFunctions */ + output_rva( ".L__wine_spec_exports_funcs " ); /* AddressOfFunctions */ if (spec->nb_names) { - output( "\t.long .L__wine_spec_exp_name_ptrs-.L__wine_spec_rva_base\n" ); /* AddressOfNames */ - output( "\t.long .L__wine_spec_exp_ordinals-.L__wine_spec_rva_base\n" ); /* AddressOfNameOrdinals */ + output_rva( ".L__wine_spec_exp_name_ptrs" ); /* AddressOfNames */ + output_rva( ".L__wine_spec_exp_ordinals" ); /* AddressOfNameOrdinals */ } else { @@ -440,7 +440,7 @@ void output_exports( DLLSPEC *spec ) output( "\n.L__wine_spec_exp_name_ptrs:\n" ); for (i = 0; i < spec->nb_names; i++) { - output( "\t.long .L__wine_spec_exp_names+%u-.L__wine_spec_rva_base\n", namepos ); + output_rva( ".L__wine_spec_exp_names + %u", namepos ); namepos += strlen(spec->names[i]->name) + 1; } @@ -636,8 +636,7 @@ void output_module( DLLSPEC *spec ) output( "\t.short %u,%u\n", /* Major/MinorSubsystemVersion */ spec->subsystem_major, spec->subsystem_minor ); output( "\t.long 0\n" ); /* Win32VersionValue */ - output( "\t.long %s-.L__wine_spec_rva_base\n", /* SizeOfImage */ - asm_name("_end") ); + output_rva( "%s", asm_name("_end") ); /* SizeOfImage */ output( "\t.long %u\n", page_size ); /* SizeOfHeaders */ output( "\t.long 0\n" ); /* CheckSum */ output( "\t.short 0x%04x\n", /* Subsystem */ @@ -652,20 +651,26 @@ void output_module( DLLSPEC *spec ) output( "\t.long 16\n" ); /* NumberOfRvaAndSizes */ if (spec->base <= spec->limit) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT] */ - output( "\t.long .L__wine_spec_exports-.L__wine_spec_rva_base," - ".L__wine_spec_exports_end-.L__wine_spec_exports\n" ); + { + output_rva( ".L__wine_spec_exports" ); + output( "\t.long .L__wine_spec_exports_end-.L__wine_spec_exports\n" ); + } else output( "\t.long 0,0\n" ); if (has_imports()) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */ - output( "\t.long .L__wine_spec_imports-.L__wine_spec_rva_base," - ".L__wine_spec_imports_end-.L__wine_spec_imports\n" ); + { + output_rva( ".L__wine_spec_imports" ); + output( "\t.long .L__wine_spec_imports_end-.L__wine_spec_imports\n" ); + } else output( "\t.long 0,0\n" ); if (spec->nb_resources) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */ - output( "\t.long .L__wine_spec_resources-.L__wine_spec_rva_base," - ".L__wine_spec_resources_end-.L__wine_spec_resources\n" ); + { + output_rva( ".L__wine_spec_resources" ); + output( "\t.L__wine_spec_resources_end-.L__wine_spec_resources\n" ); + } else output( "\t.long 0,0\n" ); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 63be3af..87761c2 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1107,6 +1107,28 @@ void output_cfi( const char *format, ... ) va_end( valist ); } +/* output an RVA pointer */ +void output_rva( const char *format, ... ) +{ + va_list valist; + + va_start( valist, format ); + switch (target_platform) + { + case PLATFORM_WINDOWS: + output( "\t.rva " ); + vfprintf( output_file, format, valist ); + fputc( '\n', output_file ); + break; + default: + output( "\t.long " ); + vfprintf( output_file, format, valist ); + output( " - .L__wine_spec_rva_base\n" ); + break; + } + va_end( valist ); +} + /* output the GNU note for non-exec stack */ void output_gnu_stack_note(void) {

1 0

Alexandre Julliard : winebuild: Add a helper for generating data directories.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 7d41cde73f56bd363bc354d9960290f6ca0ee14c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d41cde73f56bd363bc354d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:37:12 2019 +0100 winebuild: Add a helper for generating data directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 59 +++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index ee38702..7b4d661 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -138,6 +138,21 @@ static void get_arg_string( ORDDEF *odp, char str[MAX_ARGUMENTS + 1] ) strcpy( str + i, "I" ); } +static void output_data_directories( const char *names[16] ) +{ + int i; + + for (i = 0; i < 16; i++) + { + if (names[i]) + { + output_rva( "%s", names[i] ); + output( "\t.long %s_end - %s\n", names[i], names[i] ); + } + else output( "\t.long 0,0\n" ); + } +} + /******************************************************************* * build_args_string */ @@ -546,6 +561,7 @@ void output_module( DLLSPEC *spec ) { int machine = 0; unsigned int page_size = get_page_size(); + const char *data_dirs[16] = { NULL }; /* Reserve some space for the PE header */ @@ -650,43 +666,14 @@ void output_module( DLLSPEC *spec ) output( "\t.long 0\n" ); /* LoaderFlags */ output( "\t.long 16\n" ); /* NumberOfRvaAndSizes */ - if (spec->base <= spec->limit) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT] */ - { - output_rva( ".L__wine_spec_exports" ); - output( "\t.long .L__wine_spec_exports_end-.L__wine_spec_exports\n" ); - } - else - output( "\t.long 0,0\n" ); + if (spec->base <= spec->limit) + data_dirs[0] = ".L__wine_spec_exports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT] */ + if (has_imports()) + data_dirs[1] = ".L__wine_spec_imports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */ + if (spec->nb_resources) + data_dirs[2] = ".L__wine_spec_resources"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */ - if (has_imports()) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */ - { - output_rva( ".L__wine_spec_imports" ); - output( "\t.long .L__wine_spec_imports_end-.L__wine_spec_imports\n" ); - } - else - output( "\t.long 0,0\n" ); - - if (spec->nb_resources) /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */ - { - output_rva( ".L__wine_spec_resources" ); - output( "\t.L__wine_spec_resources_end-.L__wine_spec_resources\n" ); - } - else - output( "\t.long 0,0\n" ); - - output( "\t.long 0,0\n" ); /* DataDirectory[3] */ - output( "\t.long 0,0\n" ); /* DataDirectory[4] */ - output( "\t.long 0,0\n" ); /* DataDirectory[5] */ - output( "\t.long 0,0\n" ); /* DataDirectory[6] */ - output( "\t.long 0,0\n" ); /* DataDirectory[7] */ - output( "\t.long 0,0\n" ); /* DataDirectory[8] */ - output( "\t.long 0,0\n" ); /* DataDirectory[9] */ - output( "\t.long 0,0\n" ); /* DataDirectory[10] */ - output( "\t.long 0,0\n" ); /* DataDirectory[11] */ - output( "\t.long 0,0\n" ); /* DataDirectory[12] */ - output( "\t.long 0,0\n" ); /* DataDirectory[13] */ - output( "\t.long 0,0\n" ); /* DataDirectory[14] */ - output( "\t.long 0,0\n" ); /* DataDirectory[15] */ + output_data_directories( data_dirs ); output( "\n\t%s\n", get_asm_string_section() ); output( "%s\n", asm_globl("__wine_spec_file_name") );

1 0

Alexandre Julliard : winebuild: Don' t use underscore prefix on 64-bit Windows.
by Alexandre Julliard 06 Mar '19

06 Mar '19

Module: wine Branch: master Commit: 4f266a88c0b9455c6be961a12404edeb66e0ba7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f266a88c0b9455c6be961a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 6 10:40:13 2019 +0100 winebuild: Don't use underscore prefix on 64-bit Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/utils.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 87761c2..fa9169b 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -1039,8 +1039,10 @@ const char *asm_name( const char *sym ) switch (target_platform) { - case PLATFORM_APPLE: case PLATFORM_WINDOWS: + if (target_cpu != CPU_x86) return sym; + /* fall through */ + case PLATFORM_APPLE: if (sym[0] == '.' && sym[1] == 'L') return sym; free( buffer ); buffer = strmake( "_%s", sym ); @@ -1061,7 +1063,7 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def _%s; .scl 2; .type 32; .endef", func ); + buffer = strmake( ".def %s%s; .scl 2; .type 32; .endef", target_cpu == CPU_x86 ? "_" : "", func ); break; default: free( buffer ); @@ -1164,7 +1166,8 @@ const char *asm_globl( const char *func ) buffer = strmake( "\t.globl _%s\n\t.private_extern _%s\n_%s:", func, func, func ); break; case PLATFORM_WINDOWS: - buffer = strmake( "\t.globl _%s\n_%s:", func, func ); + buffer = strmake( "\t.globl %s%s\n%s%s:", target_cpu == CPU_x86 ? "_" : "", func, + target_cpu == CPU_x86 ? "_" : "", func ); break; default: buffer = strmake( "\t.globl %s\n\t.hidden %s\n%s:", func, func, func );

1 0