November 2012 - Wine-Commits

Alexandre Julliard : setupapi: Fix total size when appending multi-string values.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 4b7085fdd499ca39a7e0ae47bd27323876103df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7085fdd499ca39a7e0ae47b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 12:31:59 2012 +0100 setupapi: Fix total size when appending multi-string values. --- dlls/setupapi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index e216e8c..dda1396 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -242,7 +242,7 @@ static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s { memcpy( p, strings, len * sizeof(WCHAR) ); p[len] = 0; - total += len; + total += len * sizeof(WCHAR); } strings += len; }

1 0

Nikolay Sivov : dwrite: Add a separate function to copy text format data.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: cfaf8be90645513a4677f79f66c752745ebe553a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfaf8be90645513a4677f79f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 26 11:01:58 2012 -0500 dwrite: Add a separate function to copy text format data. --- dlls/dwrite/layout.c | 61 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8e63f5c..d9e4a99 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -62,6 +62,8 @@ struct dwrite_textformat { struct dwrite_textformat_data format; }; +static const IDWriteTextFormatVtbl dwritetextformatvtbl; + static void release_format_data(struct dwrite_textformat_data *data) { if (data->collection) IDWriteFontCollection_Release(data->collection); @@ -79,6 +81,11 @@ static inline struct dwrite_textformat *impl_from_IDWriteTextFormat(IDWriteTextF return CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat_iface); } +static inline struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface) +{ + return iface->lpVtbl == &dwritetextformatvtbl ? impl_from_IDWriteTextFormat(iface) : NULL; +} + static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout *iface, REFIID riid, void **obj) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); @@ -672,10 +679,46 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { dwritetextlayout_HitTestTextRange }; +static void layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) +{ + struct dwrite_textformat *f; + + memset(&layout->format, 0, sizeof(layout->format)); + + if ((f = unsafe_impl_from_IDWriteTextFormat(format))) + { + layout->format = f->format; + layout->format.locale = heap_strdupW(f->format.locale); + layout->format.family_name = heap_strdupW(f->format.family_name); + } + else + { + UINT32 locale_len, family_len; + + layout->format.weight = IDWriteTextFormat_GetFontWeight(format); + layout->format.style = IDWriteTextFormat_GetFontStyle(format); + layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); + layout->format.size = IDWriteTextFormat_GetFontSize(format); + + /* locale name and length */ + locale_len = IDWriteTextFormat_GetLocaleNameLength(format); + layout->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetLocaleName(format, layout->format.locale, locale_len+1); + layout->format.locale_len = locale_len; + + /* font family name and length */ + family_len = IDWriteTextFormat_GetFontFamilyNameLength(format); + layout->format.family_name = heap_alloc((family_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetFontFamilyName(format, layout->format.family_name, family_len+1); + layout->format.family_len = family_len; + } + + IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); +} + HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; - UINT32 locale_len; *layout = NULL; @@ -686,21 +729,7 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma This->ref = 1; This->str = heap_strdupnW(str, len); This->len = len; - memset(&This->format, 0, sizeof(This->format)); - - /* reference is not kept here, instead copy all underlying data */ - IDWriteTextFormat_GetFontCollection(format, &This->format.collection); - - /* locale name and length */ - locale_len = IDWriteTextFormat_GetLocaleNameLength(format); - This->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); - IDWriteTextFormat_GetLocaleName(format, This->format.locale, locale_len+1); - This->format.locale_len = locale_len; - - This->format.weight = IDWriteTextFormat_GetFontWeight(format); - This->format.style = IDWriteTextFormat_GetFontStyle(format); - This->format.stretch = IDWriteTextFormat_GetFontStretch(format); - This->format.size = IDWriteTextFormat_GetFontSize(format); + layout_format_from_textformat(This, format); *layout = &This->IDWriteTextLayout_iface;

1 0

Andrew Talbot : xmllite: Void functions should not return a value.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 40300b24ccb1a1aeeed7de9e8c5ad4afcacfe1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40300b24ccb1a1aeeed7de9e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:32 2012 +0000 xmllite: Void functions should not return a value. --- dlls/xmllite/reader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 3f22152..8ad78d8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -146,7 +146,7 @@ static inline void *reader_alloc(xmlreader *reader, size_t len) static inline void reader_free(xmlreader *reader, void *mem) { - return m_free(reader->imalloc, mem); + m_free(reader->imalloc, mem); } /* reader input memory allocation functions */ @@ -162,7 +162,7 @@ static inline void *readerinput_realloc(xmlreaderinput *input, void *mem, size_t static inline void readerinput_free(xmlreaderinput *input, void *mem) { - return m_free(input->imalloc, mem); + m_free(input->imalloc, mem); } static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str)

1 0

Andrew Talbot : inkobj: Remove unused variable.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 16b43ef0721406acb82c353765db482e7d26f3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b43ef0721406acb82c35376… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 24 21:09:39 2012 +0000 inkobj: Remove unused variable. --- dlls/inkobj/inkobj.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c index 4120144..f199f56 100644 --- a/dlls/inkobj/inkobj.c +++ b/dlls/inkobj/inkobj.c @@ -20,7 +20,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(inkobj); static LONG INKOBJ_refCount; -static HINSTANCE INKOBJ_hInstance; /***************************************************** * DllMain (INKOBJ.init) @@ -35,7 +34,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); - INKOBJ_hInstance = hinst; break; } return TRUE;

1 0

Dmitry Timoshkov : oleaut32: Add a test for loading/saving an empty picture .
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 6c53c4ee036c849f80104c0116f779946d19670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c53c4ee036c849f80104c011… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 26 17:49:58 2012 +0800 oleaut32: Add a test for loading/saving an empty picture. --- dlls/oleaut32/tests/olepicture.c | 53 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 696f8cd..ee97fe2 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1059,6 +1059,58 @@ todo_wine IPicture_Release(pic); } +static void test_load_save_empty_picture(void) +{ + IPicture *pic; + PICTDESC desc; + short type; + OLE_HANDLE handle; + HGLOBAL hmem; + DWORD *mem; + IPersistStream *src_stream; + IStream *dst_stream; + HRESULT hr; + + memset(&pic, 0, sizeof(pic)); + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_NONE; + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void **)&pic); + ok(hr == S_OK, "OleCreatePictureIndirect error %#x\n", hr); + + type = -1; + hr = IPicture_get_Type(pic, &type); + ok(hr == S_OK,"get_Type error %#8x\n", hr); + ok(type == PICTYPE_NONE,"expected picture type PICTYPE_NONE, got %d\n", type); + + handle = (OLE_HANDLE)0xdeadbeef; + hr = IPicture_get_Handle(pic, &handle); + ok(hr == S_OK,"get_Handle error %#8x\n", hr); + ok(!handle, "get_Handle returned wrong handle %#x\n", handle); + + hmem = GlobalAlloc(GMEM_ZEROINIT, 4096); + hr = CreateStreamOnHGlobal(hmem, FALSE, &dst_stream); + ok(hr == S_OK, "createstreamonhglobal error %#x\n", hr); + + hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); + ok(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistStream_Save(src_stream, dst_stream, TRUE); +todo_wine + ok(hr == S_OK, "Save error %#x\n", hr); + + mem = GlobalLock(hmem); +todo_wine + ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); + ok(mem[1] == 0, "expected stream size 0, got %u\n", mem[1]); + GlobalUnlock(hmem); + + IPersistStream_Release(src_stream); + IStream_Release(dst_stream); + + GlobalFree(hmem); + IPicture_Release(pic); +} + START_TEST(olepicture) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -1097,6 +1149,7 @@ START_TEST(olepicture) test_himetric(); test_load_save_bmp(); test_load_save_icon(); + test_load_save_empty_picture(); }

1 0

Dmitry Timoshkov : oleaut32: Add support for saving an empty picture.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 97e2c24cc7e065f67aae099941a47a541380a35f URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e2c24cc7e065f67aae09994… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 26 19:54:23 2012 +0800 oleaut32: Add support for saving an empty picture. --- dlls/oleaut32/olepicture.c | 6 ++++++ dlls/oleaut32/tests/olepicture.c | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index db3b852..3fdb1c7 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1757,6 +1757,12 @@ static HRESULT WINAPI OLEPictureImpl_Save( TRACE("%p %p %d\n", This, pStm, fClearDirty); switch (This->desc.picType) { + case PICTYPE_NONE: + header[0] = 0x0000746c; + header[1] = 0; + hResult = IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + break; + case PICTYPE_ICON: if (This->bIsDirty || !This->data) { if (!serializeIcon(This->desc.u.icon.hicon, &pIconData, &iDataSize)) { diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ee97fe2..db10baa 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -1095,11 +1095,9 @@ static void test_load_save_empty_picture(void) ok(hr == S_OK, "QueryInterface error %#x\n", hr); hr = IPersistStream_Save(src_stream, dst_stream, TRUE); -todo_wine ok(hr == S_OK, "Save error %#x\n", hr); mem = GlobalLock(hmem); -todo_wine ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04x\n", mem[0]); ok(mem[1] == 0, "expected stream size 0, got %u\n", mem[1]); GlobalUnlock(hmem);

1 0

Hans Leidekker : ole32: Convert the remaining RegCreateKey and RegOpenKey calls to the wrappers.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: 7895eae15be4f1f7e2f3f1eba3a5be368ad8cd25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7895eae15be4f1f7e2f3f1eba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 15:20:48 2012 +0100 ole32: Convert the remaining RegCreateKey and RegOpenKey calls to the wrappers. --- dlls/ole32/comcat.c | 52 +++++++++++++++++++------------------------ dlls/ole32/compobj.c | 8 +++--- dlls/ole32/ole2.c | 21 +++-------------- dlls/ole32/storage32.c | 3 +- dlls/ole32/tests/compobj.c | 26 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7895eae15be4f1f7e2f3f…

1 0

Hans Leidekker : ole32: Use wrappers around NT functions to access the registry in CoGetPSClsid.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: a82c49028d1450aaa60c8e1b059c460ab3fab9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82c49028d1450aaa60c8e1b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 26 15:20:13 2012 +0100 ole32: Use wrappers around NT functions to access the registry in CoGetPSClsid. --- dlls/ole32/compobj.c | 119 +++++++++++++++++++++++++++++++++++++++++- dlls/ole32/compobj_private.h | 3 + dlls/ole32/tests/compobj.c | 2 +- 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9c92c32..70508b6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -47,6 +47,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -135,6 +137,121 @@ static CRITICAL_SECTION_DEBUG class_cs_debug = }; static CRITICAL_SECTION csRegisteredClassList = { &class_cs_debug, -1, 0, 0, 0, 0 }; +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr ) +{ + NTSTATUS status = NtCreateKey( (HANDLE *)retkey, access, attr, 0, NULL, 0, NULL ); + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + HANDLE subkey, root = attr->RootDirectory; + WCHAR *buffer = attr->ObjectName->Buffer; + DWORD attrs, pos = 0, i = 0, len = attr->ObjectName->Length / sizeof(WCHAR); + UNICODE_STRING str; + + while (i < len && buffer[i] != '\\') i++; + if (i == len) return status; + + attrs = attr->Attributes; + attr->ObjectName = &str; + + while (i < len) + { + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &subkey, access, attr, 0, NULL, 0, NULL ); + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + if (status) return status; + attr->RootDirectory = subkey; + while (i < len && buffer[i] == '\\') i++; + pos = i; + while (i < len && buffer[i] != '\\') i++; + } + str.Buffer = buffer + pos; + str.Length = (i - pos) * sizeof(WCHAR); + attr->Attributes = attrs; + status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, NULL, 0, NULL ); + if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); + } + return status; +} + +static const WCHAR classes_rootW[] = + {'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0}; + +static HKEY classes_root_hkey; + +/* create the special HKEY_CLASSES_ROOT key */ +static HKEY create_classes_root_hkey(void) +{ + HKEY hkey, ret = 0; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &name, classes_rootW ); + if (create_key( &hkey, MAXIMUM_ALLOWED, &attr )) return 0; + TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey ); + + if (!(ret = InterlockedCompareExchangePointer( (void **)&classes_root_hkey, hkey, 0 ))) + ret = hkey; + else + NtClose( hkey ); /* somebody beat us to it */ + return ret; +} + +/* map the hkey from special root to normal key if necessary */ +static inline HKEY get_classes_root_hkey( HKEY hkey ) +{ + HKEY ret = hkey; + + if (hkey == HKEY_CLASSES_ROOT && !(ret = classes_root_hkey)) + ret = create_classes_root_hkey(); + + return ret; +} + +LSTATUS create_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError( create_key( retkey, access, &attr ) ); +} + +LSTATUS open_classes_key( HKEY hkey, const WCHAR *name, REGSAM access, HKEY *retkey ) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + + if (!(hkey = get_classes_root_hkey( hkey ))) return ERROR_INVALID_HANDLE; + + attr.Length = sizeof(attr); + attr.RootDirectory = hkey; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, name ); + + return RtlNtStatusToDosError( NtOpenKey( (HANDLE *)retkey, access, &attr ) ); +} + /***************************************************************************** * This section contains OpenDllList definitions * @@ -2055,7 +2172,7 @@ HRESULT WINAPI CoGetPSClsid(REFIID riid, CLSID *pclsid) strcpyW(path + ARRAYSIZE(wszInterface) - 1 + CHARS_IN_GUID - 1, wszPSC); /* Open the key.. */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &hkey)) + if (open_classes_key(HKEY_CLASSES_ROOT, path, KEY_READ, &hkey)) { WARN("No PSFactoryBuffer object is registered for IID %s\n", debugstr_guid(riid)); return REGDB_E_IIDNOTREG; diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 0039655..b76e3a7 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -309,4 +309,7 @@ extern UINT object_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT link_source_descriptor_clipboard_format DECLSPEC_HIDDEN; extern UINT ole_private_data_clipboard_format DECLSPEC_HIDDEN; +extern LSTATUS create_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; +extern LSTATUS open_classes_key(HKEY, const WCHAR *, REGSAM, HKEY *) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 048b082..714feee 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -755,7 +755,7 @@ static void test_CoGetPSClsid(void) ok(!res, "RegOverridePredefKey returned %d\n", res); hr = CoGetPSClsid(&IID_IClassFactory, &clsid); - todo_wine ok_ole_success(hr, "CoGetPSClsid"); + ok_ole_success(hr, "CoGetPSClsid"); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, NULL); ok(!res, "RegOverridePredefKey returned %d\n", res);

1 0

Alexandre Julliard : user32: Send WM_MOVING instead of WM_SIZING when moving a window.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: e2c61baba0ceb0ca50d5a6506108d34af8a69122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c61baba0ceb0ca50d5a6506… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 26 16:01:30 2012 +0100 user32: Send WM_MOVING instead of WM_SIZING when moving a window. --- dlls/user32/winpos.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 0ce3ddd..308e7ea 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2771,8 +2771,6 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (msg.message == WM_KEYDOWN) SetCursorPos( pt.x, pt.y ); else { - WPARAM wpSizingHit = 0; - if(!iconic && !DragFullWindows) draw_moving_frame( parent, hdc, &sizingRect, thickframe ); if (hittest == HTCAPTION) OffsetRect( &sizingRect, dx, dy ); if (ON_LEFT_BORDER(hittest)) sizingRect.left += dx; @@ -2782,9 +2780,16 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) capturePoint = pt; /* determine the hit location */ - if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) - wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); - SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&sizingRect ); + if (syscommand == SC_SIZE) + { + WPARAM wpSizingHit = 0; + + if (hittest >= HTLEFT && hittest <= HTBOTTOMRIGHT) + wpSizingHit = WMSZ_LEFT + (hittest - HTLEFT); + SendMessageW( hwnd, WM_SIZING, wpSizingHit, (LPARAM)&sizingRect ); + } + else + SendMessageW( hwnd, WM_MOVING, 0, (LPARAM)&sizingRect ); if (!iconic) {

1 0

Daniel Jelinski : wine.inf: Add registry info for lanmanserver service.
by Alexandre Julliard Nov. 26, 2012

Nov. 26, 2012

Module: wine Branch: master Commit: ba4de80ee373b08be3ebcd2bf73e98bef88e40aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4de80ee373b08be3ebcd2bf… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Thu Nov 1 22:00:56 2012 +0100 wine.inf: Add registry info for lanmanserver service. --- tools/wine.inf.in | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 4704fd6..9d0650f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -125,6 +125,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService @@ -135,6 +136,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService @@ -145,6 +147,7 @@ AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices AddService=PlugPlay,0,PlugPlayService AddService=FontCache3.0.0.0,0,FontCacheService +AddService=LanmanServer,0,LanmanServerService [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" @@ -2987,6 +2990,19 @@ ServiceType=16 StartType=3 ErrorControl=1 +[LanmanServerService] +AddReg=LanmanServerServiceKeys +Description="Lanman Server" +DisplayName="Lanman Server" +ServiceBinary="%11%\svchost.exe -k netsvcs" +ServiceType=32 +StartType=4 +ErrorControl=1 + +[LanmanServerServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\srvsvc.dll" +;; HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"lanmanserver" + [Services] HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16

1 0