October 2018 - Wine-Devel - list.winehq.org

[PATCH 4/6] wined3d: Get rid of the "format_id" parameter to buffer_init().
by Henri Verbeet Oct. 23, 2018

Oct. 23, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e7b05157ccf..64ceeda5b66 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1341,11 +1341,11 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ return GL_ARRAY_BUFFER; } -static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, - UINT size, DWORD usage, enum wined3d_format_id format_id, unsigned int access, unsigned int bind_flags, - const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) +static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, UINT size, + DWORD usage, unsigned int access, unsigned int bind_flags, const struct wined3d_sub_resource_data *data, + void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_format *format = wined3d_get_format(device->adapter, format_id, usage); + const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, usage); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource *resource = &buffer->resource; BOOL dynamic_buffer_ok; @@ -1454,7 +1454,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, + if (FAILED(hr = buffer_init(object, device, desc->byte_width, desc->usage, desc->access, desc->bind_flags, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); -- 2.11.0

1 0

[PATCH 3/6] wined3d: Store the "buffer_object" in struct wined3d_bo_address as an UINT_PTR.
by Henri Verbeet Oct. 23, 2018

Oct. 23, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 127c7b34a0c..6e60c5ae3db 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4212,7 +4212,7 @@ const char *debug_const_bo_address(const struct wined3d_const_bo_address *addres { if (!address) return "(null)"; - return wine_dbg_sprintf("{%#x:%p}", address->buffer_object, address->addr); + return wine_dbg_sprintf("{%#lx:%p}", address->buffer_object, address->addr); } const char *debug_bo_address(const struct wined3d_bo_address *address) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e31e41e798..33d248fcfdd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1461,13 +1461,13 @@ do { \ struct wined3d_bo_address { - GLuint buffer_object; + UINT_PTR buffer_object; BYTE *addr; }; struct wined3d_const_bo_address { - GLuint buffer_object; + UINT_PTR buffer_object; const BYTE *addr; }; -- 2.11.0

1 0

[PATCH 2/6] wined3d: Introduce debug helpers for wined3d_bo_address structures.
by Henri Verbeet Oct. 23, 2018

Oct. 23, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/utils.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8199afa1d0e..37abf19d73e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3670,7 +3670,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (buffer->fence) context->buffer_fences[context->buffer_fence_count++] = buffer->fence; - TRACE("Load array %u {%#x:%p}.\n", i, element->data.buffer_object, element->data.addr); + TRACE("Load array %u %s.\n", i, debug_bo_address(&element->data)); } if (prev_all_vbo != stream_info->all_vbo) @@ -5068,8 +5068,8 @@ void context_load_tex_coords(const struct wined3d_context *context, const struct { const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx]; - TRACE("Setting up texture %u, idx %d, coord_idx %u, data {%#x:%p}.\n", - texture_idx, mapped_stage, coord_idx, e->data.buffer_object, e->data.addr); + TRACE("Setting up texture %u, idx %u, coord_idx %u, data %s.\n", + texture_idx, mapped_stage, coord_idx, debug_bo_address(&e->data)); if (*current_bo != e->data.buffer_object) { @@ -5386,7 +5386,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, continue; } - TRACE("Loading array %u [VBO=%u].\n", i, element->data.buffer_object); + TRACE("Loading array %u %s.\n", i, debug_bo_address(&element->data)); if (element->stride) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ecbe94b2459..a3d834e8f53 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1927,10 +1927,10 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s BOOL decompress; GLenum target; - TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " + TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data %s, " "src_row_pitch %#x, src_slice_pitch %#x, dst_x %u, dst_y %u, dst_z %u, srgb %#x.\n", texture, sub_resource_idx, context, debug_d3dformat(format->id), debug_box(src_box), - data->buffer_object, data->addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); + debug_const_bo_address(data), src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); if (texture->sub_resources[sub_resource_idx].map_count) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9ddfd5c2059..127c7b34a0c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4208,6 +4208,18 @@ const char *debug_vec4(const struct wined3d_vec4 *v) v->x, v->y, v->z, v->w); } +const char *debug_const_bo_address(const struct wined3d_const_bo_address *address) +{ + if (!address) + return "(null)"; + return wine_dbg_sprintf("{%#x:%p}", address->buffer_object, address->addr); +} + +const char *debug_bo_address(const struct wined3d_bo_address *address) +{ + return debug_const_bo_address((const struct wined3d_const_bo_address *)address); +} + const char *debug_d3dformat(enum wined3d_format_id format_id) { switch (format_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d5bf61271e9..8e31e41e798 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3915,8 +3915,10 @@ void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, */ /* Trace routines */ +const char *debug_bo_address(const struct wined3d_bo_address *address) DECLSPEC_HIDDEN; const char *debug_box(const struct wined3d_box *box) DECLSPEC_HIDDEN; const char *debug_color(const struct wined3d_color *color) DECLSPEC_HIDDEN; +const char *debug_const_bo_address(const struct wined3d_const_bo_address *address) DECLSPEC_HIDDEN; const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) DECLSPEC_HIDDEN; const char *debug_d3dformat(enum wined3d_format_id format_id) DECLSPEC_HIDDEN; const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 1/6] wined3d: Validate the initial texture data before initialising the texture.
by Henri Verbeet Oct. 23, 2018

Oct. 23, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 15492cd86fe..ecbe94b2459 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3568,8 +3568,10 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct UINT layer_count, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { + unsigned int sub_count = level_count * layer_count; const struct wined3d_texture_ops *texture_ops; struct wined3d_texture *object; + unsigned int i; HRESULT hr; TRACE("device %p, desc %p, layer_count %u, level_count %u, flags %#x, data %p, " @@ -3630,8 +3632,19 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct return WINED3DERR_INVALIDCALL; } - if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, - sub_resources[level_count * layer_count])))) + if (data) + { + for (i = 0; i < sub_count; ++i) + { + if (data[i].data) + continue; + + WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); + return E_INVALIDARG; + } + } + + if (!(object = heap_alloc_zero(FIELD_OFFSET(struct wined3d_texture, sub_resources[sub_count])))) return E_OUTOFMEMORY; if (FAILED(hr = wined3d_texture_init(object, desc, layer_count, @@ -3646,21 +3659,8 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct * in this case. */ if (data) { - unsigned int sub_count = level_count * layer_count; unsigned int level, width, height, depth; struct wined3d_box box; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - if (!data[i].data) - { - WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); - wined3d_texture_cleanup_sync(object); - heap_free(object); - return E_INVALIDARG; - } - } for (i = 0; i < sub_count; ++i) { -- 2.11.0

1 0

[PATCH 1/3] gdi32: Support other settings for obtaining the default_aa_flags value.
by Byeongsik Jeon Oct. 23, 2018

Oct. 23, 2018

The global subpixel orientation setting are: 1. fontconfig builtin recommendation 10-sub-pixel-rgb.conf. <match target="pattern"> <edit name="rgba" mode="assign"><const>rgb</const></edit> </match> 2. Current Wine, or the recommendation of some web pages. <match target="font"> <edit name="rgba" mode="assign"><const>rgb</const></edit> </match> This patch allows both situations to return the correct value. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5b1a23bf32..f60bdf4990 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2812,6 +2812,15 @@ static void init_fontconfig(void) pFcConfigSubstitute( NULL, pattern, FcMatchFont ); default_aa_flags = parse_aa_pattern( pattern ); pFcPatternDestroy( pattern ); + + if (!default_aa_flags) + { + pattern = pFcPatternCreate(); + pFcConfigSubstitute( NULL, pattern, FcMatchPattern ); + default_aa_flags = parse_aa_pattern( pattern ); + pFcPatternDestroy( pattern ); + } + TRACE( "enabled, default flags = %x\n", default_aa_flags ); fontconfig_enabled = TRUE; } -- 2.19.1

1 3

[PATCH 1/2] dxgi: Add IDXGIAdapter4 stub.
by Nikolay Sivov Oct. 23, 2018

Oct. 23, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/adapter.c | 10 ++++++++++ include/wine/winedxgi.idl | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 0079759568..a913870319 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter4) || IsEqualGUID(iid, &IID_IDXGIAdapter3) || IsEqualGUID(iid, &IID_IDXGIAdapter2) || IsEqualGUID(iid, &IID_IDXGIAdapter1) @@ -301,6 +302,13 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -325,6 +333,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_SetVideoMemoryReservation, dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent, dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, + /* IDXGIAdapter4 methods */ + dxgi_adapter_GetDesc3, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 3a1d6fa064..fccf45d792 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -18,7 +18,7 @@ #pragma makedep header -import "dxgi1_5.idl"; +import "dxgi1_6.idl"; [ object, @@ -56,7 +56,7 @@ interface IWineDXGIDeviceParent : IUnknown local, uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) ] -interface IWineDXGIAdapter : IDXGIAdapter3 +interface IWineDXGIAdapter : IDXGIAdapter4 { } -- 2.19.1

2 2

[PATCH v2] browseui: Implement PROGDLG_AUTOTIME flag for IProgressDialog.
by Alistair Leslie-Hughes Oct. 22, 2018

Oct. 22, 2018

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45970 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- v2: Use FormatMessage. dlls/browseui/browseui.rc | 5 ++++ dlls/browseui/progressdlg.c | 73 +++++++++++++++++++++++++++++++++++++++++---- dlls/browseui/resids.h | 5 ++++ 3 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 4c612e9..e33b2ad 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -25,6 +25,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE { IDS_CANCELLING "Canceling..." + IDS_REMAINING1 "%1!u! %2 remaining" + IDS_REMAINING2 "%1!u! %2 and %3!u! %4 remaining" + IDS_SECONDS "seconds" + IDS_MINUTES "minutes" + IDS_HOURS "hours" } IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2355b0c..e10d8bd 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -74,6 +74,9 @@ typedef struct tagProgressDialog { ULONGLONG ullCompleted; ULONGLONG ullTotal; HWND hwndDisabledParent; /* For modal dialog: the parent that need to be re-enabled when the dialog ends */ + ULONGLONG startTime; + LPWSTR remainingMsg[2]; + LPWSTR timeMsg[3]; } ProgressDialog; static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) @@ -158,6 +161,22 @@ static void update_dialog(ProgressDialog *This, DWORD dwUpdate) } } +static void load_time_strings(ProgressDialog *This) +{ + int i; + + for (i = 0; i < 2; i++) + { + if (!This->remainingMsg[i]) + This->remainingMsg[i] = load_string(BROWSEUI_hinstance, IDS_REMAINING1 + i); + } + for (i = 0; i < 3; i++) + { + if (!This->timeMsg[i]) + This->timeMsg[i] = load_string(BROWSEUI_hinstance, IDS_SECONDS + i); + } +} + static void end_dialog(ProgressDialog *This) { SendMessageW(This->hwnd, WM_DLG_DESTROY, 0, 0); @@ -260,14 +279,18 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) static void ProgressDialog_Destructor(ProgressDialog *This) { + int i; TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - heap_free(This->lines[0]); - heap_free(This->lines[1]); - heap_free(This->lines[2]); + for (i = 0; i < 3; i++) + heap_free(This->lines[i]); heap_free(This->cancelMsg); heap_free(This->title); + for (i = 0; i < 2; i++) + heap_free(This->remainingMsg[i]); + for (i = 0; i < 3; i++) + heap_free(This->timeMsg[i]); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); @@ -329,8 +352,6 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, TRACE("(%p, %p, %x, %p)\n", iface, punkEnableModeless, dwFlags, reserved); if (punkEnableModeless || reserved) FIXME("Reserved parameters not null (%p, %p)\n", punkEnableModeless, reserved); - if (dwFlags & PROGDLG_AUTOTIME) - FIXME("Flags PROGDLG_AUTOTIME not supported\n"); if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); @@ -365,6 +386,10 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, This->hwndDisabledParent = hwndDisable; } + if (dwFlags & PROGDLG_AUTOTIME) + load_time_strings(This); + + This->startTime = GetTickCount64(); LeaveCriticalSection(&This->cs); return S_OK; @@ -422,6 +447,42 @@ static BOOL WINAPI ProgressDialog_HasUserCancelled(IProgressDialog *iface) return This->isCancelled; } +static void update_time_remaining(ProgressDialog *This, ULONGLONG ullCompleted, ULONGLONG ullTotal) +{ + unsigned int remaining, remainder = 0; + ULONGLONG elapsed; + WCHAR line[128]; + int i; + DWORD_PTR args[4]; + + if (!This->startTime || !ullCompleted || !ullTotal) + return; + + elapsed = GetTickCount64() - This->startTime; + remaining = (elapsed * ullTotal / ullCompleted - elapsed) / 1000; + + for (i = 0; remaining >= 60 && i < 2; i++) + { + remainder = remaining % 60; + remaining /= 60; + } + + args[0] = remaining; + args[1] = (DWORD_PTR)This->timeMsg[i]; + args[2] = remainder; + args[3] = (DWORD_PTR)This->timeMsg[i-1]; + + if (i > 0 && remaining < 2 && remainder != 0) + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + This->remainingMsg[1], 0, 0, line, ARRAY_SIZE(line), (__ms_va_list*)args); + else + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, + This->remainingMsg[0], 0, 0, line, ARRAY_SIZE(line), (__ms_va_list*)args); + + set_buffer(&This->lines[2], line); + This->dwUpdate |= UPDATE_LINE3; +} + static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONGLONG ullCompleted, ULONGLONG ullTotal) { ProgressDialog *This = impl_from_IProgressDialog(iface); @@ -434,6 +495,8 @@ static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONG This->ullCompleted = ullCompleted; This->dwUpdate |= UPDATE_PROGRESS; hwnd = This->hwnd; + if (This->dwFlags & PROGDLG_AUTOTIME) + update_time_remaining(This, ullCompleted, ullTotal); LeaveCriticalSection(&This->cs); if (hwnd) diff --git a/dlls/browseui/resids.h b/dlls/browseui/resids.h index cd44a8e..865cdd1 100644 --- a/dlls/browseui/resids.h +++ b/dlls/browseui/resids.h @@ -21,6 +21,11 @@ #include "commctrl.h" #define IDS_CANCELLING 16 +#define IDS_REMAINING1 17 +#define IDS_REMAINING2 18 +#define IDS_SECONDS 19 +#define IDS_MINUTES 20 +#define IDS_HOURS 21 #define IDC_ANIMATION 100 #define IDC_PROGRESS_BAR 102 -- 1.9.1

1 0

[PATCH v2] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes Oct. 22, 2018

Oct. 22, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 155 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 131 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..4ad64c4 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -102,6 +102,32 @@ static inline WCHAR *heap_strdupAtoW(const char *str) return ret; } +static inline WCHAR *heap_attrdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if (str) + { + DWORD size = 0, len; + const char *p; + WCHAR *current; + + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + size += len; + } + + current = ret = heap_alloc_zero( (size+1)*sizeof(WCHAR)); + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, current, size); + current += len; + } + } + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -220,30 +246,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -360,6 +362,111 @@ fail: return FALSE; } +static BOOL call_ConfigDSN(HANDLE mod, HWND hwnd, WORD request, const char *driverA, const char *attributesA, const WCHAR *driverW, const WCHAR *attributesW) +{ + BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); + BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + BOOL ret = FALSE; + + TRACE("%p, %p, %d, %p, %p, %p %p\n", mod, hwnd, request, driverA, attributesA, driverW, attributesW); + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + + if (pConfigDSNW) + { + const WCHAR *attr = attributesW; + if(!attr) + attr = heap_attrdupAtoW(attributesA); + + TRACE("Calling ConfigDSNW (%p)\n", pConfigDSNW); + + ret = pConfigDSNW(hwnd, request, driverW, attr); + + if(attr != attributesW) + heap_free((WCHAR *)attr); + } + else if (pConfigDSN) + { + TRACE("Calling pConfigDSN (%p)\n", pConfigDSN); + ret = pConfigDSN(hwnd, request, driverA, attributesA); + } + else + ERR("Neither ConfigDSN or ConfigDSNW found.\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + return ret; +} + +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, + LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + hmod = load_config_driver(driver); + if (!hmod) + return FALSE; + + ret = call_ConfigDSN (hmod, hwnd, request, NULL, NULL, driver, attributes); + + FreeLibrary(hmod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, + LPCSTR driver, LPCSTR attributes) +{ + HMODULE hmod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + hmod = load_config_driver(driverW); + if (!hmod) + { + heap_free(driverW); + return FALSE; + } + + ret = call_ConfigDSN (hmod, hwnd, request, driver, attributes, driverW, NULL); + heap_free(driverW); + + FreeLibrary(hmod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { -- 1.9.1

1 0

[PATCH] wrc: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Oct. 22, 2018

Oct. 22, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wrc/po.c | 10 +++++----- tools/wrc/utils.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c72a422f94..74bcf1e6ff 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -602,7 +602,7 @@ static const char *get_language_name( const language_t *lang ) static char name[20]; unsigned int i; - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (languages[i].id == lang->id && languages[i].sub == lang->sub) return languages[i].name; @@ -1314,7 +1314,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang new_blk = new_ver_block(); *new_blk = *blk; name = convert_msgid_ascii( blk->name, 0 ); - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) { if (!strcasecmp( name, english_block_name[i] )) { @@ -1344,7 +1344,7 @@ static ver_value_t *translate_stringfileinfo( ver_value_t *val, language_t *lang val = val->next; } - for (i = 0; i < sizeof(block_name)/sizeof(block_name[0]); i++) + for (i = 0; i < ARRAY_SIZE(block_name); i++) free( block_name[i] ); return head; } @@ -1494,10 +1494,10 @@ void add_translations( const char *po_dir ) if ((p = strchr( buffer, '#' ))) *p = 0; for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) { - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (!strcmp( tok, languages[i].name )) break; - if (i == sizeof(languages)/sizeof(languages[0])) + if (i == ARRAY_SIZE(languages)) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.mo", po_dir, tok ); diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 800692a37e..633ec57d86 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -565,7 +565,7 @@ int get_language_codepage( unsigned short lang, unsigned short sublang ) unsigned int i; int cp = -1, defcp = -1; - for (i = 0; i < sizeof(lang2cps)/sizeof(lang2cps[0]); i++) + for (i = 0; i < ARRAY_SIZE(lang2cps); i++) { if (lang2cps[i].lang != lang) continue; if (lang2cps[i].sublang == sublang) -- 2.14.5

1 0

[PATCH] wmc: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Oct. 22, 2018

Oct. 22, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wmc/lang.c | 7 +++---- tools/wmc/po.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index b045612bb6..07022f7c79 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -162,14 +162,12 @@ static const language_t languages[] = { {0x500A, 850, 1252, "Spanish", "Puerto Rico"} }; -#define NLAN (sizeof(languages)/sizeof(languages[0])) - void show_languages(void) { unsigned int i; printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf("-------+--------+--------+--------------+---------\n"); - for(i = 0; i < NLAN; i++) + for(i = 0; i < ARRAY_SIZE(languages); i++) printf("0x%04x | %5d | %5d | %-12s | %s\n", languages[i].id, languages[i].doscp, @@ -185,7 +183,8 @@ static int langcmp(const void *p1, const void *p2) const language_t *find_language(unsigned id) { - return (const language_t *)bsearch(&id, languages, NLAN, sizeof(languages[0]), langcmp); + return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages), + sizeof(languages[0]), langcmp); } void show_codepages(void) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6db02c8a72..3529a5b99c 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -666,10 +666,10 @@ void add_translations( const char *po_dir ) if ((p = strchr( buffer, '#' ))) *p = 0; for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) { - for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) + for (i = 0; i < ARRAY_SIZE(languages); i++) if (!strcmp( tok, languages[i].name )) break; - if (i == sizeof(languages)/sizeof(languages[0])) + if (i == ARRAY_SIZE(languages)) error( "unknown language '%s'\n", tok ); name = strmake( "%s/%s.mo", po_dir, tok ); -- 2.14.5

1 0