wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Nikolay Sivov : evr/mixer: Implement stream rectangle scaling.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 8c0c3d296fc321e7423d801bc14f5a88fbcacee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c0c3d296fc321e7423d801b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 15:30:25 2021 +0300 evr/mixer: Implement stream rectangle scaling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 631ee1ba645..30b4ed31b3f 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1245,17 +1245,29 @@ static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int } } +static void video_mixer_normalize_rect(const RECT *full, const RECT *part, MFVideoNormalizedRect *ret) +{ + float width = full->right - full->left; + float height = full->bottom - full->top; + + ret->left = (part->left - full->left) / width; + ret->right = (part->right - full->left) / width; + ret->bottom = (part->bottom - full->top) / height; + ret->top = (part->top - full->top) / height; +} + static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { DXVA2_VideoSample samples[MAX_MIXER_INPUT_STREAMS] = {{ 0 }}; DXVA2_VideoProcessBltParams params = { 0 }; - MFVideoNormalizedRect zoom_rect; + MFVideoNormalizedRect zoom_rect, norm; + unsigned int i, sample_count = 0; + D3DSURFACE_DESC desc, rt_desc; struct input_stream *stream; - D3DSURFACE_DESC desc; HRESULT hr = S_OK; - unsigned int i; + RECT dst; - IDirect3DSurface9_GetDesc(rt, &desc); + IDirect3DSurface9_GetDesc(rt, &rt_desc); if (FAILED(IMFAttributes_GetBlob(mixer->attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&zoom_rect, sizeof(zoom_rect), NULL))) @@ -1264,10 +1276,13 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - video_mixer_scale_rect(&params.TargetRect, desc.Width, desc.Height, &zoom_rect); + SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); for (i = 0; i < mixer->input_count; ++i) { + RECT stream_dst, stream_vis; + IDirect3DSurface9 *surface; stream = mixer->zorder[i]; @@ -1280,22 +1295,47 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) IDirect3DSurface9_GetDesc(surface, &desc); - samples[i].SampleFormat.SampleFormat = stream->id == 0 ? DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; - samples[i].SrcSurface = surface; - SetRect(&samples[i].SrcRect, 0, 0, desc.Width, desc.Height); - video_mixer_scale_rect(&samples[i].DstRect, desc.Width, desc.Height, &stream->rect); + /* In order to compute source/destination rectangles for each stream: + + * per-stream rectangle is used to get destination rectangle in target coordinates; + * destination per-stream rectangle is clipped with zoom rectangle, applied to target coordinates; + * visible rectangle is scaled back to get source area of the stream that would be visible; + * visible rectangle is scaled back to get destination area in target coordinates for given steam. + + */ + + video_mixer_scale_rect(&stream_dst, rt_desc.Width, rt_desc.Height, &stream->rect); + + /* Part of the stream that's visible after zooming. */ + if (!IntersectRect(&stream_vis, &stream_dst, &dst)) + { + IDirect3DSurface9_Release(surface); + continue; + } + + samples[sample_count].SampleFormat.SampleFormat = stream->id == 0 ? + DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; + samples[sample_count].SrcSurface = surface; + + video_mixer_normalize_rect(&stream_dst, &stream_vis, &norm); + video_mixer_scale_rect(&samples[sample_count].SrcRect, desc.Width, desc.Height, &norm); + + video_mixer_normalize_rect(&dst, &stream_vis, &norm); + video_mixer_scale_rect(&samples[sample_count].DstRect, rt_desc.Width, rt_desc.Height, &norm); + + sample_count++; } if (SUCCEEDED(hr)) { if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, - mixer->input_count, NULL))) + sample_count, NULL))) { WARN("Failed to process samples, hr %#x.\n", hr); } } - for (i = 0; i < mixer->input_count; ++i) + for (i = 0; i < sample_count; ++i) { if (samples[i].SrcSurface) IDirect3DSurface9_Release(samples[i].SrcSurface);

1 0

Nikolay Sivov : dxva2: Remove AYUV from accepted input formats.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 2095a4132f88d1f6c17be14a43db78c45870b918 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2095a4132f88d1f6c17be14a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 29 15:18:26 2021 +0300 dxva2: Remove AYUV from accepted input formats. It was added for completeness only, and it appears to be not universally support on Windows via regular d3d9 API. DXVA might be using different path to present video frames, but we don't make such distinction at the moment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 3 +-- dlls/dxva2/tests/dxva2.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index f91b033055c..2fab82ff476 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -381,8 +381,7 @@ static BOOL dxva_is_supported_stream_format(const DXVA2_VideoDesc *video_desc) { return video_desc->Format == D3DFMT_A8R8G8B8 || video_desc->Format == D3DFMT_X8R8G8B8 || - video_desc->Format == D3DFMT_YUY2 || - video_desc->Format == MAKEFOURCC('A','Y','U','V'); + video_desc->Format == D3DFMT_YUY2; } static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorDeviceGuids( diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 4b09e93e87a..ab0a2769bd2 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -356,7 +356,9 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); + todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n"); CoTaskMemFree(guids);

1 0

Rémi Bernon : dinput: Move device data format to struct dinput_device.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: f0cd5c5c3cd29255de10ca41bfdfe81e7cd5da8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0cd5c5c3cd29255de10ca41… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 09:40:41 2021 +0200 dinput: Move device data format to struct dinput_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 26 +++++++++++++------------- dlls/dinput/device_private.h | 7 +------ dlls/dinput/joystick_hid.c | 4 ++-- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 1eed223f51c..d375229e2c0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -268,7 +268,7 @@ static BOOL match_device_object( DIDATAFORMAT *device_format, DIDATAFORMAT *user static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DIDATAFORMAT *format ) { - DIDATAFORMAT *user_format, *device_format = impl->data_format.wine_df; + DIDATAFORMAT *user_format, *device_format = impl->device_format; DIOBJECTDATAFORMAT *user_obj, *match_obj; DWORD i; @@ -314,7 +314,7 @@ failed: static int id_to_offset( struct dinput_device *impl, int id ) { - DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format = impl->user_format; + DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; DIOBJECTDATAFORMAT *user_obj; if (!user_format) return -1; @@ -338,9 +338,9 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic ) DWORD instance; int i; - for (i = 0; i < This->data_format.wine_df->dwNumObjs && !found; i++) + for (i = 0; i < This->device_format->dwNumObjs && !found; i++) { - LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i); + LPDIOBJECTDATAFORMAT odf = dataformat_to_odf( This->device_format, i ); if (byofs && value != odf->dwOfs) continue; if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue; @@ -747,8 +747,8 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) free( This->data_queue ); /* Free data format */ - free( This->data_format.wine_df->rgodf ); - free( This->data_format.wine_df ); + free( This->device_format->rgodf ); + free( This->device_format ); dinput_device_release_user_format( This ); /* Free action mapping */ @@ -884,7 +884,7 @@ static HRESULT WINAPI dinput_device_EnumObjects( IDirectInputDevice8W *iface, static HRESULT enum_object_filter_init( struct dinput_device *impl, DIPROPHEADER *filter ) { - DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format = impl->user_format; + DIDATAFORMAT *device_format = impl->device_format, *user_format = impl->user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (filter->dwHow > DIPH_BYUSAGE) return DIERR_INVALIDPARAM; @@ -1224,7 +1224,7 @@ static HRESULT WINAPI dinput_device_GetObjectInfo( IDirectInputDevice8W *iface, static HRESULT WINAPI dinput_device_GetDeviceState( IDirectInputDevice8W *iface, DWORD size, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *device_format = impl->data_format.wine_df, *user_format; + DIDATAFORMAT *device_format = impl->device_format, *user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; BYTE *user_state = data; DIPROPHEADER filter = @@ -1595,7 +1595,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface, break; default: devMask = DIGENRE_ANY; - df = impl->data_format.wine_df; + df = impl->device_format; break; } @@ -1684,7 +1684,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D df = &c_dfDIMouse2; break; default: - df = impl->data_format.wine_df; + df = impl->device_format; break; } @@ -1843,7 +1843,7 @@ HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->caps.dwSize = sizeof(DIDEVCAPS); This->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; - This->data_format.wine_df = format; + This->device_format = format; InitializeCriticalSection( &This->crit ); This->dinput = dinput; IDirectInput_AddRef( &dinput->IDirectInput7A_iface ); @@ -1871,7 +1871,7 @@ static const GUID *object_instance_guid( const DIDEVICEOBJECTINSTANCEW *instance static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, void *data ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( data ); - DIDATAFORMAT *format = impl->data_format.wine_df; + DIDATAFORMAT *format = impl->device_format; DIOBJECTDATAFORMAT *obj_format; if (!format->rgodf) @@ -1904,7 +1904,7 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance, HRESULT dinput_device_init( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); - DIDATAFORMAT *format = impl->data_format.wine_df; + DIDATAFORMAT *format = impl->device_format; ULONG i, size; IDirectInputDevice8_EnumObjects( iface, enum_objects_init, iface, DIDFT_ALL ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 190e2c16ffe..e77d0190a48 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -28,11 +28,6 @@ #include "wine/list.h" #include "dinput_private.h" -typedef struct -{ - LPDIDATAFORMAT wine_df; /* wine internal data format */ -} DataFormat; - typedef struct { unsigned int offset; @@ -88,7 +83,7 @@ struct dinput_device BOOL overflow; /* return DI_BUFFEROVERFLOW in 'GetDeviceData' */ DWORD buffersize; /* size of the queue - set in 'SetProperty' */ - DataFormat data_format; /* user data format and wine to user format converter */ + DIDATAFORMAT *device_format; DIDATAFORMAT *user_format; /* Action mapping */ diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 13d71a270b6..d7e64af9928 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1115,7 +1115,7 @@ static HRESULT hid_joystick_read( IDirectInputDevice8W *iface ) }; struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG i, count, report_len = impl->caps.InputReportByteLength; - DIDATAFORMAT *format = impl->base.data_format.wine_df; + DIDATAFORMAT *format = impl->base.device_format; struct parse_device_state_params params = {{0}}; char *report_buf = impl->input_report_buf; USAGE_AND_PAGE *usages; @@ -2009,7 +2009,7 @@ static BOOL get_parameters_object_id( struct hid_joystick *impl, struct hid_valu static BOOL get_parameters_object_ofs( struct hid_joystick *impl, struct hid_value_caps *caps, DIDEVICEOBJECTINSTANCEW *instance, void *data ) { - DIDATAFORMAT *device_format = impl->base.data_format.wine_df, *user_format = impl->base.user_format; + DIDATAFORMAT *device_format = impl->base.device_format, *user_format = impl->base.user_format; DIOBJECTDATAFORMAT *device_obj, *user_obj; if (!user_format) return DIENUM_CONTINUE;

1 0

Rémi Bernon : dinput: Rewrite and simplify user data format object matching.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 4e56801abda2d3160880be45010eb3f2970a814d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e56801abda2d3160880be45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 09:40:40 2021 +0200 dinput: Rewrite and simplify user data format object matching. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 280 +++++++++---------------------------------- dlls/dinput/device_private.h | 8 -- dlls/dinput8/tests/hid.c | 5 - 3 files changed, 55 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e56801abda2d3160880…

1 0

Rémi Bernon : dinput: Use user object data format array to keep user offsets.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 621af39c11a6fb24a85a88ac35085d9f860c13cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=621af39c11a6fb24a85a88ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 09:40:39 2021 +0200 dinput: Use user object data format array to keep user offsets. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 231 ++++++++++++++++--------------------------- dlls/dinput/device_private.h | 4 - dlls/dinput/joystick_hid.c | 21 ++-- dlls/dinput8/tests/hid.c | 1 - 4 files changed, 100 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=621af39c11a6fb24a85a…

1 0

Alexandre Julliard : ctapi32: Move libctapi.so interface to a separate Unix library.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 6677ba78348041d8b1bbd3fe8534a631558056ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=6677ba78348041d8b1bbd3fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:37:35 2021 +0200 ctapi32: Move libctapi.so interface to a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/Makefile.in | 6 +-- dlls/ctapi32/ctapi.h | 107 ---------------------------------------------- dlls/ctapi32/ctapi32.c | 89 +++++++++++++++----------------------- dlls/ctapi32/ctapi32.spec | 6 +-- dlls/ctapi32/unixlib.c | 90 ++++++++++++++++++++++++++++++++++++++ dlls/ctapi32/unixlib.h | 68 +++++++++++++++++++++++++++++ 6 files changed, 199 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6677ba78348041d8b1bb…

1 0

Alexandre Julliard : capi2032: Move libcapi20.so interface to a separate Unix library.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 85b063af4cfb48ae270260317a0e3451b0fce74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b063af4cfb48ae27026031… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:37:11 2021 +0200 capi2032: Move libcapi20.so interface to a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/capi2032/Makefile.in | 6 +- dlls/capi2032/cap20wxx.c | 94 ++++++++++++++++--------------- dlls/capi2032/capi2032.spec | 22 ++++---- dlls/capi2032/unixlib.c | 132 ++++++++++++++++++++++++++++++++++++++++++++ dlls/capi2032/unixlib.h | 96 ++++++++++++++++++++++++++++++++ 5 files changed, 293 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85b063af4cfb48ae2702…

1 0

Alexandre Julliard : capi2032: Link directly to libcapi20.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: eab0f52e9bc406bb17628086ea04c37ea2ed8a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab0f52e9bc406bb17628086… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:36:16 2021 +0200 capi2032: Link directly to libcapi20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 45 ++++++---------- configure.ac | 7 +-- dlls/capi2032/Makefile.in | 1 + dlls/capi2032/cap20wxx.c | 134 ++++------------------------------------------ dlls/capi2032/cap20wxx.h | 55 ------------------- include/config.h.in | 3 -- 6 files changed, 31 insertions(+), 214 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eab0f52e9bc406bb1762…

1 0

Alexandre Julliard : twain_32: Fix loading of TWAIN source modules.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 1dd462b62cc02f0e2a04e01720f8ea198d287296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd462b62cc02f0e2a04e017… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:58:38 2021 +0200 twain_32: Fix loading of TWAIN source modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 45f227e180b..f8ec539ba85 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -40,7 +40,7 @@ static HWND DSM_parent; static UINT event_message; struct all_devices { - char *modname; + WCHAR *modname; TW_IDENTITY identity; }; @@ -48,21 +48,23 @@ static int nrdevices = 0; static struct all_devices *devices = NULL; static void -twain_add_onedriver(const char *dsname) { +twain_add_onedriver(const WCHAR *dsname) { HMODULE hmod; DSENTRYPROC dsEntry; TW_IDENTITY fakeOrigin; TW_IDENTITY sourceId; TW_UINT16 ret; + WCHAR path[MAX_PATH]; - hmod = LoadLibraryA(dsname); + swprintf( path, MAX_PATH, L"c:\\windows\\twain_%u\\%s", sizeof(void *) * 8, dsname ); + hmod = LoadLibraryW(path); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname)); + ERR("Failed to load TWAIN Source %s\n", debugstr_w(path)); return; } dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (!dsEntry) { - ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname)); + ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_w(path)); return; } /* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */ @@ -87,12 +89,8 @@ twain_add_onedriver(const char *dsname) { } if (i < nrdevices) break; - if (nrdevices) - devices = HeapReAlloc(GetProcessHeap(), 0, devices, sizeof(devices[0])*(nrdevices+1)); - else - devices = HeapAlloc(GetProcessHeap(), 0, sizeof(devices[0])); - if ((devices[nrdevices].modname = HeapAlloc(GetProcessHeap(), 0, strlen(dsname) + 1))) - lstrcpyA(devices[nrdevices].modname, dsname); + devices = realloc( devices, sizeof(devices[0])*(nrdevices+1) ); + devices[nrdevices].modname = wcsdup( path ); devices[nrdevices].identity = sourceId; nrdevices++; DSM_sourceId++; @@ -107,12 +105,12 @@ twain_autodetect(void) { if (detectionrun) return; detectionrun = TRUE; - twain_add_onedriver("sane.ds"); - twain_add_onedriver("gphoto2.ds"); + twain_add_onedriver(L"sane.ds"); + twain_add_onedriver(L"gphoto2.ds"); #if 0 - twain_add_onedriver("c:\\windows\\Twain_32\\Largan\\sp503a.ds"); - twain_add_onedriver("c:\\windows\\Twain_32\\vivicam10\\vivicam10.ds"); - twain_add_onedriver("c:\\windows\\Twain_32\\ws30slim\\sp500a.ds"); + twain_add_onedriver(L"Largan\\sp503a.ds"); + twain_add_onedriver(L"vivicam10\\vivicam10.ds"); + twain_add_onedriver(L"ws30slim\\sp500a.ds"); #endif } @@ -282,7 +280,6 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) TW_UINT16 i = 0; pTW_IDENTITY pIdentity = (pTW_IDENTITY) pData; activeDS *newSource; - const char *modname = NULL; HMODULE hmod; TRACE("DG_CONTROL/DAT_IDENTITY/MSG_OPENDS\n"); @@ -315,9 +312,9 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) FIXME("Out of memory.\n"); return TWRC_FAILURE; } - hmod = LoadLibraryA(devices[i].modname); + hmod = LoadLibraryW(devices[i].modname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", debugstr_a(modname)); + ERR("Failed to load TWAIN Source %s\n", debugstr_w(devices[i].modname)); DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE;

1 0

Alexandre Julliard : gphoto2.ds: Use the bundled libjpeg and build with msvcrt.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 8f70855f88064173bd30ff8be2505d79d6398db7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f70855f88064173bd30ff8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:35:12 2021 +0200 gphoto2.ds: Use the bundled libjpeg and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 120 ----------------------------------------- configure.ac | 17 ------ dlls/gphoto2.ds/Makefile.in | 6 +-- dlls/gphoto2.ds/capability.c | 2 - dlls/gphoto2.ds/ds_image.c | 80 +++++---------------------- dlls/gphoto2.ds/gphoto2_i.h | 26 ++------- dlls/gphoto2.ds/gphoto2_main.c | 7 +-- dlls/gphoto2.ds/ui.c | 2 - include/config.h.in | 6 --- 9 files changed, 22 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f70855f88064173bd30…

1 0

Jump to page:

2025

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 October 2021