- Wine-Devel - list.winehq.org

[PATCH] evr: Trace normalized rectangle arguments.
by Nikolay Sivov Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr_private.h | 6 ++++++ dlls/evr/mixer.c | 3 ++- dlls/evr/presenter.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 7ae83140579..ef38b0f70cf 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -45,6 +45,12 @@ static inline const char *debugstr_time(LONGLONG time) return wine_dbg_sprintf("%s", rev); } +static inline const char *debugstr_normalized_rect(const MFVideoNormalizedRect *rect) +{ + if (!rect) return "(null)"; + return wine_dbg_sprintf("(%.8e,%.8e)-(%.8e,%.8e)", rect->left, rect->top, rect->right, rect->bottom); +} + HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_mixer_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; HRESULT evr_presenter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 66c3960511a..f821dc7e6d9 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -25,6 +25,7 @@ #include "mferror.h" #include "evr_classes.h" +#include "evr_private.h" #include "initguid.h" #include "evr9.h" @@ -1551,7 +1552,7 @@ static HRESULT WINAPI video_mixer_control_SetStreamOutputRect(IMFVideoMixerContr struct input_stream *stream; HRESULT hr; - TRACE("%p, %u, %p.\n", iface, id, rect); + TRACE("%p, %u, %s.\n", iface, id, debugstr_normalized_rect(rect)); if (!rect) return E_POINTER; diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fa116c18ccc..bf0f89df0eb 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1280,7 +1280,7 @@ static HRESULT WINAPI video_presenter_control_SetVideoPosition(IMFVideoDisplayCo struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); HRESULT hr = S_OK; - TRACE("%p, %p, %s.\n", iface, src_rect, wine_dbgstr_rect(dst_rect)); + TRACE("%p, %s, %s.\n", iface, debugstr_normalized_rect(src_rect), wine_dbgstr_rect(dst_rect)); if (!src_rect && !dst_rect) return E_POINTER; -- 2.33.0

1 0

[PATCH 1/7] mfplay: Better handle video control method calls when there is no media item set.
by Nikolay Sivov Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 33 +++++++------- dlls/mfplay/tests/Makefile.in | 2 +- dlls/mfplay/tests/mfplay.c | 86 +++++++++++++++++++++++++++++++++-- 3 files changed, 101 insertions(+), 20 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 28226f92962..03f204768ab 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1323,6 +1323,15 @@ static HRESULT WINAPI media_player_SetMute(IMFPMediaPlayer *iface, BOOL mute) return E_NOTIMPL; } +static HRESULT media_player_get_display_control(const struct media_player *player, + IMFVideoDisplayControl **display_control) +{ + HRESULT hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)display_control); + if (SUCCEEDED(hr)) return hr; + return hr == MF_E_SHUTDOWN ? hr : MF_E_INVALIDREQUEST; +} + static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, SIZE *video, SIZE *arvideo) { @@ -1332,8 +1341,7 @@ static HRESULT WINAPI media_player_GetNativeVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, video, arvideo); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, video, arvideo); IMFVideoDisplayControl_Release(display_control); @@ -1351,8 +1359,7 @@ static HRESULT WINAPI media_player_GetIdealVideoSize(IMFPMediaPlayer *iface, TRACE("%p, %p, %p.\n", iface, min_size, max_size); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, min_size, max_size); IMFVideoDisplayControl_Release(display_control); @@ -1370,8 +1377,7 @@ static HRESULT WINAPI media_player_SetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetVideoPosition(display_control, rect, NULL); IMFVideoDisplayControl_Release(display_control); @@ -1390,8 +1396,7 @@ static HRESULT WINAPI media_player_GetVideoSourceRect(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, rect); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetVideoPosition(display_control, rect, &dest); IMFVideoDisplayControl_Release(display_control); @@ -1408,8 +1413,7 @@ static HRESULT WINAPI media_player_SetAspectRatioMode(IMFPMediaPlayer *iface, DW TRACE("%p, %u.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1427,8 +1431,7 @@ static HRESULT WINAPI media_player_GetAspectRatioMode(IMFPMediaPlayer *iface, TRACE("%p, %p.\n", iface, mode); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, mode); IMFVideoDisplayControl_Release(display_control); @@ -1463,8 +1466,7 @@ static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %#x.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_SetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); @@ -1481,8 +1483,7 @@ static HRESULT WINAPI media_player_GetBorderColor(IMFPMediaPlayer *iface, COLORR TRACE("%p, %p.\n", iface, color); - if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, - &IID_IMFVideoDisplayControl, (void **)&display_control))) + if (SUCCEEDED(hr = media_player_get_display_control(player, &display_control))) { hr = IMFVideoDisplayControl_GetBorderColor(display_control, color); IMFVideoDisplayControl_Release(display_control); diff --git a/dlls/mfplay/tests/Makefile.in b/dlls/mfplay/tests/Makefile.in index 43c7ec26240..4eabb5ae0ab 100644 --- a/dlls/mfplay/tests/Makefile.in +++ b/dlls/mfplay/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplay.dll -IMPORTS = mfplay uuid mfuuid +IMPORTS = mfplay user32 uuid mfuuid C_SRCS = \ mfplay.c diff --git a/dlls/mfplay/tests/mfplay.c b/dlls/mfplay/tests/mfplay.c index 438d636daa2..074cee6d217 100644 --- a/dlls/mfplay/tests/mfplay.c +++ b/dlls/mfplay/tests/mfplay.c @@ -142,13 +142,16 @@ static void test_create_player(void) static void test_shutdown(void) { - SIZE min_size, max_size; + SIZE size, min_size, max_size; + MFP_MEDIAPLAYER_STATE state; + MFVideoNormalizedRect rect; IMFPMediaPlayer *player; float slowest, fastest; - HRESULT hr; - MFP_MEDIAPLAYER_STATE state; IMFPMediaItem *item; + COLORREF color; HWND window; + DWORD mode; + HRESULT hr; hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, NULL, &player); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -180,6 +183,28 @@ static void test_shutdown(void) hr = IMFPMediaPlayer_GetIdealVideoSize(player, &min_size, &max_size); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFPMediaPlayer_CreateMediaItemFromURL(player, L"url", TRUE, 0, &item); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -212,9 +237,64 @@ static void test_media_item(void) IMFPMediaPlayer_Release(player); } +static void test_video_control(void) +{ + MFVideoNormalizedRect rect; + IMFPMediaPlayer *player; + COLORREF color; + HWND window; + DWORD mode; + HRESULT hr; + SIZE size; + + window = CreateWindowA("static", "mfplay_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create output window.\n"); + + hr = MFPCreateMediaPlayer(NULL, FALSE, 0, NULL, window, &player); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* No active media item */ + + rect.left = rect.top = 0.0f; + rect.right = rect.bottom = 1.0f; + hr = IMFPMediaPlayer_SetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetBorderColor(player, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_SetAspectRatioMode(player, MFVideoARMode_None); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetVideoSourceRect(player, &rect); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetBorderColor(player, &color); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetAspectRatioMode(player, &mode); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetIdealVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_GetNativeVideoSize(player, &size, &size); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFPMediaPlayer_UpdateVideo(player); +todo_wine + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + IMFPMediaPlayer_Release(player); + + DestroyWindow(window); +} + START_TEST(mfplay) { test_create_player(); test_shutdown(); test_media_item(); + test_video_control(); } -- 2.33.0

1 6

[PATCH 1/4] winex11.drv: Introduce new map_raw_event_coords helper.
by Rémi Bernon Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 125 ++++++++++++++++++++------------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 42bac332664..2243261e0b8 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -634,6 +634,65 @@ static void map_event_coords( HWND hwnd, Window window, Window event_root, int x input->u.mi.dy = pt.y; } +static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) +{ + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + const double *values = event->valuators.values; + struct x11drv_valuator_data *x_rel, *y_rel; + double dx = 0, dy = 0, val; + RECT virtual_rect; + int i; + + if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; + if (!event->valuators.mask_len) return FALSE; + if (thread_data->xi2_state != xi_enabled) return FALSE; + + /* If there is no slave currently detected, no previous motion nor device + * change events were received. Look it up now on the device list in this + * case. + */ + if (!thread_data->xi2_current_slave) + { + XIDeviceInfo *devices = thread_data->xi2_devices; + + for (i = 0; i < thread_data->xi2_device_count; i++) + { + if (devices[i].use != XISlavePointer) continue; + if (devices[i].deviceid != event->deviceid) continue; + if (devices[i].attachment != thread_data->xi2_core_pointer) continue; + thread_data->xi2_current_slave = event->deviceid; + break; + } + } + if (event->deviceid != thread_data->xi2_current_slave) return FALSE; + + x_rel = &thread_data->x_rel_valuator; + y_rel = &thread_data->y_rel_valuator; + + virtual_rect = get_virtual_screen_rect(); + + for (i = 0; i <= max( x_rel->number, y_rel->number ); i++) + { + if (!XIMaskIsSet( event->valuators.mask, i )) continue; + val = *values++; + if (i == x_rel->number) + { + input->u.mi.dx = dx = val; + if (x_rel->min < x_rel->max) + input->u.mi.dx = val * (virtual_rect.right - virtual_rect.left) / (x_rel->max - x_rel->min); + } + if (i == y_rel->number) + { + input->u.mi.dy = dy = val; + if (y_rel->min < y_rel->max) + input->u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) / (y_rel->max - y_rel->min); + } + } + + TRACE( "pos %d,%d (event %f,%f)\n", input->u.mi.dx, input->u.mi.dy, dx, dy ); + return TRUE; +} + /*********************************************************************** * send_mouse_input @@ -1827,79 +1886,23 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev ) static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) { XIRawEvent *event = xev->data; - const double *values = event->valuators.values; - RECT virtual_rect; INPUT input; - int i; - double dx = 0, dy = 0, val; - struct x11drv_thread_data *thread_data = x11drv_thread_data(); - struct x11drv_valuator_data *x_rel, *y_rel; - - if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE; - if (!event->valuators.mask_len) return FALSE; - if (thread_data->xi2_state != xi_enabled) return FALSE; - /* If there is no slave currently detected, no previous motion nor device - * change events were received. Look it up now on the device list in this - * case. - */ - if (!thread_data->xi2_current_slave) + if (broken_rawevents && is_old_motion_event( xev->serial )) { - XIDeviceInfo *devices = thread_data->xi2_devices; - - for (i = 0; i < thread_data->xi2_device_count; i++) - { - if (devices[i].use != XISlavePointer) continue; - if (devices[i].deviceid != event->deviceid) continue; - if (devices[i].attachment != thread_data->xi2_core_pointer) continue; - thread_data->xi2_current_slave = event->deviceid; - break; - } + TRACE( "old serial %lu, ignoring\n", xev->serial ); + return FALSE; } - if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - - x_rel = &thread_data->x_rel_valuator; - y_rel = &thread_data->y_rel_valuator; - + input.type = INPUT_MOUSE; input.u.mi.mouseData = 0; input.u.mi.dwFlags = MOUSEEVENTF_MOVE; input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); input.u.mi.dwExtraInfo = 0; input.u.mi.dx = 0; input.u.mi.dy = 0; + if (!map_raw_event_coords( event, &input )) return FALSE; - virtual_rect = get_virtual_screen_rect(); - - for (i = 0; i <= max ( x_rel->number, y_rel->number ); i++) - { - if (!XIMaskIsSet( event->valuators.mask, i )) continue; - val = *values++; - if (i == x_rel->number) - { - input.u.mi.dx = dx = val; - if (x_rel->min < x_rel->max) - input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left) - / (x_rel->max - x_rel->min); - } - if (i == y_rel->number) - { - input.u.mi.dy = dy = val; - if (y_rel->min < y_rel->max) - input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top) - / (y_rel->max - y_rel->min); - } - } - - if (broken_rawevents && is_old_motion_event( xev->serial )) - { - TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial ); - return FALSE; - } - - TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy ); - - input.type = INPUT_MOUSE; __wine_send_input( 0, &input, NULL ); return TRUE; } -- 2.33.0

1 3

[PATCH 6/6] msdasql/tests: Initial tests
by Alistair Leslie-Hughes Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 1 + configure.ac | 1 + dlls/msdasql/tests/Makefile.in | 5 + dlls/msdasql/tests/provider.c | 262 +++++++++++++++++++++++++++++++++ 4 files changed, 269 insertions(+) create mode 100644 dlls/msdasql/tests/Makefile.in create mode 100644 dlls/msdasql/tests/provider.c diff --git a/configure b/configure index d0988eb32ed..8c495f546f8 100755 --- a/configure +++ b/configure @@ -19409,6 +19409,7 @@ wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps wine_fn_config_makefile dlls/msdasql enable_msdasql +wine_fn_config_makefile dlls/msdasql/tests enable_tests wine_fn_config_makefile dlls/msdelta enable_msdelta wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests diff --git a/configure.ac b/configure.ac index 36ab649240b..c91b2bccbb8 100644 --- a/configure.ac +++ b/configure.ac @@ -3119,6 +3119,7 @@ WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) WINE_CONFIG_MAKEFILE(dlls/msdasql) +WINE_CONFIG_MAKEFILE(dlls/msdasql/tests) WINE_CONFIG_MAKEFILE(dlls/msdelta) WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) diff --git a/dlls/msdasql/tests/Makefile.in b/dlls/msdasql/tests/Makefile.in new file mode 100644 index 00000000000..314238660e2 --- /dev/null +++ b/dlls/msdasql/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msdasql.dll +IMPORTS = uuid oleaut32 ole32 odbccp32 + +C_SRCS = \ + provider.c diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c new file mode 100644 index 00000000000..951ab2a7387 --- /dev/null +++ b/dlls/msdasql/tests/provider.c @@ -0,0 +1,262 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#define COBJMACROS + +#include "msdasc.h" +#include "oledb.h" +#include "odbcinst.h" + +#include "initguid.h" + +#include "msdasql.h" + +#include "wine/test.h" + +DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +static BOOL db_created; +static char mdbpath[MAX_PATH]; + +static void test_Properties(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + } + + IDBProperties_Release(props); +} + +static void test_command_interfaces(IUnknown *cmd) +{ + HRESULT hr; + ICommandProperties *commandProp; + ICommandText *comand_text; + IConvertType *convertype; + ICommandPrepare *commandprepare; + ICommandStream *commandstream; + IColumnsInfo *colinfo; + IMultipleResults *multiple; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandProperties_Release(commandProp); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandText_Release(comand_text); + + hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IConvertType_Release(convertype); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + ICommandPrepare_Release(commandprepare); + + hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IColumnsInfo_Release(colinfo); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandStream, (void**)&commandstream); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IMultipleResults, (void**)&multiple); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); +} + +static void test_sessions(void) +{ + IDBProperties *props; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit; + IDBCreateSession *dbsession = NULL; + IUnknown *session = NULL; + IOpenRowset *openrowset = NULL; + IDBCreateCommand *create_command = NULL; + IUnknown *cmd = NULL; + HRESULT hr; + BSTR connect_str; + + if (!db_created) + { + skip("ODBC source wine_test not available.\n"); + return; + } + + connect_str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + + hr = CoCreateInstance( &CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, + (void **)&datainit ); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + hr = IDataInitialize_GetDataSource( datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, &IID_IDBInitialize, + (IUnknown **)&dbinit ); + SysFreeString(connect_str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBProperties, (void **)&props ); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBProperties_Release(props); + + hr = IDBInitialize_Initialize( dbinit ); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBCreateSession, (void **)&dbsession ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateSession_CreateSession( dbsession, NULL, &IID_IUnknown, &session ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + test_command_interfaces(cmd); + IUnknown_Release(cmd); + } + + IDBCreateCommand_Release(create_command); + IOpenRowset_Release(openrowset); + IUnknown_Release( session ); + IDBCreateSession_Release(dbsession); + IDBInitialize_Uninitialize( dbinit ); + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); +} + +static void setup_database(void) +{ + char *driver; + DWORD code; + char buffer[1024]; + WORD size; + + if (winetest_interactive) + { + trace("assuming odbc 'wine_test' is available\n"); + db_created = TRUE; + return; + } + + /* + * 32 bit Windows has a default driver for "Microsoft Access Driver" (Windows 7+) + * and has the ability to create files on the fly. + * + * 64 bit Windows ONLY has a driver for "SQL Server", which we cannot use since we don't have a + * server to connect to. + * + * The filename passed to CREATE_DB must end in mdb. + */ + GetTempPathA(sizeof(mdbpath), mdbpath); + strcat(mdbpath, "wine_test.mdb"); + + driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof("DSN=wine_test\0CREATE_DB=") + strlen(mdbpath) + 2); + memcpy(driver, "DSN=wine_test\0CREATE_DB=", sizeof("DSN=wine_test\0CREATE_DB=")); + strcat(driver+sizeof("DSN=wine_test\0CREATE_DB=")-1, mdbpath); + + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + if (!db_created) + { + SQLInstallerError(1, &code, buffer, sizeof(buffer), &size); + trace("code %d, buffer %s, size %d\n", code, debugstr_a(buffer), size); + + HeapFree(GetProcessHeap(), 0, driver); + + return; + } + + memcpy(driver, "DSN=wine_test\0DBQ=", sizeof("DSN=wine_test\0DBQ=")); + strcat(driver+sizeof("DSN=wine_test\0DBQ=")-1, mdbpath); + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + + HeapFree(GetProcessHeap(), 0, driver); +} + +static void cleanup_database(void) +{ + if (winetest_interactive) + return; + + DeleteFileA(mdbpath); +} + +START_TEST(provider) +{ + CoInitialize(0); + + setup_database(); + + test_Properties(); + test_sessions(); + + cleanup_database(); + + CoUninitialize(); +} -- 2.33.0

1 0

[PATCH 5/6] msdasql: Add IDBInitialize support
by Alistair Leslie-Hughes Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index a9ab3a4933d..9ac70f49c3f 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -105,6 +105,7 @@ struct msdasql { IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; + IDBInitialize IDBInitialize_iface; LONG ref; }; @@ -119,6 +120,11 @@ static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); } +static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -134,6 +140,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBProperties_iface; } + else if ( IsEqualGUID(riid, &IID_IDBInitialize)) + { + *out = &provider->IDBInitialize_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -240,6 +250,55 @@ static const struct IDBPropertiesVtbl dbprops_vtbl = dbprops_SetProperties }; +static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + + +static const struct IDBInitializeVtbl dbinit_vtbl = +{ + dbinit_QueryInterface, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -251,6 +310,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; + provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH 4/6] msdasql: Support IDBProperties interface.
by Alistair Leslie-Hughes Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 75 +++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 6650951387f..a9ab3a4933d 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "oledb.h" #include "rpcproxy.h" #include "wine/heap.h" #include "wine/debug.h" @@ -103,6 +104,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) struct msdasql { IUnknown MSDASQL_iface; + IDBProperties IDBProperties_iface; LONG ref; }; @@ -112,6 +114,11 @@ static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); } +static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -123,6 +130,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->MSDASQL_iface; } + else if(IsEqualGUID(riid, &IID_IDBProperties)) + { + *out = &provider->IDBProperties_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -166,6 +177,69 @@ static const IUnknownVtbl msdsql_vtbl = msdsql_Release }; +static HRESULT WINAPI dbprops_QueryInterface(IDBProperties *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, + DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, + DBPROPSET rgPropertySets[]) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + + return E_NOTIMPL; +} + +static const struct IDBPropertiesVtbl dbprops_vtbl = +{ + dbprops_QueryInterface, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -176,6 +250,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) return E_OUTOFMEMORY; provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); -- 2.33.0

1 0

[PATCH 3/6] msdasql: Implement MSDASQL provider
by Alistair Leslie-Hughes Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 106 +++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 8 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index c3c54ba2606..6650951387f 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "wine/heap.h" #include "wine/debug.h" #include "initguid.h" @@ -64,11 +65,13 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) return 1; } -HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +static HRESULT create_msdasql_provider(REFIID riid, void **ppv); + +HRESULT WINAPI msdasql_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return CLASS_E_CLASSNOTAVAILABLE; + return create_msdasql_provider(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) @@ -77,18 +80,105 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) return S_OK; } -static const IClassFactoryVtbl cffactoryVtbl = { +static const IClassFactoryVtbl cfmsdasqlVtbl = { ClassFactory_QueryInterface, ClassFactory_AddRef, ClassFactory_Release, - ClassFactory_CreateInstance, + msdasql_CreateInstance, ClassFactory_LockServer }; -static IClassFactory cffactory = { &cffactoryVtbl }; +static IClassFactory cfmsdasql = { &cfmsdasqlVtbl }; HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&cffactory, riid, ppv); + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (IsEqualGUID(&CLSID_MSDASQL, rclsid)) + return IClassFactory_QueryInterface(&cfmsdasql, riid, ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +struct msdasql +{ + IUnknown MSDASQL_iface; + + LONG ref; +}; + +static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); +} + +static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + + TRACE("(%p)->(%s %p)\n", provider, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &CLSID_MSDASQL)) + { + *out = &provider->MSDASQL_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI msdsql_AddRef(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedIncrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + return ref; +} + +static ULONG WINAPI msdsql_Release(IUnknown *iface) +{ + struct msdasql *provider = impl_from_IUnknown(iface); + ULONG ref = InterlockedDecrement(&provider->ref); + + TRACE("(%p) ref=%u\n", provider, ref); + + if (!ref) + { + heap_free(provider); + } + + return ref; +} + +static const IUnknownVtbl msdsql_vtbl = +{ + msdsql_QueryInterface, + msdsql_AddRef, + msdsql_Release +}; + +static HRESULT create_msdasql_provider(REFIID riid, void **ppv) +{ + struct msdasql *provider; + HRESULT hr; + + provider = heap_alloc(sizeof(struct msdasql)); + if (!provider) + return E_OUTOFMEMORY; + + provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->ref = 1; + + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); + IUnknown_Release(&provider->MSDASQL_iface); + return hr; } -- 2.33.0

1 0

[PATCH 2/6] msdasql: Register MSDASQL interfaces
by Alistair Leslie-Hughes Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 4 ++++ dlls/msdasql/msdasql.rc | 20 +++++++++++++++++++ dlls/msdasql/msdasql.rgs | 11 +++++++++++ dlls/msdasql/msdasql_classes.idl | 34 ++++++++++++++++++++++++++++++++ dlls/msdasql/msdasql_main.c | 3 +++ 5 files changed, 72 insertions(+) create mode 100644 dlls/msdasql/msdasql.rc create mode 100644 dlls/msdasql/msdasql.rgs create mode 100644 dlls/msdasql/msdasql_classes.idl diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index cb27d332500..3ec26a331df 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -5,3 +5,7 @@ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ msdasql_main.c + +RC_SRCS = msdasql.rc + +IDL_SRCS = msdasql_classes.idl diff --git a/dlls/msdasql/msdasql.rc b/dlls/msdasql/msdasql.rc new file mode 100644 index 00000000000..d2ba45b8c42 --- /dev/null +++ b/dlls/msdasql/msdasql.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: msdasql.rgs */ +2 WINE_REGISTRY msdasql.rgs diff --git a/dlls/msdasql/msdasql.rgs b/dlls/msdasql/msdasql.rgs new file mode 100644 index 00000000000..b5ac427199b --- /dev/null +++ b/dlls/msdasql/msdasql.rgs @@ -0,0 +1,11 @@ +HKCR +{ + NoRemove CLSID + { + NoRemove {c8b522cb-5cf3-11ce-ade5-00aa0044773d} = s 'MSDASQL' + { + val 'OLEDB_SERVICES' = d 4294967295 + 'OLE DB Provider' = s 'WINE OLE DB Provider for ODBC Drivers' + } + } +} diff --git a/dlls/msdasql/msdasql_classes.idl b/dlls/msdasql/msdasql_classes.idl new file mode 100644 index 00000000000..00a0e99aaa8 --- /dev/null +++ b/dlls/msdasql/msdasql_classes.idl @@ -0,0 +1,34 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#pragma makedep register + +[ + progid("MSDASQL.1"), + vi_progid("MSDASQL"), + threading(both), + uuid(c8b522cb-5cf3-11ce-ade5-00aa0044773d) +] +coclass MSDASQL { } + +[ + progid("MSDAENUM.1"), + vi_progid("MSDAENUM"), + threading(both), + uuid(c8b522cd-5cf3-11ce-ade5-00aa0044773d) +] +coclass MSDAENUM { } diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 1b3f5f5ed24..c3c54ba2606 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -26,6 +26,9 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "initguid.h" +#include "msdasql.h" + WINE_DEFAULT_DEBUG_CHANNEL(msdasql); static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -- 2.33.0

1 0

[PATCH 1/6] msdasql: New DLL
by Alistair Leslie-Hughes Oct. 25, 2021

Oct. 25, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 2 + configure.ac | 1 + dlls/msdasql/Makefile.in | 7 +++ dlls/msdasql/msdasql.spec | 4 ++ dlls/msdasql/msdasql_main.c | 91 +++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + 6 files changed, 107 insertions(+) create mode 100644 dlls/msdasql/Makefile.in create mode 100644 dlls/msdasql/msdasql.spec create mode 100644 dlls/msdasql/msdasql_main.c diff --git a/configure b/configure index 389b83e931e..d0988eb32ed 100755 --- a/configure +++ b/configure @@ -1450,6 +1450,7 @@ enable_mscorwks enable_msctf enable_msctfp enable_msdaps +enable_msdasql enable_msdelta enable_msdmo enable_msdrm @@ -19407,6 +19408,7 @@ wine_fn_config_makefile dlls/msctf enable_msctf wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps +wine_fn_config_makefile dlls/msdasql enable_msdasql wine_fn_config_makefile dlls/msdelta enable_msdelta wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests diff --git a/configure.ac b/configure.ac index 0dbf7365714..36ab649240b 100644 --- a/configure.ac +++ b/configure.ac @@ -3118,6 +3118,7 @@ WINE_CONFIG_MAKEFILE(dlls/msctf) WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) +WINE_CONFIG_MAKEFILE(dlls/msdasql) WINE_CONFIG_MAKEFILE(dlls/msdelta) WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in new file mode 100644 index 00000000000..cb27d332500 --- /dev/null +++ b/dlls/msdasql/Makefile.in @@ -0,0 +1,7 @@ +MODULE = msdasql.dll +IMPORTS = uuid + +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native + +C_SRCS = \ + msdasql_main.c diff --git a/dlls/msdasql/msdasql.spec b/dlls/msdasql/msdasql.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/msdasql/msdasql.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c new file mode 100644 index 00000000000..1b3f5f5ed24 --- /dev/null +++ b/dlls/msdasql/msdasql_main.c @@ -0,0 +1,91 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msdasql); + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + TRACE("(%p)\n", iface); + return 1; +} + +HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + FIXME("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + return CLASS_E_CLASSNOTAVAILABLE; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const IClassFactoryVtbl cffactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory cffactory = { &cffactoryVtbl }; + +HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&cffactory, riid, ppv); +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d023701c04b..b1894dcba61 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2657,6 +2657,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Windows NT\Accessories,wordpad.exe 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv 12,,*.sys,- @@ -2716,6 +2717,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll +16427,System\OLE DB,msdasql.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv 12,,*.sys -- 2.33.0

1 0

[PATCH v2] winebus.sys: get inotify working on FreeBSD
by Damjan Jovanovic Oct. 25, 2021

Oct. 25, 2021

FreeBSD requires linking to the inotify library, and including limits.h. Try 2 adds to EXTRALIBS instead of overwriting it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_udev.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)

2 1