March 2020 - Wine-devel - list.winehq.org

[PATCH] oledb32: Initialize data provider when switching tabs
by Alistair Leslie-Hughes 02 Mar '20

02 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/dslocator.c | 115 ++++++++++++++++++++++++++++++++++++++- dlls/oledb32/resource.h | 1 + dlls/oledb32/version.rc | 1 + 3 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 006330b004..8a7f2d134c 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -41,6 +41,75 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); +struct datasource +{ + CLSID clsid; + IDBProperties *provider; + DBPROPINFOSET *propinfoset; + WCHAR *description; +}; + +static struct datasource *create_datasource(WCHAR *guid) +{ + struct datasource *data = heap_alloc_zero(sizeof(struct datasource)); + if (data) + { + CLSIDFromString(guid, &data->clsid); + } + + return data; +} + +static void destroy_datasource(struct datasource *data) +{ + if (data->propinfoset) + { + ULONG i; + + for (i = 0; i < data->propinfoset->cPropertyInfos; i++) + VariantClear(&data->propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(data->propinfoset->rgPropertyInfos); + CoTaskMemFree(data->propinfoset); + } + if (data->description) + CoTaskMemFree(data->description); + + if (data->provider) + IDBProperties_Release(data->provider); + + heap_free(data); +} + +static BOOL initialize_datasource(struct datasource *data) +{ + HRESULT hr; + DBPROPIDSET propidset; + ULONG infocount; + + hr = CoCreateInstance(&data->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDBProperties, (void**)&data->provider); + if (FAILED(hr)) + { + WARN("Datasource cannot be created (0x%08x)\n", hr); + return FALSE; + } + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + hr = IDBProperties_GetPropertyInfo(data->provider, 1, &propidset, &infocount, &data->propinfoset, &data->description); + if (FAILED(hr)) + { + WARN("Failed to get DB Properties (0x%08x)\n", hr); + + IDBProperties_Release(data->provider); + data->provider = NULL; + return FALSE; + } + + return TRUE; +} typedef struct DSLocatorImpl { @@ -240,12 +309,17 @@ static void add_connections_providers(HWND lv) if (res == ERROR_SUCCESS) { LVITEMW item; - item.mask = LVIF_TEXT; + struct datasource *data; + + data = create_datasource(guidkey); + + item.mask = LVIF_TEXT | LVIF_PARAM; item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; item.pszText = description; + item.lParam = (LPARAM)data; + SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); - /* TODO - Add ProgID to item data */ } RegCloseKey(subkey); } @@ -274,6 +348,22 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA break; } + case WM_DESTROY: + { + HWND lv = GetDlgItem(hwnd, IDC_LST_CONNECTIONS); + LVITEMA item; + + item.iItem = 0; + item.iSubItem = 0; + item.mask = LVIF_PARAM; + + while(ListView_GetItemA(lv, &item)) + { + destroy_datasource( (struct datasource *)item.lParam); + item.iItem++; + } + break; + } case WM_NOTIFY: { NMHDR *hdr = ((LPNMHDR)lp); @@ -281,6 +371,7 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA { case PSN_KILLACTIVE: { + LVITEMA item; /* * FIXME: This needs to replace the connection page based off the selection. * We only care about the ODBC for now which is the default. @@ -298,6 +389,26 @@ static LRESULT CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARA return TRUE; } + item.iItem = 0; + item.iSubItem = 0; + item.stateMask = LVIS_SELECTED; + item.mask = LVIF_PARAM | LVIF_STATE; + + if(ListView_GetItemA(lv, &item)) + { + if(!initialize_datasource( (struct datasource*)item.lParam)) + { + WCHAR title[256], msg[256]; + LoadStringW(instance, IDS_PROVIDER_TITLE, title, ARRAY_SIZE(title)); + LoadStringW(instance, IDS_PROVIDER_NOT_AVAIL, msg, ARRAY_SIZE(msg)); + MessageBoxW(hwnd, msg, title, MB_OK | MB_ICONEXCLAMATION); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, TRUE); + return TRUE; + } + } + else + ERR("Failed to get selected item\n"); + return FALSE; } } diff --git a/dlls/oledb32/resource.h b/dlls/oledb32/resource.h index dfedb34a54..42f984c013 100644 --- a/dlls/oledb32/resource.h +++ b/dlls/oledb32/resource.h @@ -21,6 +21,7 @@ #define IDC_LST_CONNECTIONS 1002 #define IDS_PROVIDER_TITLE 1003 #define IDS_PROVIDER_ERROR 1004 +#define IDS_PROVIDER_NOT_AVAIL 1005 #define IDS_PROPSHEET_TITLE 2000 #define IDS_COL_PROVIDER 2001 diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc index 247709dec2..86b5a317b2 100644 --- a/dlls/oledb32/version.rc +++ b/dlls/oledb32/version.rc @@ -48,6 +48,7 @@ STRINGTABLE IDS_PROVIDER_TITLE "Data Link Error" IDS_PROVIDER_ERROR "Please select a provider." + IDS_PROVIDER_NOT_AVAIL "Provider is no longer available. Ensure that the provider is installed properly." } IDD_PROVIDER DIALOG 0, 0, 227, 225 -- 2.17.1

1 0

[PATCH 2/2] kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Aaro Altonen 02 Mar '20

02 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 37 ++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e6c2c8e364..7da82ae47d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3161,24 +3161,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 87\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..9d38398d25 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,40 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!handle) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + SERVER_START_REQ(set_console_output_info) + { + req->handle = console_handle_unmap(handle); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min(info->dwMaximumWindowSize.X, info->dwSize.X); + req->max_height = min(info->dwMaximumWindowSize.Y, info->dwSize.Y); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } -- 2.25.1

2 1

Re: [PATCH 1/5] wined3d: Introduce wined3d_enum_adapters().
by Henri Verbeet 02 Mar '20

02 Mar '20

On Mon, 2 Mar 2020 at 19:02, Zhiyi Zhang <zzhang(a)codeweavers.com> wrote: > On 2020/3/2 23:19, Henri Verbeet wrote: > > On Mon, 2 Mar 2020 at 11:54, Zhiyi Zhang <zzhang(a)codeweavers.com> wrote: > >> @@ -2257,6 +2258,8 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT ad > >> enum wined3d_format_id backbuffer_format_id, BOOL windowed); > >> struct wined3d * __cdecl wined3d_create(DWORD flags); > >> ULONG __cdecl wined3d_decref(struct wined3d *wined3d); > >> +HRESULT __cdecl wined3d_enum_adapters(const struct wined3d *wined3d, UINT adapter_idx, > >> + struct wined3d_adapter **adapter); > > "struct wined3d_adapter * __cdecl wined3d_get_adapter(const struct > > wined3d *wined3d, unsigned int idx);", right? > Thanks, I will change that. > > I am a bit confused about the coding style here. Is the preference for wined3d > function exports not to use HRESULT when possible/when there isn't a corresponding > API call? > When possible, yes. More broadly, the idea is to avoid Win32 specific types and conventions unless necessary, so that wined3d is for the most part just a regular library.

1 0

[PATCH 2/2] d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity).
by Henri Verbeet 02 Mar '20

02 Mar '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8d85a43523c..a651a63f02e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3688,17 +3688,18 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, const struct wined3d_stream_state *stream; state = wined3d_stateblock_get_state(device->state); stream = &state->streams[stream_idx]; - wined3d_buffer = stream->buffer; offset = stream->offset; stride = stream->stride; - } - - if (!buffer_impl) wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) + { wined3d_buffer = buffer_impl->draw_buffer; + } else + { wined3d_buffer = buffer_impl->wined3d_buffer; + } hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, offset, stride); if (SUCCEEDED(hr) && !device->recording) -- 2.20.1

1 0

[PATCH v3 4/5] d3dx9: Handle clipping in ID3DXFont_DrawText.
by Sven Baars 02 Mar '20

02 Mar '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/d3dx9_36/font.c | 5 +++++ dlls/d3dx9_36/tests/core.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 23e6e5c401..6721bc0765 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -565,6 +565,9 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, if (!count) return 0; + if (format & DT_CALCRECT) + format |= DT_NOCLIP; + if (!rect) { y = ID3DXFont_DrawTextW(iface, NULL, string, count, &textrect, format | DT_CALCRECT, 0); @@ -639,6 +642,8 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, heap_free(results.lpGlyphs); } y += lh; + if (!(DT_NOCLIP & format) && (y > textrect.bottom)) + break; } ret = y - textrect.top; diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index c6f5beff43..c79f5c1f72 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -780,7 +780,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) todo_wine ok(height == 36, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, 0, 0xff00ff); - todo_wine ok(height == 48, "Got unexpected height %d.\n", height); + ok(height == 48, "Got unexpected height %d.\n", height); height = ID3DXFont_DrawTextW(font, NULL, L"1\n2\n3\n4\n5\n6", -1, &rect, DT_NOCLIP, 0xff00ff); ok(height == 72, "Got unexpected height %d.\n", height); -- 2.24.0

1 0

[PATCH 4/4] winegcc: Add support for using clang directly.
by Jacek Caban 02 Mar '20

02 Mar '20

Inspired by llvm-mingw wrappers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-)

1 0

[PATCH 3/4] winegcc: Pass tool by id to build_tool_name.
by Jacek Caban 02 Mar '20

02 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 42 +++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)

1 0

[PATCH 1/4] winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found.
by Jacek Caban 02 Mar '20

02 Mar '20

Based on winebuild. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/utils.c | 44 +++++++++++++++++++++++++++++++++++------ tools/winegcc/winegcc.c | 7 ++++++- 2 files changed, 44 insertions(+), 7 deletions(-)

1 0

[PATCH v3] dsound: Make GlobalHandle() for the sound buffer failed.
by Akihiro Sagawa 02 Mar '20

02 Mar '20

In v3, use VirtualAlloc/VirtualFree and revert dsound test for 32-bit. Andrew and Zebediah, thanks for reviewing and useful comments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48635 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dsound/buffer.c | 4 ++-- dlls/dsound/tests/dsound.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-)

2 1

[PATCH] user32: Trace iModeNum with %#x in EnumDisplaySettingsExW().
by Zhiyi Zhang 02 Mar '20

02 Mar '20

ENUM_CURRENT_SETTINGS is (DWORD)-1 and ENUM_REGISTRY_SETTINGS is (DWORD)-2. Using %u to print them ends up a very large decimal integer, which is not easily recognizable. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab386a074e8..fd795470792 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3423,7 +3423,7 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, { WCHAR primary_adapter[CCHDEVICENAME]; - TRACE("%s %u %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + TRACE("%s %#x %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); if (!lpszDeviceName) { -- 2.20.1

1 0