November 2018 - Wine-Commits

Henri Verbeet : d3dx9: Use a staging texture to update unmappable surfaces in D3DXLoadSurfaceFromMemory ().
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 9ab14dff87c7d3ddae18d9e862cbe3edca81d8c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ab14dff87c7d3ddae18d9e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 18 22:27:19 2018 +0330 d3dx9: Use a staging texture to update unmappable surfaces in D3DXLoadSurfaceFromMemory(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 53 +++++++++++++++++++++++++++++++++---------- dlls/d3dx9_36/tests/surface.c | 1 - 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a44398c..7d48cc6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1753,9 +1753,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, DWORD filter, D3DCOLOR color_key) { const struct pixel_format_desc *srcformatdesc, *destformatdesc; + IDirect3DSurface9 *surface = dst_surface; + IDirect3DDevice9 *device; D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; + HRESULT hr; TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, @@ -1811,6 +1814,26 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, return E_NOTIMPL; } + if (surfdesc.Pool == D3DPOOL_DEFAULT && !(surfdesc.Usage & D3DUSAGE_DYNAMIC)) + { + IDirect3DSurface9_GetDevice(dst_surface, &device); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, surfdesc.Width, + surfdesc.Height, surfdesc.Format, D3DPOOL_SYSTEMMEM, &surface, NULL); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + { + WARN("Failed to create staging surface, hr %#x.\n", hr); + return D3DERR_INVALIDCALL; + } + } + + if (FAILED(IDirect3DSurface9_LockRect(surface, &lockrect, dst_rect, 0))) + { + if (surface != dst_surface) + IDirect3DSurface9_Release(surface); + return D3DXERR_INVALIDDATA; + } + if (src_format == surfdesc.Format && dst_size.width == src_size.width && dst_size.height == src_size.height @@ -1824,16 +1847,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && src_size.height != surfdesc.Height)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); - return D3DXERR_INVALIDDATA; + hr = D3DXERR_INVALIDDATA; + goto done; } - if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) - return D3DXERR_INVALIDDATA; - copy_pixels(src_memory, src_pitch, 0, lockrect.pBits, lockrect.Pitch, 0, &src_size, srcformatdesc); - - IDirect3DSurface9_UnlockRect(dst_surface); } else /* Stretching or format conversion. */ { @@ -1841,12 +1860,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, || !is_conversion_to_supported(destformatdesc)) { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); - return E_NOTIMPL; + hr = E_NOTIMPL; + goto done; } - if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) - return D3DXERR_INVALIDDATA; - if ((filter & 0xf) == D3DX_FILTER_NONE) { convert_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, @@ -1862,11 +1879,23 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, point_filter_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key, src_palette); } + } - IDirect3DSurface9_UnlockRect(dst_surface); + hr = D3D_OK; +done: + IDirect3DSurface9_UnlockRect(surface); + if (surface != dst_surface) + { + if (SUCCEEDED(hr)) + { + IDirect3DSurface9_GetDevice(dst_surface, &device); + hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, dst_surface, NULL); + IDirect3DDevice9_Release(device); + } + IDirect3DSurface9_Release(surface); } - return D3D_OK; + return hr; } /************************************************************ diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 469c864..f153cd9 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -867,7 +867,6 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine

1 0

Nikolay Sivov : server: Use base class atom for child window enumeration.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: b5f179655ca8eacdb6ed9b4471bf55362789c1e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f179655ca8eacdb6ed9b44… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 16:08:47 2018 +0300 server: Use base class atom for child window enumeration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 4 ---- server/class.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 6c5850f..d6910d9 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1354,11 +1354,9 @@ static void test_actctx_classes(void) ok(hwnd != NULL, "Failed to create a window.\n"); hwnd2 = FindWindowExA(NULL, NULL, "MyTestClass", NULL); -todo_wine ok(hwnd2 == hwnd, "Failed to find test window.\n"); hwnd2 = FindWindowExA(NULL, NULL, "4.3.2.1!MyTestClass", NULL); -todo_wine ok(hwnd2 == NULL, "Unexpected find result %p.\n", hwnd2); ret = GetClassNameA(hwnd, buff, sizeof(buff)); @@ -1390,11 +1388,9 @@ todo_wine ok(hwnd != NULL, "Failed to create a window.\n"); hwnd2 = FindWindowExA(NULL, NULL, "MyTestClass", NULL); -todo_wine ok(hwnd2 == hwnd, "Failed to find test window.\n"); hwnd2 = FindWindowExA(NULL, NULL, "4.3.2.1!MyTestClass", NULL); -todo_wine ok(hwnd2 == NULL, "Unexpected find result %p.\n", hwnd2); DestroyWindow(hwnd); diff --git a/server/class.c b/server/class.c index 6a7de78..403180d 100644 --- a/server/class.c +++ b/server/class.c @@ -139,7 +139,7 @@ int is_hwnd_message_class( struct window_class *class ) atom_t get_class_atom( struct window_class *class ) { - return class->atom; + return class->base_atom; } client_ptr_t get_class_client_ptr( struct window_class *class )

1 0

Alexandre Julliard : wineandroid: Add helper functions to encapsulate gralloc functionality.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 18ac6bf41a640449161cae4f8371aeda169fb4bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ac6bf41a640449161cae4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 19 16:06:51 2018 +0100 wineandroid: Add helper functions to encapsulate gralloc functionality. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 3 +- dlls/wineandroid.drv/device.c | 72 +++++++++++++++++++++++++++++------------- dlls/wineandroid.drv/init.c | 14 ++++---- 3 files changed, 59 insertions(+), 30 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 2a9ac81..b218a9b 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -88,6 +88,7 @@ enum android_window_messages WM_ANDROID_REFRESH = 0x80001000, }; +extern void init_gralloc( const struct hw_module_t *module ) DECLSPEC_HIDDEN; extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; extern void set_screen_dpi( DWORD dpi ) DECLSPEC_HIDDEN; @@ -155,6 +156,4 @@ int send_event( const union event_data *data ); extern JavaVM *wine_get_java_vm(void); extern jobject wine_get_java_object(void); -extern struct gralloc_module_t *gralloc_module; - #endif /* __WINE_ANDROID_H */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 328f2fa..a6f2838 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -212,6 +212,8 @@ struct ioctl_android_set_capture struct ioctl_header hdr; }; +static struct gralloc_module_t *gralloc_module; + static inline BOOL is_in_desktop_process(void) { return thread != NULL; @@ -496,6 +498,44 @@ void register_native_window( HWND hwnd, struct ANativeWindow *win, BOOL opengl ) NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, opengl ); } +void init_gralloc( const struct hw_module_t *module ) +{ + TRACE( "got module %p ver %u.%u id %s name %s author %s\n", + module, module->module_api_version >> 8, module->module_api_version & 0xff, + debugstr_a(module->id), debugstr_a(module->name), debugstr_a(module->author) ); + + gralloc_module = (struct gralloc_module_t *)module; +} + +static int gralloc_grab_buffer( struct ANativeWindowBuffer *buffer ) +{ + if (gralloc_module) + return gralloc_module->registerBuffer( gralloc_module, buffer->handle ); + return -ENODEV; +} + +static void gralloc_release_buffer( struct ANativeWindowBuffer *buffer ) +{ + if (gralloc_module) gralloc_module->unregisterBuffer( gralloc_module, buffer->handle ); + close_native_handle( (native_handle_t *)buffer->handle ); +} + +static int gralloc_lock( struct ANativeWindowBuffer *buffer, void **bits ) +{ + if (gralloc_module) + return gralloc_module->lock( gralloc_module, buffer->handle, + GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN, + 0, 0, buffer->width, buffer->height, bits ); + + *bits = ((struct native_buffer_wrapper *)buffer)->bits; + return 0; +} + +static void gralloc_unlock( struct ANativeWindowBuffer *buffer ) +{ + if (gralloc_module) gralloc_module->unlock( gralloc_module, buffer->handle ); +} + /* get the capture window stored in the desktop process */ HWND get_capture_window(void) { @@ -740,12 +780,10 @@ static NTSTATUS queueBuffer_ioctl( void *data, DWORD in_size, DWORD out_size, UL if (win_data->mappings[res->buffer_id]) { void *bits; - int ret = gralloc_module->lock( gralloc_module, buffer->handle, - GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN, - 0, 0, buffer->width, buffer->height, &bits ); + ret = gralloc_lock( buffer, &bits ); if (ret) return android_error_to_status( ret ); memcpy( bits, win_data->mappings[res->buffer_id], buffer->stride * buffer->height * 4 ); - gralloc_module->unlock( gralloc_module, buffer->handle ); + gralloc_unlock( buffer ); } wrap_java_call(); ret = parent->queueBuffer( parent, buffer, -1 ); @@ -1084,11 +1122,7 @@ static void buffer_decRef( struct android_native_base_t *base ) if (!InterlockedDecrement( &buffer->ref )) { - if (!is_in_desktop_process()) - { - if (gralloc_module) gralloc_module->unregisterBuffer( gralloc_module, buffer->buffer.handle ); - close_native_handle( (native_handle_t *)buffer->buffer.handle ); - } + if (!is_in_desktop_process()) gralloc_release_buffer( &buffer->buffer ); if (buffer->bits) UnmapViewOfFile( buffer->bits ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -1140,8 +1174,9 @@ static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuff } else if (!is_in_desktop_process()) { - if ((ret = gralloc_module->registerBuffer( gralloc_module, buf->buffer.handle )) < 0) - WARN( "hwnd %p, buffer %p failed to register %d %s\n", win->hwnd, &buf->buffer, ret, strerror(-ret) ); + if ((ret = gralloc_grab_buffer( &buf->buffer )) < 0) + WARN( "hwnd %p, buffer %p failed to register %d %s\n", + win->hwnd, &buf->buffer, ret, strerror(-ret) ); } } @@ -1313,18 +1348,11 @@ static int perform( ANativeWindow *window, int operation, ... ) int ret = window->dequeueBuffer_DEPRECATED( window, &buffer ); if (!ret) { - if (gralloc_module) + if ((ret = gralloc_lock( buffer, &buffer_ret->bits ))) { - if ((ret = gralloc_module->lock( gralloc_module, buffer->handle, - GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN, - 0, 0, buffer->width, buffer->height, &buffer_ret->bits ))) - { - WARN( "gralloc->lock %p failed %d %s\n", win->hwnd, ret, strerror(-ret) ); - window->cancelBuffer( window, buffer, -1 ); - } + WARN( "gralloc->lock %p failed %d %s\n", win->hwnd, ret, strerror(-ret) ); + window->cancelBuffer( window, buffer, -1 ); } - else - buffer_ret->bits = ((struct native_buffer_wrapper *)buffer)->bits; } if (!ret) { @@ -1350,7 +1378,7 @@ static int perform( ANativeWindow *window, int operation, ... ) int ret = -EINVAL; if (win->locked_buffer) { - if (gralloc_module) gralloc_module->unlock( gralloc_module, win->locked_buffer->handle ); + gralloc_unlock( win->locked_buffer ); ret = window->queueBuffer( window, win->locked_buffer, -1 ); win->locked_buffer = NULL; } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index d199696..b5c85ee 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -450,8 +450,6 @@ DECL_FUNCPTR( ANativeWindow_fromSurface ); DECL_FUNCPTR( ANativeWindow_release ); DECL_FUNCPTR( hw_get_module ); -struct gralloc_module_t *gralloc_module = NULL; - #ifndef DT_GNU_HASH #define DT_GNU_HASH 0x6ffffef5 #endif @@ -564,6 +562,7 @@ static int enum_libs( struct dl_phdr_info* info, size_t size, void* data ) static void load_hardware_libs(void) { const struct hw_module_t *module; + int ret; void *libhardware; char error[256]; @@ -589,10 +588,13 @@ static void load_hardware_libs(void) } } - if (phw_get_module( GRALLOC_HARDWARE_MODULE_ID, &module ) == 0) - gralloc_module = (struct gralloc_module_t *)module; - else - ERR( "failed to load gralloc module\n" ); + if ((ret = phw_get_module( GRALLOC_HARDWARE_MODULE_ID, &module ))) + { + ERR( "failed to load gralloc module err %d\n", ret ); + return; + } + + init_gralloc( module ); } static void load_android_libs(void)

1 0

Nikolay Sivov : user32/tests: Add FindWindow() test for versioned class.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: e8897ebe4ec60408d1d774bf1e4fe0b45549c00b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8897ebe4ec60408d1d774bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 19 16:08:46 2018 +0300 user32/tests: Add FindWindow() test for versioned class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/class.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 5db37d4a..6c5850f 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1319,7 +1319,7 @@ static void test_actctx_classes(void) ATOM class; HINSTANCE hinst; char buff[64]; - HWND hwnd; + HWND hwnd, hwnd2; char path[MAX_PATH]; GetTempPathA(ARRAY_SIZE(path), path); @@ -1353,6 +1353,14 @@ static void test_actctx_classes(void) hwnd = CreateWindowExA(0, testclass, "test", 0, 0, 0, 0, 0, 0, 0, hinst, 0); ok(hwnd != NULL, "Failed to create a window.\n"); + hwnd2 = FindWindowExA(NULL, NULL, "MyTestClass", NULL); +todo_wine + ok(hwnd2 == hwnd, "Failed to find test window.\n"); + + hwnd2 = FindWindowExA(NULL, NULL, "4.3.2.1!MyTestClass", NULL); +todo_wine + ok(hwnd2 == NULL, "Unexpected find result %p.\n", hwnd2); + ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); ok(!strcmp(buff, testclass), "Unexpected class name.\n"); @@ -1378,6 +1386,19 @@ static void test_actctx_classes(void) DestroyWindow(hwnd); + hwnd = CreateWindowExA(0, "4.3.2.1!MyTestClass", "test", 0, 0, 0, 0, 0, 0, 0, hinst, 0); + ok(hwnd != NULL, "Failed to create a window.\n"); + + hwnd2 = FindWindowExA(NULL, NULL, "MyTestClass", NULL); +todo_wine + ok(hwnd2 == hwnd, "Failed to find test window.\n"); + + hwnd2 = FindWindowExA(NULL, NULL, "4.3.2.1!MyTestClass", NULL); +todo_wine + ok(hwnd2 == NULL, "Unexpected find result %p.\n", hwnd2); + + DestroyWindow(hwnd); + ret = UnregisterClassA("MyTestClass", hinst); ok(!ret, "Unexpected ret value %d.\n", ret);

1 0

Piotr Caban : msvcrt: Add _vscprintf_l implementation.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 381e549b8138126635d65652d58c6c0801b4c25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=381e549b8138126635d65652… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 22:55:30 2018 +0100 msvcrt: Add _vscprintf_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 151d6ae..d9f9271 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1446,7 +1446,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index abb6ada..e0508bb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1803,7 +1803,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8b7b154..c9547bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1821,7 +1821,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d293900..c1f6e0b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1515,7 +1515,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) msvcr120._vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) msvcr120._vscprintf_l @ cdecl _vscprintf_p(str ptr) msvcr120._vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) msvcr120._vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcr120._vscwprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index aa89792..1f78197 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1125,7 +1125,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cf604b7..2181a8f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1101,7 +1101,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e4d0aad..d71d37a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1058,7 +1058,7 @@ # stub _vprintf_s_l(str ptr ptr) @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -# stub _vscprintf_l(str ptr ptr) +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 27c9eb8..a6d7c1f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1017,6 +1017,15 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) } /********************************************************************* + * _vscprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscprintf_l(const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + return MSVCRT_vsnprintf_l(NULL, INT_MAX, format, locale, valist); +} + +/********************************************************************* * _vscprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT__vscprintf_p_l(const char *format,

1 0

Andre Heider : winegcc: Add -I for the prefix's include dir.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 0e279d26b8386fc878f17bd6768e46e1cf9c5128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e279d26b8386fc878f17bd6… Author: Andre Heider <a.heider(a)gmail.com> Date: Sun Nov 18 18:26:57 2018 +0100 winegcc: Add -I for the prefix's include dir. This allows external projects to e.g. "#include <wine/debug.h>" for non-standard prefixes, like winehq's distro packages residing in /opt. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/Makefile.in | 2 +- tools/winegcc/winegcc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 6de23b0..daeb91b 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ winegcc.c winegcc_EXTRADEFS = \ - -DINCLUDEDIR="\"${includedir}/wine\"" \ + -DINCLUDEDIR="\"${includedir}\"" \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 76442d8..6b3b4b6a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -672,10 +672,11 @@ no_compat_defines: { if (opts->use_msvcrt) { - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/msvcrt" : "-I" INCLUDEDIR "/msvcrt" ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/windows" : "-I" INCLUDEDIR "/windows" ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR : "-I" INCLUDEDIR ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); } else if (opts->wine_objdir) strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) );

1 0

Michael Stefaniuc : services: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 82c8c88b95e420b1e4b406786b63c7ad769bbe00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c8c88b95e420b1e4b40678… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:39 2018 +0100 services: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1973d27..3de46bd 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -664,7 +664,7 @@ static LPWSTR service_get_pipe_name(void) { static const WCHAR format[] = { '\\','\\','.','\\','p','i','p','e','\\', 'n','e','t','\\','N','t','C','o','n','t','r','o','l','P','i','p','e','%','u',0}; - static WCHAR name[sizeof(format)/sizeof(WCHAR) + 10]; /* strlenW("4294967295") */ + static WCHAR name[ARRAY_SIZE(format) + 10]; /* strlenW("4294967295") */ static DWORD service_current = 0; DWORD len, value = -1; LONG ret; @@ -776,7 +776,7 @@ static DWORD add_winedevice_service(const struct service_entry *service, WCHAR * struct service_entry **entry) { static const WCHAR format[] = {'W','i','n','e','d','e','v','i','c','e','%','u',0}; - static WCHAR name[sizeof(format)/sizeof(WCHAR) + 10]; /* strlenW("4294967295") */ + static WCHAR name[ARRAY_SIZE(format) + 10]; /* strlenW("4294967295") */ static DWORD current = 0; struct scmdatabase *db = service->db; DWORD err;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Move the auto-suggest listbox along with the edit control.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 2c03e0c67d371f9e2d2e771a09b9e8d4620bcaf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c03e0c67d371f9e2d2e771a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 16 17:38:04 2018 +0200 shell32/autocomplete: Move the auto-suggest listbox along with the edit control. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index c9bf9ff..236ba15 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -611,6 +611,15 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* Reset the enumerator if it's not visible anymore */ if (!IsWindowVisible(hwnd)) free_enum_strs(This); break; + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *pos = (WINDOWPOS*)lParam; + + if ((pos->flags & (SWP_NOMOVE | SWP_NOSIZE)) != (SWP_NOMOVE | SWP_NOSIZE) && + This->hwndListBox && IsWindowVisible(This->hwndListBox)) + show_listbox(This); + break; + } case WM_KEYDOWN: return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR:

1 0

Michael Stefaniuc : wintab32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 000c708e3b13cfe733ad092b17753ea747d39e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000c708e3b13cfe733ad092b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:37 2018 +0100 wintab32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/wintab32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 3037963..fe535fa 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -89,7 +89,7 @@ static HMODULE load_graphics_driver(void) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); if (!guid_atom) return 0;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Retrieve the count in show_listbox.
by Alexandre Julliard Nov. 19, 2018

Nov. 19, 2018

Module: wine Branch: master Commit: 7ac4c0ea8c7079988eb162ba447d81896848fd65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac4c0ea8c7079988eb162ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 16 17:38:03 2018 +0200 shell32/autocomplete: Retrieve the count in show_listbox. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6d8988b..c9bf9ff 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -193,15 +193,16 @@ static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) if (reset) free_enum_strs(ac); } -static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +static void show_listbox(IAutoCompleteImpl *ac) { RECT r; - UINT width, height; + UINT cnt, width, height; GetWindowRect(ac->hwndEdit, &r); SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + cnt = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); width = r.right - r.left; @@ -404,7 +405,7 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, { /* Return FALSE if we need to hide the listbox */ WCHAR **str = ac->enum_strs; - UINT cnt, start, end; + UINT start, end; if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; /* Windows seems to disable autoappend if ACO_NOPREFIXFILTERING is set */ @@ -432,15 +433,14 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, if (end == 0) return FALSE; } - cnt = end - start; SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); - SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, end - start, 0); for (; start < end; start++) SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[start]); - show_listbox(ac, cnt); + show_listbox(ac); SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); return TRUE; }

1 0