December 2021 - Wine-Commits

Rémi Bernon : dinput: Look for the PID effect state input report.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: f6fa99bd4e63940b540a23555f10ebbbc709c752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6fa99bd4e63940b540a2355… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:46 2021 +0100 dinput: Look for the PID effect state input report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 49a8f28e864..9dac2b3af4b 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -159,6 +159,12 @@ struct pid_new_effect ULONG type_coll; }; +struct pid_effect_state +{ + BYTE id; + ULONG collection; +}; + struct hid_joystick { struct dinput_device base; @@ -193,6 +199,7 @@ struct hid_joystick struct pid_block_free pid_block_free; struct pid_block_load pid_block_load; struct pid_new_effect pid_new_effect; + struct pid_effect_state pid_effect_state; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -535,12 +542,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (!caps->usage_page) continue; if (caps->flags & HID_VALUE_CAPS_IS_BUTTON) continue; - if (caps->usage_page == HID_USAGE_PAGE_PID) - { - value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); - object += caps->usage_max - caps->usage_min + 1; - } - else if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) + if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) value_ofs += (caps->usage_max - caps->usage_min + 1) * sizeof(LONG); else for (j = caps->usage_min; j <= caps->usage_max; ++j) { @@ -613,12 +615,7 @@ static BOOL enum_objects( struct hid_joystick *impl, const DIPROPHEADER *filter, if (!caps->usage_page) continue; if (!(caps->flags & HID_VALUE_CAPS_IS_BUTTON)) continue; - if (caps->usage_page == HID_USAGE_PAGE_PID) - { - button_ofs += caps->usage_max - caps->usage_min + 1; - object += caps->usage_max - caps->usage_min + 1; - } - else if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) + if (caps->usage_page >= HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN) button_ofs += caps->usage_max - caps->usage_min + 1; else for (j = caps->usage_min; j <= caps->usage_max; ++j) { @@ -1290,6 +1287,8 @@ static BOOL enum_objects_callback( struct hid_joystick *impl, struct hid_value_c DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct enum_objects_params *params = data; + if (instance->wUsagePage == HID_USAGE_PAGE_PID && !(instance->dwType & DIDFT_NODATA)) + return DIENUM_CONTINUE; return params->callback( instance, params->context ); } @@ -1605,6 +1604,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * struct pid_block_free *block_free = &impl->pid_block_free; struct pid_block_load *block_load = &impl->pid_block_load; struct pid_new_effect *new_effect = &impl->pid_new_effect; + struct pid_effect_state *effect_state = &impl->pid_effect_state; #define SET_COLLECTION( rep ) \ do \ @@ -1640,6 +1640,7 @@ static BOOL init_pid_reports( struct hid_joystick *impl, struct hid_value_caps * case PID_USAGE_BLOCK_FREE_REPORT: SET_COLLECTION( block_free ); break; case PID_USAGE_BLOCK_LOAD_REPORT: SET_COLLECTION( block_load ); break; case PID_USAGE_CREATE_NEW_EFFECT_REPORT: SET_COLLECTION( new_effect ); break; + case PID_USAGE_STATE_REPORT: SET_COLLECTION( effect_state ); break; case PID_USAGE_DEVICE_CONTROL: SET_SUB_COLLECTION( device_control, control_coll ); break; case PID_USAGE_EFFECT_OPERATION: SET_SUB_COLLECTION( effect_control, control_coll ); break; @@ -1677,8 +1678,7 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap struct pid_block_free *block_free = &impl->pid_block_free; struct pid_block_load *block_load = &impl->pid_block_load; struct pid_new_effect *new_effect = &impl->pid_new_effect; - - if (!(instance->dwType & DIDFT_OUTPUT)) return DIENUM_CONTINUE; + struct pid_effect_state *effect_state = &impl->pid_effect_state; #define SET_REPORT_ID( rep ) \ do \ @@ -1689,6 +1689,11 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap FIXME( "multiple " #rep " report ids!\n" ); \ } while (0) + if (instance->wCollectionNumber == effect_state->collection) + SET_REPORT_ID( effect_state ); + + if (!(instance->dwType & DIDFT_OUTPUT)) return DIENUM_CONTINUE; + if (instance->wCollectionNumber == device_control->control_coll) SET_REPORT_ID( device_control ); if (instance->wCollectionNumber == effect_control->control_coll) @@ -1956,7 +1961,7 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, impl->usages_buf = usages; enum_objects( impl, &filter, DIDFT_COLLECTION, init_pid_reports, NULL ); - enum_objects( impl, &filter, DIDFT_NODATA, init_pid_caps, NULL ); + enum_objects( impl, &filter, DIDFT_NODATA | DIDFT_BUTTON | DIDFT_AXIS, init_pid_caps, NULL ); TRACE( "device control id %u, coll %u, control coll %u\n", impl->pid_device_control.id, impl->pid_device_control.collection, impl->pid_device_control.control_coll ); @@ -1976,6 +1981,7 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, impl->pid_block_load.collection, impl->pid_block_load.status_coll ); TRACE( "create new effect id %u, coll %u, type_coll %u\n", impl->pid_new_effect.id, impl->pid_new_effect.collection, impl->pid_new_effect.type_coll ); + TRACE( "effect state id %u, coll %u\n", impl->pid_effect_state.id, impl->pid_effect_state.collection ); if (impl->pid_device_control.id) {

1 0

Vijay Kiran Kamuju : ntdll: Implement RtlInitializeGenericTable.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 82a4f2e0ecd55090836e95feeb7cc75c20e6f833 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a4f2e0ecd55090836e95fe… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Nov 30 20:15:55 2021 -0700 ntdll: Implement RtlInitializeGenericTable. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/rtl.c | 13 ++++++++++++- include/ddk/ntddk.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1e359e4a043..f77e4058378 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -429,7 +429,18 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM PRTL_GENERIC_ALLOCATE_ROUTINE allocate, PRTL_GENERIC_FREE_ROUTINE free, void *context) { - FIXME("(%p, %p, %p, %p, %p) stub!\n", table, compare, allocate, free, context); + TRACE("(%p, %p, %p, %p, %p)\n", table, compare, allocate, free, context); + + table->TableRoot = NULL; + table->InsertOrderList.Flink = &table->InsertOrderList; + table->InsertOrderList.Blink = &table->InsertOrderList; + table->OrderedPointer = &table->InsertOrderList; + table->NumberGenericTableElements = 0; + table->WhichOrderedElement = 0; + table->CompareRoutine = compare; + table->AllocateRoutine = allocate; + table->FreeRoutine = free; + table->TableContext = context; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..3a1d68b1fa8 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*);

1 0

Rémi Bernon : winebus.sys: Send PID effect state reports for UDEV lnxev devices.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: b89204385b2fcfc6ba814de97b5b0a241e10a6e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89204385b2fcfc6ba814de9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:49 2021 +0100 winebus.sys: Send PID effect state reports for UDEV lnxev devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2ec15ecb6ad..540a4da508f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -197,6 +197,7 @@ struct lnxev_device int haptic_effect_id; int effect_ids[256]; + LONG effect_flags; }; static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) @@ -719,7 +720,10 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d static BOOL set_report_from_event(struct unix_device *iface, struct input_event *ie) { + struct hid_effect_state *effect_state = &iface->hid_physical.effect_state; struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); + ULONG effect_flags = InterlockedOr(&impl->effect_flags, 0); + unsigned int i; switch (ie->type) { @@ -750,6 +754,14 @@ static BOOL set_report_from_event(struct unix_device *iface, struct input_event case EV_REL: hid_device_set_rel_axis(iface, impl->rel_map[ie->code], ie->value); return FALSE; + case EV_FF_STATUS: + for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) if (impl->effect_ids[i] == ie->code) break; + if (i == ARRAY_SIZE(impl->effect_ids)) return FALSE; + + if (ie->value == FF_STATUS_PLAYING) effect_flags |= EFFECT_STATE_EFFECT_PLAYING; + hid_device_set_effect_state(iface, i, effect_flags); + bus_event_queue_input_report(&event_queue, iface, effect_state->report_buf, effect_state->report_len); + return FALSE; default: ERR("TODO: Process Report (%i, %i)\n",ie->type, ie->code); return FALSE; @@ -883,6 +895,8 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, }; if (write(impl->base.device_fd, &ie, sizeof(ie)) == -1) WARN("write failed %d %s\n", errno, strerror(errno)); + else + InterlockedOr(&impl->effect_flags, EFFECT_STATE_ACTUATORS_ENABLED); return STATUS_SUCCESS; } case PID_USAGE_DC_DISABLE_ACTUATORS: @@ -895,6 +909,8 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, }; if (write(impl->base.device_fd, &ie, sizeof(ie)) == -1) WARN("write failed %d %s\n", errno, strerror(errno)); + else + InterlockedAnd(&impl->effect_flags, ~EFFECT_STATE_ACTUATORS_ENABLED); return STATUS_SUCCESS; } case PID_USAGE_DC_STOP_ALL_EFFECTS: @@ -915,9 +931,11 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_PAUSE: WARN("device pause not supported\n"); + InterlockedOr(&impl->effect_flags, EFFECT_STATE_DEVICE_PAUSED); return STATUS_NOT_SUPPORTED; case PID_USAGE_DC_DEVICE_CONTINUE: WARN("device continue not supported\n"); + InterlockedAnd(&impl->effect_flags, ~EFFECT_STATE_DEVICE_PAUSED); return STATUS_NOT_SUPPORTED; }

1 0

Rémi Bernon : hidclass.sys: Only drop input reports when length is too short.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: c2f473d6c413e05cd1760c5c712170594a9700ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f473d6c413e05cd1760c5c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Dec 2 10:47:44 2021 +0100 hidclass.sys: Only drop input reports when length is too short. And add some warnings when we do. This otherwise makes the effect state reports from the tests to be always dropped as they are shorter than the returned length, which is the read buffer size and the maximum input report length. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index fb21e230ec4..dd288a82b67 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -322,7 +322,6 @@ static DWORD CALLBACK hid_device_thread(void *args) packet = malloc( sizeof(*packet) + desc->InputLength ); buffer = (BYTE *)(packet + 1); - packet->reportBuffer = buffer; report = find_report_with_type_and_id( ext, HidP_Input, 0, TRUE ); if (!report) WARN("no input report found.\n"); @@ -331,6 +330,7 @@ static DWORD CALLBACK hid_device_thread(void *args) do { packet->reportId = buffer[0] = report_id; + packet->reportBuffer = buffer; packet->reportBufferLen = desc->InputLength; if (!report_id) @@ -345,13 +345,17 @@ static DWORD CALLBACK hid_device_thread(void *args) if (io.Status == STATUS_SUCCESS) { if (!report_id) io.Information++; - packet->reportId = buffer[0]; - packet->reportBuffer = buffer; - packet->reportBufferLen = io.Information; - - report = find_report_with_type_and_id( ext, HidP_Input, buffer[0], FALSE ); - if (polled || (report && report->InputLength == io.Information)) + if (!(report = find_report_with_type_and_id( ext, HidP_Input, buffer[0], FALSE ))) + WARN( "dropping unknown input id %u\n", buffer[0] ); + else if (!polled && io.Information < report->InputLength) + WARN( "dropping short report, len %u expected %u\n", (ULONG)io.Information, report->InputLength ); + else + { + packet->reportId = buffer[0]; + packet->reportBuffer = buffer; + packet->reportBufferLen = io.Information; hid_device_queue_input( device, packet ); + } } res = WaitForSingleObject(ext->u.pdo.halt_event, polled ? ext->u.pdo.poll_interval : 0);

1 0

Mohamad Al-Jaf : kernelbase: Add SetCachedSigningLevel stub.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 04d1cab16a993f52dbb586d41ad625859e050518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04d1cab16a993f52dbb586d4… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Nov 30 19:14:38 2021 -0500 kernelbase: Add SetCachedSigningLevel stub. Needed for Microsoft Edge offline installer. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ include/winbase.h | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index fc9af375db6..771407fc203 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -87,7 +87,7 @@ @ stub QuerySecurityAccessMask @ stdcall RevertToSelf() advapi32.RevertToSelf @ stdcall SetAclInformation(ptr ptr long long) advapi32.SetAclInformation -@ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) kernelbase.SetCachedSigningLevel @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 015324f7677..0e5f953aa50 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1343,6 +1343,7 @@ @ stdcall -import SearchPathA(str str str long ptr ptr) @ stdcall -import SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetCPGlobal(long) +@ stdcall -import SetCachedSigningLevel(ptr long long long) @ stdcall SetCalendarInfoA(long long long str) @ stdcall -import SetCalendarInfoW(long long long wstr) # @ stub SetClientTimeZoneInformation diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7bc0c262fdd..da3d5e4035b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1393,7 +1393,7 @@ @ stdcall SearchPathA(str str str long ptr ptr) @ stdcall SearchPathW(wstr wstr wstr long ptr ptr) @ stdcall SetAclInformation(ptr ptr long long) -# @ stub SetCachedSigningLevel +@ stdcall SetCachedSigningLevel(ptr long long long) @ stdcall SetCalendarInfoW(long long long wstr) # @ stub SetClientDynamicTimeZoneInformation # @ stub SetClientTimeZoneInformation diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 472076cf7fe..71e09bdefb5 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -1547,3 +1547,12 @@ BOOL WINAPI SetAclInformation( PACL acl, LPVOID info, DWORD len, ACL_INFORMATION FIXME( "%p %p 0x%08x 0x%08x - stub\n", acl, info, len, class ); return TRUE; } + +/****************************************************************************** + * SetCachedSigningLevel (kernelbase.@) + */ +BOOL WINAPI SetCachedSigningLevel( PHANDLE source, ULONG count, ULONG flags, HANDLE file ) +{ + FIXME( "%p %u %u %p - stub\n", source, count, flags, file ); + return TRUE; +} diff --git a/include/winbase.h b/include/winbase.h index 2928385bde6..8e8a185b4ff 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2611,6 +2611,7 @@ WINBASEAPI DWORD WINAPI SearchPathA(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR WINBASEAPI DWORD WINAPI SearchPathW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); #define SearchPath WINELIB_NAME_AW(SearchPath) WINADVAPI BOOL WINAPI SetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI BOOL WINAPI SetCachedSigningLevel(PHANDLE,ULONG,ULONG,HANDLE); WINBASEAPI BOOL WINAPI SetCommConfig(HANDLE,LPCOMMCONFIG,DWORD); WINBASEAPI BOOL WINAPI SetCommBreak(HANDLE); WINBASEAPI BOOL WINAPI SetCommMask(HANDLE,DWORD);

1 0

Vijay Kiran Kamuju : ntdll: Add stub RtlGetElementGenericTable function.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 87c7648f15bd30df6d43d1066be16cb0ae1eaaae URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c7648f15bd30df6d43d106… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Nov 30 20:15:57 2021 -0700 ntdll: Add stub RtlGetElementGenericTable function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49426 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 343db34cb6d..695a30cf25c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -708,7 +708,7 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) -@ stub RtlGetElementGenericTable +@ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 3f05a2ad7d4..9b93c8fad28 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -464,6 +464,15 @@ ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) return table->NumberGenericTableElements; } +/****************************************************************************** + * RtlGetElementGenericTable [NTDLL.@] + */ +void * WINAPI RtlGetElementGenericTable(RTL_GENERIC_TABLE *table, ULONG index) +{ + FIXME("(%p, %u) stub!\n", table, index); + return NULL; +} + /****************************************************************************** * RtlMoveMemory [NTDLL.@] * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0cd50785ad6..7bfbebc92a8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1098,7 +1098,7 @@ @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetDefaultCodePage -@ stub RtlGetElementGenericTable +@ stdcall RtlGetElementGenericTable(ptr long) @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetExtendedContextLength(long ptr) @ stdcall RtlGetExtendedContextLength2(long ptr int64) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 569552bcad0..2940436d0ca 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*);

1 0

Alex Henrie : krnl386: Add GetLPErrMode stub.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 819d049f1277090033bcfe17783490cd6b190c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=819d049f1277090033bcfe17… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 1 22:35:23 2021 -0700 krnl386: Add GetLPErrMode stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52102 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 +- dlls/krnl386.exe16/task.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index 6a55aad78f8..d98e136c77e 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -100,7 +100,7 @@ 96 pascal -ret16 FreeLibrary(word) FreeLibrary16 97 pascal -ret16 GetTempFileName(word str word ptr) GetTempFileName16 98 pascal -ret16 GetLastDiskChange() KERNEL_nop -99 stub GetLPErrMode +99 pascal GetLPErrMode() 100 pascal -ret16 ValidateCodeSegments() KERNEL_nop 101 stub NoHookDosCall 102 pascal -register DOS3Call() DOS3Call diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 892f4d19f07..30a40328c86 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -1255,6 +1255,16 @@ WORD WINAPI GetExeVersion16(void) } +/*********************************************************************** + * GetLPErrMode (KERNEL.99) + */ +SEGPTR WINAPI GetLPErrMode(void) +{ + FIXME("(): stub\n"); + return 0; +} + + /*********************************************************************** * SetErrorMode (KERNEL.107) */

1 0

Zebediah Figura : configure: Try to detect MinGW FAudio using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 872d13d14a222dd30893f7b5c868e57f87e2ebe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=872d13d14a222dd30893f7b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:39 2021 -0600 configure: Try to detect MinGW FAudio using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 9 +++++ 2 files changed, 120 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 990d28a37fc..21adceb6c69 100755 --- a/configure +++ b/configure @@ -12353,7 +12353,117 @@ fi done test -n "$MINGW_PKG_CONFIG" || MINGW_PKG_CONFIG="false" -if ${ZLIB_PE_CFLAGS:+false} : +if ${FAUDIO_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + FAUDIO_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags FAudio 2>/dev/null` +fi +fi +if ${FAUDIO_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + FAUDIO_PE_LIBS=`$MINGW_PKG_CONFIG --libs FAudio 2>/dev/null` +fi +fi +FAUDIO_PE_LIBS=${FAUDIO_PE_LIBS:-"-lFAudio"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $FAUDIO_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW FAudio.h" >&5 +printf %s "checking for MinGW FAudio.h... " >&6; } +if test ${ac_cv_mingw_header_FAudio_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <FAudio.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_FAudio_h=yes +else $as_nop + ac_cv_mingw_header_FAudio_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_FAudio_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_FAudio_h" >&6; } +if test "x$ac_cv_mingw_header_FAudio_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FAudio_CommitOperationSet in MinGW -lFAudio" >&5 +printf %s "checking for FAudio_CommitOperationSet in MinGW -lFAudio... " >&6; } +if test ${ac_cv_mingw_lib_FAudio+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-lFAudio $FAUDIO_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char FAudio_CommitOperationSet (); +int +main (void) +{ +return FAudio_CommitOperationSet (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_FAudio=yes +else $as_nop + ac_cv_mingw_lib_FAudio=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_FAudio" >&5 +printf "%s\n" "$ac_cv_mingw_lib_FAudio" >&6; } +if test "x$ac_cv_mingw_lib_FAudio" = xyes +then : + : +else $as_nop + FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS="" +fi +else $as_nop + FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$FAUDIO_PE_LIBS" = "x" + then + as_fn_append wine_notices "|FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version." + fi + + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} then : diff --git a/configure.ac b/configure.ac index ef542dee171..0078d1f33aa 100644 --- a/configure.ac +++ b/configure.ac @@ -1035,6 +1035,15 @@ dnl **** External libraries **** if test "x$with_system_dllpath" != "x" -a "$CROSSCC" != "false" then + WINE_MINGW_PACKAGE_FLAGS(FAUDIO,[FAudio],[-lFAudio], + [WINE_CHECK_MINGW_HEADER(FAudio.h, + [WINE_CHECK_MINGW_LIB(FAudio,FAudio_CommitOperationSet,[:],[FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS=""],[$FAUDIO_PE_LIBS])], + [FAUDIO_PE_CFLAGS=""; FAUDIO_PE_LIBS=""])]) + if test "x$FAUDIO_PE_LIBS" = "x" + then + WINE_NOTICE([FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW libjpeg using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 8459b0d5e0503dee61068a6e4271588af500ab43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8459b0d5e0503dee61068a6e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:40 2021 -0600 configure: Try to detect MinGW libjpeg using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 ++++++ 2 files changed, 122 insertions(+) diff --git a/configure b/configure index 21adceb6c69..1d1e9a7be6f 100755 --- a/configure +++ b/configure @@ -12463,6 +12463,117 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version." fi + if ${JPEG_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + JPEG_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags libjpeg 2>/dev/null` +fi +fi +if ${JPEG_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + JPEG_PE_LIBS=`$MINGW_PKG_CONFIG --libs libjpeg 2>/dev/null` +fi +fi + +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $JPEG_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW jpeglib.h" >&5 +printf %s "checking for MinGW jpeglib.h... " >&6; } +if test ${ac_cv_mingw_header_jpeglib_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stddef.h> + #include <stdio.h> +#include <jpeglib.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_jpeglib_h=yes +else $as_nop + ac_cv_mingw_header_jpeglib_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_jpeglib_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_jpeglib_h" >&6; } +if test "x$ac_cv_mingw_header_jpeglib_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_decompress in MinGW -ljpeg" >&5 +printf %s "checking for jpeg_start_decompress in MinGW -ljpeg... " >&6; } +if test ${ac_cv_mingw_lib_jpeg+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-ljpeg $JPEG_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char jpeg_start_decompress (); +int +main (void) +{ +return jpeg_start_decompress (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_jpeg=yes +else $as_nop + ac_cv_mingw_lib_jpeg=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_jpeg" >&5 +printf "%s\n" "$ac_cv_mingw_lib_jpeg" >&6; } +if test "x$ac_cv_mingw_lib_jpeg" = xyes +then : + : +else $as_nop + JPEG_PE_CFLAGS=""; JPEG_PE_LIBS="" +fi +else $as_nop + JPEG_PE_CFLAGS=""; JPEG_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$JPEG_PE_LIBS" = "x" + then + as_fn_append wine_notices "|libjpeg ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index 0078d1f33aa..bd8e4495274 100644 --- a/configure.ac +++ b/configure.ac @@ -1044,6 +1044,17 @@ then WINE_NOTICE([FAudio ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(JPEG,[libjpeg],, + [WINE_CHECK_MINGW_HEADER(jpeglib.h, + [WINE_CHECK_MINGW_LIB(jpeg,jpeg_start_decompress,[:],[JPEG_PE_CFLAGS=""; JPEG_PE_LIBS=""],[$JPEG_PE_LIBS])], + [JPEG_PE_CFLAGS=""; JPEG_PE_LIBS=""], + [#include <stddef.h> + #include <stdio.h>])]) + if test "x$JPEG_PE_LIBS" = "x" + then + WINE_NOTICE([libjpeg ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0

Zebediah Figura : configure: Try to detect MinGW liblcms2 using pkg-config if --with-system-dllpath is specified.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: d0add9f8d9456d36f32f6b69013b42c959223a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0add9f8d9456d36f32f6b69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 1 15:03:41 2021 -0600 configure: Try to detect MinGW liblcms2 using pkg-config if --with-system-dllpath is specified. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++ 2 files changed, 119 insertions(+) diff --git a/configure b/configure index 1d1e9a7be6f..9a6a1aa868a 100755 --- a/configure +++ b/configure @@ -12574,6 +12574,116 @@ CPPFLAGS=$ac_save_CPPFLAGS as_fn_append wine_notices "|libjpeg ${notice_platform}MinGW development files not found; using bundled version." fi + if ${LCMS2_PE_CFLAGS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + LCMS2_PE_CFLAGS=`$MINGW_PKG_CONFIG --cflags lcms2 2>/dev/null` +fi +fi +if ${LCMS2_PE_LIBS:+false} : +then : + if test ${MINGW_PKG_CONFIG+y} +then : + LCMS2_PE_LIBS=`$MINGW_PKG_CONFIG --libs lcms2 2>/dev/null` +fi +fi +LCMS2_PE_LIBS=${LCMS2_PE_LIBS:-"-llcms2"} +ac_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$CPPFLAGS $LCMS2_PE_CFLAGS" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MinGW lcms2.h" >&5 +printf %s "checking for MinGW lcms2.h... " >&6; } +if test ${ac_cv_mingw_header_lcms2_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <lcms2.h> +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_mingw_header_lcms2_h=yes +else $as_nop + ac_cv_mingw_header_lcms2_h=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_header_lcms2_h" >&5 +printf "%s\n" "$ac_cv_mingw_header_lcms2_h" >&6; } +if test "x$ac_cv_mingw_header_lcms2_h" = xyes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cmsOpenProfileFromFile in MinGW -llcms2" >&5 +printf %s "checking for cmsOpenProfileFromFile in MinGW -llcms2... " >&6; } +if test ${ac_cv_mingw_lib_lcms2+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_check_headers_saved_cc=$CC +ac_wine_check_headers_saved_exeext=$ac_exeext +ac_wine_check_headers_saved_libs=$LIBS +CC="$CROSSCC" +ac_exeext=".exe" +LIBS="-llcms2 $LCMS2_PE_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char cmsOpenProfileFromFile (); +int +main (void) +{ +return cmsOpenProfileFromFile (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_mingw_lib_lcms2=yes +else $as_nop + ac_cv_mingw_lib_lcms2=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CC=$ac_wine_check_headers_saved_cc +ac_exeext=$ac_wine_check_headers_saved_exeext +LIBS=$ac_wine_check_headers_saved_libs +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_mingw_lib_lcms2" >&5 +printf "%s\n" "$ac_cv_mingw_lib_lcms2" >&6; } +if test "x$ac_cv_mingw_lib_lcms2" = xyes +then : + : +else $as_nop + LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS="" +fi +else $as_nop + LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS="" +fi +CPPFLAGS=$ac_save_CPPFLAGS + + if test "x$LCMS2_PE_LIBS" = "x" + then + as_fn_append wine_notices "|liblcms2 ${notice_platform}MinGW development files not found; using bundled version." + fi + if ${ZLIB_PE_CFLAGS:+false} : then : if test ${MINGW_PKG_CONFIG+y} diff --git a/configure.ac b/configure.ac index bd8e4495274..2a9a397ec01 100644 --- a/configure.ac +++ b/configure.ac @@ -1055,6 +1055,15 @@ then WINE_NOTICE([libjpeg ${notice_platform}MinGW development files not found; using bundled version.]) fi + WINE_MINGW_PACKAGE_FLAGS(LCMS2,[lcms2],[-llcms2], + [WINE_CHECK_MINGW_HEADER(lcms2.h, + [WINE_CHECK_MINGW_LIB(lcms2,cmsOpenProfileFromFile,[:],[LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS=""],[$LCMS2_PE_LIBS])], + [LCMS2_PE_CFLAGS=""; LCMS2_PE_LIBS=""])]) + if test "x$LCMS2_PE_LIBS" = "x" + then + WINE_NOTICE([liblcms2 ${notice_platform}MinGW development files not found; using bundled version.]) + fi + WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], [WINE_CHECK_MINGW_HEADER(zlib.h, [WINE_CHECK_MINGW_LIB(z,inflate,[:],[ZLIB_PE_CFLAGS=""; ZLIB_PE_LIBS=""],[$ZLIB_PE_LIBS])],

1 0