February 2018 - Wine-commits

Nikolay Sivov : wincodecs: Encoder options are optional for CreateNewFrame ().
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 0be89601f57388e5788151d2176c0d24e9aaa76a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0be89601f57388e5788151d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 19:59:33 2018 +0300 wincodecs: Encoder options are optional for CreateNewFrame(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 7 +++++-- dlls/windowscodecs/icnsformat.c | 9 ++++++--- dlls/windowscodecs/jpegformat.c | 11 +++++++---- dlls/windowscodecs/pngformat.c | 11 +++++++---- dlls/windowscodecs/tests/converter.c | 18 ++++++++++++++++++ dlls/windowscodecs/tiffformat.c | 2 +- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 48a8e27..047154e 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -508,8 +508,11 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, if (!This->stream) return WINCODEC_ERR_NOTINITIALIZED; - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); - if (FAILED(hr)) return hr; + if (ppIEncoderOptions) + { + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + if (FAILED(hr)) return hr; + } encode = HeapAlloc(GetProcessHeap(), 0, sizeof(BmpFrameEncode)); if (!encode) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 14144f7..aa96404 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -617,9 +617,12 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, goto end; } - hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); - if (FAILED(hr)) - goto end; + if (ppIEncoderOptions) + { + hr = CreatePropertyBag2(NULL, 0, ppIEncoderOptions); + if (FAILED(hr)) + goto end; + } frameEncode = HeapAlloc(GetProcessHeap(), 0, sizeof(IcnsFrameEncode)); if (frameEncode == NULL) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 6617ec7..433a031 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1466,11 +1466,14 @@ static HRESULT WINAPI JpegEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); - if (FAILED(hr)) + if (ppIEncoderOptions) { - LeaveCriticalSection(&This->lock); - return hr; + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } } This->frame_count = 1; diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 117761c..26b5fd5 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -2055,11 +2055,14 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, return WINCODEC_ERR_NOTINITIALIZED; } - hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); - if (FAILED(hr)) + if (ppIEncoderOptions) { - LeaveCriticalSection(&This->lock); - return hr; + hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } } This->frame_count = 1; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 704ae5d..80423dc 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,24 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls int i; hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapEncoder, (void **)&encoder); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + + hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); + ok(SUCCEEDED(hr), "Initialize failed, hr=%x\n", hr); + + /* Encoder options are optional. */ + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frameencode, NULL); + ok(SUCCEEDED(hr), "Failed to create encode frame, hr %#x.\n", hr); + + IStream_Release(stream); + IWICBitmapEncoder_Release(encoder); + IWICBitmapFrameEncode_Release(frameencode); + + hr = CoCreateInstance(clsid_encoder, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f165e18..f125b07 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1957,7 +1957,7 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, hr = E_FAIL; } - if (SUCCEEDED(hr)) + if (ppIEncoderOptions && SUCCEEDED(hr)) { hr = CreatePropertyBag2(opts, sizeof(opts)/sizeof(opts[0]), ppIEncoderOptions); if (SUCCEEDED(hr))

1 0

Daniel Lehman : ole32: Return error from IStream Clone.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 8ec17b8e73f107af508a89cde51294e0d345bfb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec17b8e73f107af508a89cd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 19 10:39:17 2018 -0800 ole32: Return error from IStream Clone. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_stream.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index a3abf46..1a5f061 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -23,7 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h> @@ -604,7 +603,6 @@ static HRESULT WINAPI StgStreamImpl_Clone( IStream** ppstm) /* [out] */ { StgStreamImpl* This = impl_from_IStream(iface); - HRESULT hres; StgStreamImpl* new_stream; LARGE_INTEGER seek_pos; @@ -630,11 +628,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( seek_pos.QuadPart = This->currentPosition.QuadPart; - hres = IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); - - assert (SUCCEEDED(hres)); - - return S_OK; + return IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); } /*

1 0

Michael Stefaniuc : gdiplus: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: fb12076e1a840faa5b5271731125a13e814dbd15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb12076e1a840faa5b527173… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 30 23:40:58 2018 +0100 gdiplus: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 76e5b9b..ea79f11 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -30,6 +30,7 @@ #include "objbase.h" #include "ocidl.h" #include "wincodecsdk.h" +#include "wine/heap.h" #include "wine/list.h" #include "gdiplus.h" @@ -49,25 +50,6 @@ #define GIF_DISPOSE_RESTORE_TO_BKGND 2 #define GIF_DISPOSE_RESTORE_TO_PREV 3 -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} COLORREF ARGB2COLORREF(ARGB color) DECLSPEC_HIDDEN; HBITMAP ARGB2BMP(ARGB color) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : comctl32/toolbar: Fix a crash when tracing special button string identifier.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 2e8dfbb1ad71f24c41e8485a39df01bb9304127f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e8dfbb1ad71f24c41e8485a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 23:32:14 2018 +0300 comctl32/toolbar: Fix a crash when tracing special button string identifier. Based on patch by Mark Jansen <mark.jansen(a)reactos.org>. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index f9a2220..a48fddf 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -284,9 +284,9 @@ TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) static void TOOLBAR_DumpTBButton(const TBBUTTON *tbb, BOOL fUnicode) { - TRACE("TBBUTTON: id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx (%s)\n", - tbb->idCommand,tbb->iBitmap, tbb->fsState, tbb->fsStyle, tbb->dwData, tbb->iString, - (fUnicode ? wine_dbgstr_w((LPWSTR)tbb->iString) : wine_dbgstr_a((LPSTR)tbb->iString))); + TRACE("TBBUTTON: id %d, bitmap=%d, state=%02x, style=%02x, data=%p, stringid=%p (%s)\n", tbb->idCommand, + tbb->iBitmap, tbb->fsState, tbb->fsStyle, (void *)tbb->dwData, (void *)tbb->iString, + tbb->iString != -1 ? (fUnicode ? debugstr_w((LPWSTR)tbb->iString) : debugstr_a((LPSTR)tbb->iString)) : ""); } static void

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_device_prepare_index_buffer().
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 2e027f866825f7fb6a69f90c88e95e3bfbc5f6dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e027f866825f7fb6a69f90c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:56 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_device_prepare_index_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 28bb2fb..75fd6c4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3650,15 +3650,22 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; }

1 0

Henri Verbeet : d3d11: Use the global memory allocation helpers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 600d6b0199015039909981196196175b3fd76a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=600d6b019901503990998119… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 4 17:38:57 2018 +0330 d3d11: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 6 +++--- dlls/d3d11/buffer.c | 6 +++--- dlls/d3d11/d3d11_private.h | 8 +------ dlls/d3d11/device.c | 6 +++--- dlls/d3d11/inputlayout.c | 11 +++++----- dlls/d3d11/shader.c | 52 +++++++++++++++++++++++----------------------- dlls/d3d11/state.c | 28 ++++++++++++------------- dlls/d3d11/texture.c | 12 +++++------ dlls/d3d11/view.c | 24 ++++++++++----------- 9 files changed, 73 insertions(+), 80 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=600d6b01990150399099…

1 0

Nikolay Sivov : user32: Fix names returned with GetClassName().
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: a21b16d8cb0f0acefc0f1cb6ea646c5ddf752c48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21b16d8cb0f0acefc0f1cb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 00:29:44 2018 +0300 user32: Fix names returned with GetClassName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 39 +++++++++++++++++++++++++++------------ dlls/user32/tests/class.c | 2 -- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index fd9af7f..8fba5bf 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -61,6 +61,7 @@ typedef struct tagCLASS HBRUSH hbrBackground; /* Default background */ ATOM atomName; /* Name of the class */ WCHAR name[MAX_ATOM_LEN + 1]; + WCHAR *basename; /* Base name for redirected classes, pointer within 'name'. */ } CLASS; static struct list class_list = LIST_INIT( class_list ); @@ -324,7 +325,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -337,6 +338,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) ULONG module_offset; } *wndclass; + if (basename_offset) + *basename_offset = 0; + if (IS_INTRESOURCE( name )) return name; @@ -348,6 +352,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) return name; wndclass = (struct wndclass_redirect_data *)data.lpData; + if (basename_offset) + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); } @@ -366,7 +373,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name ); + name = CLASS_GetVersionedName( name, NULL ); for (;;) { @@ -408,7 +415,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) * * The real RegisterClass() functionality. */ -static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local, +static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE hInstance, BOOL local, DWORD style, INT classExtra, INT winExtra ) { CLASS *classPtr; @@ -428,7 +435,12 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local if (!classPtr) return NULL; classPtr->atomName = get_int_atom_value( name ); - if (!classPtr->atomName && name) strcpyW( classPtr->name, name ); + classPtr->basename = classPtr->name; + if (!classPtr->atomName && name) + { + strcpyW( classPtr->name, name ); + classPtr->basename += basename_offset; + } else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) ); SERVER_START_REQ( create_class ) @@ -476,7 +488,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; - if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE, + if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE, descr->style, 0, descr->extra ))) return; if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); @@ -632,14 +644,15 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!IS_INTRESOURCE(wc->lpszClassName)) { + UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name ); - classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( name, &basename_offset ); + classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } else { - classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, instance, + classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, 0, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -672,6 +685,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; + UINT basename_offset; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -686,8 +700,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName ); - if (!(classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset ); + if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -739,7 +753,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className ); + className = CLASS_GetVersionedName( className, NULL ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); @@ -1155,7 +1169,8 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) } else { - lstrcpynW( buffer, class->name, count ); + /* Return original name class was registered with. */ + lstrcpynW( buffer, class->basename, count ); release_class_ptr( class ); ret = strlenW( buffer ); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 13d7b9d..9ae306e 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1250,7 +1250,6 @@ static void test_actctx_classes(void) ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); -todo_wine ok(!strcmp(buff, testclass), "Unexpected class name.\n"); ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); @@ -1270,7 +1269,6 @@ todo_wine ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); -todo_wine ok(!strcmp(buff, testclass), "Unexpected class name.\n"); DestroyWindow(hwnd); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf0e3c7..f1cc0a8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -269,7 +269,7 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c3360f9..b13032b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1338,7 +1338,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className); + className = CLASS_GetVersionedName(className, NULL); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName),

1 0

Nikolay Sivov : comctl32/edit: Fix class style mask.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 73cd9809f3fd979f8c3a5fc4fb67af380b85fc06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73cd9809f3fd979f8c3a5fc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 00:30:10 2018 +0300 comctl32/edit: Fix class style mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 2 +- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index a01b75b..9f065f6 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -5007,7 +5007,7 @@ void EDIT_Register(void) WNDCLASSW wndClass; memset(&wndClass, 0, sizeof(wndClass)); - wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS; + wndClass.style = CS_PARENTDC | CS_GLOBALCLASS | CS_DBLCLKS; wndClass.lpfnWndProc = EDIT_WindowProc; wndClass.cbClsExtra = 0; #ifdef __i386__ diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 46bb431..bef92b8 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -345,7 +345,7 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno if (GetClassInfoA( 0, name, &wc )) { -todo_wine +todo_wine_if(strcmp(name, "Edit")) ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", name, ~wc.style & style, wc.style, style ); ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n",

1 0

Nikolay Sivov : comctl32/edit: Handle Ctrl-A shortcut as select all command.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: f7062d1d03c374bf8ba872f97e15261ee61ebaeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7062d1d03c374bf8ba872f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 00:30:11 2018 +0300 comctl32/edit: Handle Ctrl-A shortcut as select all command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 9f065f6..86a0a58 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1477,12 +1477,15 @@ static void EDIT_InvalidateText(EDITSTATE *es, INT start, INT end) * In other words: this handler is OK * */ -static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) +static BOOL EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) { UINT old_start = es->selection_start; UINT old_end = es->selection_end; UINT len = get_text_length(es); + if (start == old_start && end == old_end) + return FALSE; + if (start == (UINT)-1) { start = es->selection_end; end = es->selection_end; @@ -1535,6 +1538,8 @@ static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap) } } else EDIT_InvalidateText(es, start, old_end); + + return TRUE; } @@ -3365,6 +3370,16 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) if ((es->style & ES_MULTILINE) && EDIT_IsInsideDialog(es)) SendMessageW(es->hwndParent, WM_NEXTDLGCTL, shift, 0); break; + case 'A': + if (control) + { + if (EDIT_EM_SetSel(es, 0, get_text_length(es), FALSE)) + { + EDIT_NOTIFY_PARENT(es, EN_UPDATE); + EDIT_NOTIFY_PARENT(es, EN_CHANGE); + } + } + break; } return TRUE; }

1 0

Michael Stefaniuc : spoolss: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 05 Feb '18

05 Feb '18

Module: wine Branch: master Commit: 8d3b7e943b4b3ee83d696cfffb09cbec9914ba1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d3b7e943b4b3ee83d696cff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:58 2018 +0100 spoolss: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/router.c | 1 + dlls/spoolss/spoolss.h | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 3d239b4..764721b 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -31,6 +31,7 @@ #include "spoolss.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(spoolss); diff --git a/dlls/spoolss/spoolss.h b/dlls/spoolss/spoolss.h index 67b3891..b4a8853 100644 --- a/dlls/spoolss/spoolss.h +++ b/dlls/spoolss/spoolss.h @@ -23,20 +23,3 @@ BOOL backend_load_all(void) DECLSPEC_HIDDEN; void backend_unload_all(void) DECLSPEC_HIDDEN; - -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -}

1 0