wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Józef Kucia : d3d11/tests: Allow passing any interface to get_refcount().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 2553ea2e3db4465858f4deb9175b1f21f130cf1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2553ea2e3db4465858f4deb91… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:25 2017 +0200 d3d11/tests: Allow passing any interface to get_refcount(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 157 ++++++++++++++++++++++++----------------------- 1 file changed, 79 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2553ea2e3db4465858f4d…

1 0

Józef Kucia : d3d10core/tests: Allow passing any interface to get_refcount().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 11462929314e2ae0b0e5d340c3333eedaf029dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11462929314e2ae0b0e5d340c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:24 2017 +0200 d3d10core/tests: Allow passing any interface to get_refcount(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 133 +++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11462929314e2ae0b0e5d…

1 0

Nikolay Sivov : shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 5badc91a0fe9933f0dc60ca8a74b68cf66559b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5badc91a0fe9933f0dc60ca8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 13:21:42 2017 +0300 shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 3 ++- dlls/shell32/tests/ebrowser.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index bbccf88..07046502 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -782,7 +782,8 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface, { *ppvObject = &This->IExplorerBrowser_iface; } - else if(IsEqualIID(riid, &IID_IShellBrowser)) + else if(IsEqualIID(riid, &IID_IShellBrowser) || + IsEqualIID(riid, &IID_IOleWindow)) { *ppvObject = &This->IShellBrowser_iface; } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c04a2b4..7db5842 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -575,7 +575,7 @@ static void test_QueryInterface(void) test_qinterface(IID_IUnknown, S_OK); test_qinterface(IID_IExplorerBrowser, S_OK); test_qinterface(IID_IShellBrowser, S_OK); - todo_wine test_qinterface(IID_IOleWindow, S_OK); + test_qinterface(IID_IOleWindow, S_OK); test_qinterface(IID_ICommDlgBrowser, S_OK); test_qinterface(IID_ICommDlgBrowser2, S_OK); test_qinterface(IID_ICommDlgBrowser3, S_OK);

1 0

Huw Davies : explorer: Don't alter the shell imagelist.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 6eeb389d15274f2a62293ecdb587138ebe1b415b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eeb389d15274f2a62293ecdb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 24 08:59:42 2017 +0100 explorer: Don't alter the shell imagelist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 8bfb826..43466dc 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -105,42 +105,43 @@ static ULONG WINAPI IExplorerBrowserEventsImpl_fnRelease(IExplorerBrowserEvents return ref; } -static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImageList *icon_list, COMBOBOXEXITEMW *item) +static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST child_pidl, IImageList *icon_list, COMBOBOXEXITEMW *item) { STRRET strret; HRESULT hres; - IExtractIconW *extract_icon; - UINT reserved; - WCHAR icon_file[MAX_PATH]; - INT icon_index; - UINT icon_flags; - HICON icon; + PIDLIST_ABSOLUTE parent_pidl, pidl; + SHFILEINFOW info; + IImageList *list; + strret.uType=STRRET_WSTR; - hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret); + hres = IShellFolder_GetDisplayNameOf( folder, child_pidl, SHGDN_FORADDRESSBAR, &strret ); if(SUCCEEDED(hres)) - hres = StrRetToStrW(&strret, pidl, &item->pszText); + hres = StrRetToStrW(&strret, child_pidl, &item->pszText); if(FAILED(hres)) { WINE_WARN("Could not get name for pidl\n"); return FALSE; } - hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW, - &reserved,(void**)&extract_icon); - if(SUCCEEDED(hres)) - { - item->mask |= CBEIF_IMAGE; - IExtractIconW_GetIconLocation(extract_icon,GIL_FORSHELL,icon_file, - sizeof(icon_file)/sizeof(WCHAR), - &icon_index,&icon_flags); - IExtractIconW_Extract(extract_icon,icon_file,icon_index,NULL,&icon,20); - item->iImage = ImageList_AddIcon((HIMAGELIST)icon_list,icon); - IExtractIconW_Release(extract_icon); - } - else + + item->mask &= ~CBEIF_IMAGE; + hres = SHGetIDListFromObject( (IUnknown *)folder, &parent_pidl ); + if (FAILED(hres)) return FALSE; + + pidl = ILCombine( parent_pidl, child_pidl ); + if (pidl) { - item->mask &= ~CBEIF_IMAGE; - WINE_WARN("Could not get an icon for %s\n",wine_dbgstr_w(item->pszText)); + list = (IImageList *)SHGetFileInfoW( (WCHAR *)pidl, 0, &info, sizeof(info), + SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_SYSICONINDEX ); + if (list) + { + IImageList_Release( list ); + item->iImage = info.iIcon; + item->mask |= CBEIF_IMAGE; + } + ILFree( pidl ); } + ILFree( parent_pidl ); + return TRUE; } @@ -153,7 +154,6 @@ static void update_path_box(explorer_info *info) LPITEMIDLIST desktop_pidl; IEnumIDList *ids; - ImageList_Remove((HIMAGELIST)info->icon_list,-1); SendMessageW(info->path_box,CB_RESETCONTENT,0,0); SHGetDesktopFolder(&desktop); IShellFolder_QueryInterface(desktop,&IID_IPersistFolder2,(void**)&persist);

1 0

Michael Müller : kernel32: Add stub for GetPackageFullName.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 2b79436ab96e69359d0b105b939f07b0543cdecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b79436ab96e69359d0b105b9… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 23 23:36:31 2017 +0200 kernel32: Add stub for GetPackageFullName. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 50f8594..4d2edd6 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -10,7 +10,7 @@ @ stub GetCurrentPackagePath @ stub GetPackageApplicationIds @ stub GetPackageFamilyName -@ stub GetPackageFullName +@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName @ stub GetPackageId @ stub GetPackageInfo @ stub GetPackagePath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 31ce456..5ef7cb8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -761,6 +761,7 @@ @ stdcall GetOEMCP() @ stdcall GetOverlappedResult(long ptr ptr long) @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr) +@ stdcall GetPackageFullName(long ptr ptr) @ stdcall GetPhysicallyInstalledSystemMemory(ptr) @ stdcall GetPriorityClass(long) @ stdcall GetPrivateProfileIntA(str str long str) diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index 5a233ef..3cca2ae 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -228,3 +228,12 @@ LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name) FIXME("(%p %p): stub\n", length, name); return APPMODEL_ERROR_NO_PACKAGE; } + +/*********************************************************************** + * GetPackageFullName (KERNEL32.@) + */ +LONG WINAPI GetPackageFullName(HANDLE process, UINT32 *length, PWSTR name) +{ + FIXME("(%p %p %p): stub\n", process, length, name); + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index cf6ceef..689d587 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -593,7 +593,7 @@ # @ stub GetPackageContext # @ stub GetPackageFamilyName # @ stub GetPackageFamilyNameFromToken -# @ stub GetPackageFullName +@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName # @ stub GetPackageFullNameFromToken # @ stub GetPackageId # @ stub GetPackageInfo

1 0

Michael Müller : ntdll: Add stub for JobObjectBasicAccountingInformation and JobObjectBasicProcessIdList.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 62ae2ae1a101f0409b1d2bee26e2dbbb662507ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ae2ae1a101f0409b1d2bee2… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 23 23:22:25 2017 +0200 ntdll: Add stub for JobObjectBasicAccountingInformation and JobObjectBasicProcessIdList. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 10 ++++++++-- dlls/ntdll/sync.c | 24 ++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 04feb71..c480a27 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2515,7 +2515,6 @@ static void test_QueryInformationJobObject(void) ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList), &ret_len); ok(!ret, "QueryInformationJobObject expected failure\n"); - todo_wine expect_eq_d(ERROR_BAD_LENGTH, GetLastError()); SetLastError(0xdeadbeef); @@ -2524,18 +2523,20 @@ static void test_QueryInformationJobObject(void) pid_list->NumberOfProcessIdsInList = 42; ret = QueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[1]), &ret_len); + todo_wine ok(!ret, "QueryInformationJobObject expected failure\n"); todo_wine expect_eq_d(ERROR_MORE_DATA, GetLastError()); if (ret) { + todo_wine expect_eq_d(42, pid_list->NumberOfAssignedProcesses); + todo_wine expect_eq_d(42, pid_list->NumberOfProcessIdsInList); } memset(buf, 0, sizeof(buf)); ret = pQueryInformationJobObject(job, JobObjectBasicProcessIdList, pid_list, sizeof(buf), &ret_len); - todo_wine ok(ret, "QueryInformationJobObject error %u\n", GetLastError()); if(ret) { @@ -2545,12 +2546,17 @@ static void test_QueryInformationJobObject(void) { ULONG_PTR *list = pid_list->ProcessIdList; + todo_wine ok(ret_len == FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[2]), "QueryInformationJobObject returned ret_len=%u\n", ret_len); + todo_wine expect_eq_d(2, pid_list->NumberOfAssignedProcesses); + todo_wine expect_eq_d(2, pid_list->NumberOfProcessIdsInList); + todo_wine expect_eq_d(pi[0].dwProcessId, list[0]); + todo_wine expect_eq_d(pi[1].dwProcessId, list[1]); } } diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index c179760..cfb5cbc 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -645,6 +645,30 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c switch (class) { + case JobObjectBasicAccountingInformation: + { + JOBOBJECT_BASIC_ACCOUNTING_INFORMATION *accounting; + if (len < sizeof(*accounting)) + return STATUS_INFO_LENGTH_MISMATCH; + + accounting = (JOBOBJECT_BASIC_ACCOUNTING_INFORMATION *)info; + memset(accounting, 0, sizeof(*accounting)); + if (ret_len) *ret_len = sizeof(*accounting); + return STATUS_SUCCESS; + } + + case JobObjectBasicProcessIdList: + { + JOBOBJECT_BASIC_PROCESS_ID_LIST *process; + if (len < sizeof(*process)) + return STATUS_INFO_LENGTH_MISMATCH; + + process = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)info; + memset(process, 0, sizeof(*process)); + if (ret_len) *ret_len = sizeof(*process); + return STATUS_SUCCESS; + } + case JobObjectExtendedLimitInformation: { JOBOBJECT_EXTENDED_LIMIT_INFORMATION *extended_limit;

1 0

Michael Müller : ntdll: Mark LDR data as initialized.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: a3452656147cb5cf74d2f7380d83200e001eaffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3452656147cb5cf74d2f7380… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 23 23:17:00 2017 +0200 ntdll: Mark LDR data as initialized. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 7 +++++-- dlls/ntdll/thread.c | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4f72c3e..2587a97 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2991,10 +2991,13 @@ static void test_ResolveDelayLoadedAPI(void) static void test_InMemoryOrderModuleList(void) { - LIST_ENTRY *entry1, *mark1 = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - LIST_ENTRY *entry2, *mark2 = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + PEB_LDR_DATA *ldr = NtCurrentTeb()->Peb->LdrData; + LIST_ENTRY *entry1, *mark1 = &ldr->InLoadOrderModuleList; + LIST_ENTRY *entry2, *mark2 = &ldr->InMemoryOrderModuleList; LDR_MODULE *module1, *module2; + ok(ldr->Initialized == TRUE, "expected TRUE, got %u\n", ldr->Initialized); + for (entry1 = mark1->Flink, entry2 = mark2->Flink; entry1 != mark1 && entry2 != mark2; entry1 = entry1->Flink, entry2 = entry2->Flink) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c9a5da6..0506f6b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -259,6 +259,7 @@ HANDLE thread_init(void) params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); params.wShowWindow = 1; /* SW_SHOWNORMAL */ ldr.Length = sizeof(ldr); + ldr.Initialized = TRUE; RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, sizeof(peb->TlsExpansionBitmapBits) * 8 );

1 0

Nikolay Sivov : include: Fix IShellFolderView method macros.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 16d21d94c182b0a5ce3b9b22a5049e2eb1d425e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d21d94c182b0a5ce3b9b22a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:51:44 2017 +0300 include: Fix IShellFolderView method macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 0f754d0..ccbf008 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -662,11 +662,11 @@ DECLARE_INTERFACE_(IShellFolderView, IUnknown) #define IShellFolderView_GetDropPoint(p,a) (p)->lpVtbl->GetDropPoint(p,a) #define IShellFolderView_MoveIcons(p,a) (p)->lpVtbl->MoveIcons(p,a) #define IShellFolderView_SetItemPos(p,a,b) (p)->lpVtbl->SetItemPos(p,a,b) -#define IShellFolderView_DropTarget(p,a) (p)->lpVtbl->DropTarget(p,a) +#define IShellFolderView_IsBkDropTarget(p,a) (p)->lpVtbl->IsBkDropTarget(p,a) #define IShellFolderView_SetClipboard(p,a) (p)->lpVtbl->SetClipboard(p,a) #define IShellFolderView_SetPoints(p,a) (p)->lpVtbl->SetPoints(p,a) #define IShellFolderView_GetItemSpacing(p,a) (p)->lpVtbl->GetItemSpacing(p,a) -#define IShellFolderView_SetCallback(p,a) (p)->lpVtbl->SetCallback(p,a) +#define IShellFolderView_SetCallback(p,a,b) (p)->lpVtbl->SetCallback(p,a,b) #define IShellFolderView_Select(p,a) (p)->lpVtbl->Select(p,a) #define IShellFolderView_QuerySupport(p,a) (p)->lpVtbl->QuerySupport(p,a) #define IShellFolderView_SetAutomationObject(p,a) (p)->lpVtbl->SetAutomationObject(p,a)

1 0

Nikolay Sivov : dwrite: Look for 'SVG ' table too when checking supported formats.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 1b1488fda7e3cecae028c1198f00d1dcf2fc40dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1488fda7e3cecae028c1198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:50:46 2017 +0300 dwrite: Look for 'SVG ' table too when checking supported formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 6 +++++- dlls/dwrite/tests/font.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b7e9d87..99531a6 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') +#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -2069,6 +2070,9 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) if (opentype_has_font_table(fontface, MS_COLR_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; - /* TODO: handle SVG and bitmap data */ + if (opentype_has_font_table(fontface, MS_SVG__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + + /* TODO: handle embedded bitmaps tables */ return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4d5780c..9fd8258 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -45,6 +45,7 @@ #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') +#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -7436,7 +7437,10 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) if (face_has_table(fontface, MS_COLR_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; - /* TODO: handle SVG and bitmap data */ + if (face_has_table(fontface, MS_SVG__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + + /* TODO: handle embedded bitmaps tables */ return ret; }

1 0

Nikolay Sivov : shell32: Fix string leak.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: f74e1b1fb1d9033385375b93152484734753dc14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74e1b1fb1d9033385375b931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 23 18:29:08 2017 +0300 shell32: Fix string leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 543e012..1a02c83 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -99,7 +99,6 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); - LPOLESTR strs; HRESULT hr; WCHAR hwndText[255]; WCHAR *hwndQCText; @@ -222,7 +221,9 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IEnumString_Reset(This->enumstr); filled = FALSE; for(cpt = 0;;) { + LPOLESTR strs = NULL; ULONG fetched; + hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched); if (hr != S_OK) break; @@ -235,8 +236,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, strcatW(buffW, &strs[len]); SetWindowTextW(hwnd, buffW); SendMessageW(hwnd, EM_SETSEL, len, strlenW(strs)); - if (!(This->options & ACO_AUTOSUGGEST)) + if (!(This->options & ACO_AUTOSUGGEST)) { + CoTaskMemFree(strs); break; + } } if (This->options & ACO_AUTOSUGGEST) { @@ -246,6 +249,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, filled = TRUE; } + + CoTaskMemFree(strs); } if (This->options & ACO_AUTOSUGGEST) {

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017