October 2014 - Wine-commits

Bruno Jesus : regedit: Append exported strings using the correct size.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 01b0746906bf2f570e5faca68714076384d0f600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b0746906bf2f570e5faca68… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Oct 24 22:01:02 2014 -0200 regedit: Append exported strings using the correct size. --- programs/regedit/regproc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 18b6e98..d07fdc7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1180,10 +1180,7 @@ static void export_hkey(FILE *file, HKEY key, lstrcpyW(*line_buf + line_len, start); line_len += len; - /* At this point we know wstr is '\0'-terminated - * so we can subtract 1 from the size - */ - REGPROC_export_string(line_buf, line_buf_size, &line_len, wstr, val_size1 / sizeof(WCHAR) - 1); + REGPROC_export_string(line_buf, line_buf_size, &line_len, wstr, lstrlenW(wstr)); REGPROC_resize_char_buffer(line_buf, line_buf_size, line_len + lstrlenW(end)); lstrcpyW(*line_buf + line_len, end);

1 0

Ken Thomases : winemac: Don' t allow double-clicks in the content area to zoom the window.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: d9ed0fb8e5028cb264c10f1e15c8bf2f3658ca41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ed0fb8e5028cb264c10f1e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Oct 27 22:54:29 2014 -0500 winemac: Don't allow double-clicks in the content area to zoom the window. On Yosemite, double-clicking a window's title bar zooms it. (This is to compensate for the fact that the zoom button has been replaced by a full-screen button.) Sometimes, double-clicking in the content area would count as double- clicking in the title bar. This is controlled, in part, by the -mouseDownCanMoveWindow method of the view that was hit in the window. The default implementation of that returns YES for non-opaque views, as the views are in the Mac driver. Overriding it to return NO prevents the problem. --- dlls/winemac.drv/cocoa_window.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 35222c1..b2238cb 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -374,6 +374,11 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif return [[self window] contentView] == self; } + - (BOOL) mouseDownCanMoveWindow + { + return NO; + } + - (void) completeText:(NSString*)text { macdrv_event* event;

1 0

Alexandre Julliard : write: Always append a backslash to the system directory.
by Alexandre Julliard 28 Oct '14

28 Oct '14

Module: wine Branch: master Commit: 1555f29fc63feef6b650f904ba1799c3733a4d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1555f29fc63feef6b650f904b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 28 15:47:42 2014 +0900 write: Always append a backslash to the system directory. --- programs/write/write.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/programs/write/write.c b/programs/write/write.c index 8012355..4039af4 100644 --- a/programs/write/write.c +++ b/programs/write/write.c @@ -25,8 +25,7 @@ #include <windows.h> #include "resources.h" -static const WCHAR SZ_BACKSLASH[] = {'\\',0}; -static const WCHAR SZ_WORDPAD[] = {'w','o','r','d','p','a','d','.','e','x','e',0}; +static const WCHAR SZ_WORDPAD[] = {'\\','w','o','r','d','p','a','d','.','e','x','e',0}; int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) { @@ -36,8 +35,6 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdPar if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) goto failed; - if (path[lstrlenW(path) - 1] != '\\') - lstrcatW(path, SZ_BACKSLASH); lstrcatW(path, SZ_WORDPAD); stinf.cb = sizeof(STARTUPINFOW);

1 0

Jeremy Newman : set open graph images for announcements and wwn
by Jeremy Newman 27 Oct '14

27 Oct '14

Module: website Branch: master Commit: 92be36f05cd1609f91e46fe9842cf1aa8255fe95 URL: http://source.winehq.org/git/website.git/?a=commit;h=92be36f05cd1609f91e46f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Oct 27 09:38:07 2014 -0500 set open graph images for announcements and wwn --- templates/en/announce.template | 1 + templates/en/wwn.template | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/en/announce.template b/templates/en/announce.template index 0f82da6..cbe2efa 100644 --- a/templates/en/announce.template +++ b/templates/en/announce.template @@ -1,5 +1,6 @@   + <h1 class="title">Wine Announcement</h1> diff --git a/templates/en/wwn.template b/templates/en/wwn.template index 9135c58..a6a5ba3 100644 --- a/templates/en/wwn.template +++ b/templates/en/wwn.template @@ -1,5 +1,6 @@   + <h1 class="title">World Wine News</h1> <div style="font-size: x-small; margin-top: 0;">All the news that fits, we print.</div>

1 0

Nikolay Sivov : dwrite/tests: Fix recently inroduced test failure.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: be69977cd5abc1620be87e777dbf29630fe4e62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be69977cd5abc1620be87e777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 26 20:49:26 2014 +0300 dwrite/tests: Fix recently inroduced test failure. --- dlls/dwrite/tests/font.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3830bc9..2b84ba1 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1200,8 +1200,12 @@ static void test_CreateCustomFontFileReference(void) IDWriteFontFace_Release(face2); /* file was created with different factory */ + face2 = NULL; hr = IDWriteFactory_CreateFontFace(factory2, face_type, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &face2); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (face2) + IDWriteFontFace_Release(face2); file2 = NULL; hr = IDWriteFactory_CreateCustomFontFileReference(factory, &fontrsrc, sizeof(HRSRC), &rloader, &file2);

1 0

Nikolay Sivov : dwrite: Block attempts of registering local file loader.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 5b10a69c3ad3ffd4f27b892ba37164ac76be20c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b10a69c3ad3ffd4f27b892ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:24:47 2014 +0300 dwrite: Block attempts of registering local file loader. --- dlls/dwrite/main.c | 6 ++++++ dlls/dwrite/tests/font.c | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1e10431..05d853f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -813,6 +813,9 @@ static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + if (factory_get_file_loader(This, loader)) return DWRITE_E_ALREADYREGISTERED; @@ -838,6 +841,9 @@ static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *ifa if (!loader) return E_INVALIDARG; + if ((IDWriteFontFileLoader*)This->localfontfileloader == loader) + return S_OK; + found = factory_get_file_loader(This, loader); if (!found) return E_INVALIDARG; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2b84ba1..d9e927f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -885,8 +885,7 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory2); - ok(hr == S_OK, "got 0x%08x\n", hr); + factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); ok(coll2 != collection, "got %p, was %p\n", coll2, collection); @@ -943,6 +942,19 @@ if (file) { ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + + /* try with a different factory */ + factory2 = create_factory(); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == DWRITE_E_ALREADYREGISTERED), "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontFileLoader(factory2, loader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory2, loader); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + IDWriteFactory_Release(factory2); + IDWriteFontFileLoader_Release(loader); } ret = TRUE;

1 0

Nikolay Sivov : dwrite: Initialize allocation size for a family before using it.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 340aa07f60a12e1dab74e779786ace4c4ad7d329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340aa07f60a12e1dab74e7797… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:25:19 2014 +0300 dwrite: Initialize allocation size for a family before using it. --- dlls/dwrite/font.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d55e06d..708a6d8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -56,8 +56,8 @@ struct dwrite_fontfamily_data { IDWriteLocalizedStrings *familyname; struct dwrite_font_data **fonts; - UINT32 font_count; - UINT32 alloc; + UINT32 font_count; + UINT32 font_alloc; }; struct dwrite_fontcollection { @@ -1440,16 +1440,16 @@ static HRESULT add_family_syscollection(struct dwrite_fontcollection *collection static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, struct dwrite_font_data *font_data) { - if (family_data->font_count + 1 >= family_data->alloc) { + if (family_data->font_count + 1 >= family_data->font_alloc) { struct dwrite_font_data **new_list; UINT32 new_alloc; - new_alloc = family_data->alloc * 2; + new_alloc = family_data->font_alloc * 2; new_list = heap_realloc(family_data->fonts, sizeof(*family_data->fonts) * new_alloc); if (!new_list) return E_OUTOFMEMORY; family_data->fonts = new_list; - family_data->alloc = new_alloc; + family_data->font_alloc = new_alloc; } family_data->fonts[family_data->font_count] = font_data; @@ -1558,16 +1558,16 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct dwrite_fontfamily_data *data) { - data->fonts = heap_alloc(sizeof(*data->fonts)*data->alloc); + data->ref = 1; + data->font_count = 0; + data->font_alloc = 2; + + data->fonts = heap_alloc(sizeof(*data->fonts)*data->font_alloc); if (!data->fonts) { heap_free(data); return E_OUTOFMEMORY; } - data->ref = 1; - data->font_count = 0; - data->alloc = 2; - data->familyname = familyname; IDWriteLocalizedStrings_AddRef(familyname); @@ -1761,7 +1761,7 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon data->ref = 0; data->font_count = 0; - data->alloc = 2; + data->font_alloc = 2; data->fonts = heap_alloc(sizeof(*data->fonts) * 2); if (!data->fonts) {

1 0

Nikolay Sivov : dwrite: Implement GetFontFromFontFace().
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 1ab456fde3bec9768ac4045e6fdf2263dad8a7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab456fde3bec9768ac4045e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:25:43 2014 +0300 dwrite: Implement GetFontFromFontFace(). --- dlls/dwrite/font.c | 50 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 708a6d8..50c3acb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -47,6 +47,8 @@ struct dwrite_font_data { IDWriteFontFile *file; UINT32 face_index; + IDWriteFontFace2 *face; + WCHAR *facename; }; @@ -88,7 +90,6 @@ struct dwrite_font { BOOL is_system; IDWriteFontFamily *family; - IDWriteFontFace2 *face; struct dwrite_font_data *data; }; @@ -220,6 +221,8 @@ static void release_font_data(struct dwrite_font_data *data) IDWriteFontFile_Release(data->file); if (data->factory) IDWriteFactory_Release(data->factory); + if (data->face) + IDWriteFontFace2_Release(data->face); heap_free(data->facename); heap_free(data); } @@ -735,7 +738,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 *fontface = NULL; - if (!font->face) { + if (!font->data->face) { struct dwrite_font_data *data = font->data; IDWriteFontFace *face; @@ -745,11 +748,11 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 if (FAILED(hr)) return hr; - hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->face); + hr = IDWriteFontFace_QueryInterface(face, &IID_IDWriteFontFace2, (void**)&font->data->face); IDWriteFontFace_Release(face); } - *fontface = font->face; + *fontface = font->data->face; return hr; } @@ -909,7 +912,6 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) { - if (This->face) IDWriteFontFace2_Release(This->face); if (This->family) IDWriteFontFamily_Release(This->family); release_font_data(This->data); heap_free(This); @@ -1406,8 +1408,40 @@ static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection *iface, IDWriteFontFace *face, IDWriteFont **font) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); - FIXME("(%p)->(%p %p): stub\n", This, face, font); - return E_NOTIMPL; + struct dwrite_fontfamily_data *found_family = NULL; + struct dwrite_font_data *found_font = NULL; + IDWriteFontFamily *family; + UINT32 i, j; + HRESULT hr; + + TRACE("(%p)->(%p %p)\n", This, face, font); + + *font = NULL; + + if (!face) + return E_INVALIDARG; + + for (i = 0; i < This->data_count; i++) { + struct dwrite_fontfamily_data *family_data = This->family_data[i]; + for (j = 0; j < family_data->font_count; j++) { + if ((IDWriteFontFace*)family_data->fonts[j]->face == face) { + found_font = family_data->fonts[j]; + found_family = family_data; + break; + } + } + } + + if (!found_font) + return E_INVALIDARG; + + hr = create_fontfamily_from_data(found_family, iface, &family); + if (FAILED(hr)) + return hr; + + hr = create_font_from_data(found_font, family, font); + IDWriteFontFamily_Release(family); + return hr; } static const IDWriteFontCollectionVtbl fontcollectionvtbl = { @@ -1534,6 +1568,7 @@ static HRESULT init_font_data(IDWriteFactory *factory, IDWriteFontFile *file, UI data->factory = factory; data->file = file; + data->face = NULL; data->face_index = face_index; data->face_type = face_type; IDWriteFontFile_AddRef(file); @@ -1790,7 +1825,6 @@ static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFontF This->IDWriteFont2_iface.lpVtbl = &dwritefontvtbl; This->ref = 1; - This->face = NULL; This->family = family; if (family) IDWriteFontFamily_AddRef(family);

1 0

Nikolay Sivov : dwrite: Allow null arguments in opentype_get_font_table().
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 34823028e17c3f34e1e7e23642ef4239841a1750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34823028e17c3f34e1e7e2364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 27 11:26:22 2014 +0300 dwrite: Allow null arguments in opentype_get_font_table(). --- dlls/dwrite/opentype.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c007b35..c6f7a52 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -322,7 +322,8 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ int table_count, table_offset = 0; int i; - *found = FALSE; + if (found) *found = FALSE; + if (table_size) *table_size = 0; if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { const TTC_Header_V1 *ttc_header; @@ -363,8 +364,8 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ int length = GET_BE_DWORD(table_record->length); IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); - *found = TRUE; - *table_size = length; + if (found) *found = TRUE; + if (table_size) *table_size = length; hr = IDWriteFontFileStream_ReadFileFragment(stream, table_data, offset, length, table_context); }

1 0

Alexandre Julliard : xcopy: Avoid a potential out of bounds access.
by Alexandre Julliard 27 Oct '14

27 Oct '14

Module: wine Branch: master Commit: 7711f494e39432984b177e0a18a204dd75bc4cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7711f494e39432984b177e0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 17:46:38 2014 +0900 xcopy: Avoid a potential out of bounds access. --- programs/xcopy/xcopy.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index 7ff751c..2134a5e 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -271,11 +271,9 @@ static BOOL XCOPY_ProcessExcludeFile(WCHAR* filename, WCHAR* endOfName) { EXCLUDELIST *thisEntry; int length = lstrlenW(buffer); - /* Strip CRLF */ - buffer[length-1] = 0x00; - /* If more than CRLF */ if (length > 1) { + buffer[length-1] = 0; /* strip CRLF */ thisEntry = HeapAlloc(GetProcessHeap(), 0, sizeof(EXCLUDELIST)); thisEntry->next = excludeList; excludeList = thisEntry;

1 0