May 2018 - Wine-commits - list.winehq.org

Huw Davies : oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: f005f2f6d8d28ae680679e7131953e0054dd1a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f005f2f6d8d28ae680679e71… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 22 09:01:42 2018 +0000 oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dd012af92a93fdf77ec648e422b4fb96369b42eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 46 ++++++++++++++----------------------------- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 17 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f005f2f6d8d28ae68067…

1 0

Michael Müller : shell32: Use manual redirection for RunDLL_CallEntry16.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 19559aa3a5b08aa46c35f9932d6cd0a8b249d284 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19559aa3a5b08aa46c35f993… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Feb 12 05:11:25 2018 +0000 shell32: Use manual redirection for RunDLL_CallEntry16. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2723e9473cc67b723c654b1859c49a9ddd6b0539) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/control.c | 22 ++++++++++++++++++++++ dlls/shell32/shell32.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 748b2d2..88d0ae8 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -883,3 +883,25 @@ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, D FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; } + +/************************************************************************* + * RunDLL_CallEntry16 [SHELL32.122] + * Manually relay this function to make Tages Protection v5 happy + */ +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) +{ + static HMODULE shell16 = NULL; + static void (WINAPI *pRunDLL_CallEntry16)( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) = NULL; + + if (!pRunDLL_CallEntry16) + { + if (!shell16 && !(shell16 = LoadLibraryA( "shell.dll16" ))) + return; + if (!(pRunDLL_CallEntry16 = (void *)GetProcAddress( shell16, "RunDLL_CallEntry16" ))) + return; + } + + pRunDLL_CallEntry16( proc, hwnd, inst, cmdline, cmdshow ); +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 81fae6d..91e4f6b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -noname RunDLL_CallEntry16(long long ptr str long) 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)

1 0

Michael Müller : dwmapi: Add DwmSetIconicThumbnail() stub.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 1ded8c566b072f5c2ce86ea4bd8ed776fa90e059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ded8c566b072f5c2ce86ea4… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 28 09:41:10 2018 +0300 dwmapi: Add DwmSetIconicThumbnail() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e6723be683b1435323f1ede30c6a7f7729b825d9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index d81df3d..697cefc 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -81,7 +81,7 @@ # @ stub DwmRenderGesture @ stub DwmSetDxFrameDuration @ stub DwmSetIconicLivePreviewBitmap -@ stub DwmSetIconicThumbnail +@ stdcall DwmSetIconicThumbnail(long long long) @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) # @ stub DwmShowContact diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8c3472a..7ac0b2b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -268,3 +268,12 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params FIXME("(%p %p) stub\n", hwnd, params); return S_OK; }; + +/********************************************************************** + * DwmSetIconicThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) +{ + FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); + return S_OK; +};

1 0

Nikolay Sivov : shell32: Partially implement IShellDispatch:: BrowseForFolder().
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: df4cb0c8dbaaec819cd89e82f4c50ddd2332e4ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=df4cb0c8dbaaec819cd89e82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 23 15:15:48 2018 +0300 shell32: Partially implement IShellDispatch::BrowseForFolder(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d3f32bd0c70291829cbd98b1c09a54ba11f2579a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shelldispatch.c | 76 +++++++++++++++++++++++++++++++++----------- 1 file changed, 57 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 11890f1..9fde62a 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1674,7 +1674,7 @@ static HRESULT Folder_Constructor(IShellFolder2 *folder, LPITEMIDLIST pidl, Fold This->Folder3_iface.lpVtbl = &FolderImpl_Vtbl; This->ref = 1; This->folder = folder; - This->pidl = pidl; + This->pidl = ILClone(pidl); hr = SHBindToParent(pidl, &IID_IShellFolder2, (void **)&parent, &last_part); IShellFolder2_GetDisplayNameOf(parent, last_part, SHGDN_FORPARSING, &strret); @@ -1820,11 +1820,33 @@ static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch return S_OK; } -static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, - VARIANT dir, Folder **ret) +static HRESULT create_folder_for_pidl(LPITEMIDLIST pidl, Folder **ret) { IShellFolder2 *folder; IShellFolder *desktop; + HRESULT hr; + + *ret = NULL; + + if (FAILED(hr = SHGetDesktopFolder(&desktop))) + return hr; + + if (_ILIsDesktop(pidl)) + hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); + else + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); + + IShellFolder_Release(desktop); + + if (FAILED(hr)) + return S_FALSE; + + return Folder_Constructor(folder, pidl, ret); +} + +static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, + VARIANT dir, Folder **ret) +{ LPITEMIDLIST pidl; HRESULT hr; @@ -1854,29 +1876,45 @@ static HRESULT WINAPI ShellDispatch_NameSpace(IShellDispatch6 *iface, return S_FALSE; } - if (FAILED(hr = SHGetDesktopFolder(&desktop))) - return hr; - - if (_ILIsDesktop(pidl)) - hr = IShellFolder_QueryInterface(desktop, &IID_IShellFolder2, (void **)&folder); - else - hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder2, (void **)&folder); - - IShellFolder_Release(desktop); + hr = create_folder_for_pidl(pidl, ret); + ILFree(pidl); - if (FAILED(hr)) - return S_FALSE; + return hr; +} - return Folder_Constructor(folder, pidl, ret); +static BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface, - LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) + LONG hwnd, BSTR title, LONG options, VARIANT rootfolder, Folder **folder) { - FIXME("(%p,%x,%s,%x,%s,%p)\n", iface, Hwnd, debugstr_w(Title), Options, debugstr_variant(&RootFolder), ppsdf); + PIDLIST_ABSOLUTE selection; + BROWSEINFOW bi = { 0 }; + HRESULT hr; - *ppsdf = NULL; - return E_NOTIMPL; + TRACE("(%p,%x,%s,%x,%s,%p)\n", iface, hwnd, debugstr_w(title), options, debugstr_variant(&rootfolder), folder); + + *folder = NULL; + + if (!is_optional_argument(&rootfolder)) + FIXME("root folder is ignored\n"); + + bi.hwndOwner = LongToHandle(hwnd); + bi.lpszTitle = title; + bi.ulFlags = options; + + selection = SHBrowseForFolderW(&bi); + if (selection) + { + hr = create_folder_for_pidl(selection, folder); + ILFree(selection); + } + else + hr = S_FALSE; + + return hr; } static HRESULT WINAPI ShellDispatch_Windows(IShellDispatch6 *iface,

1 0

Akihiro Sagawa : gdi32: Fix synthetic bold outline text metrics.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 173de6d66d3d61147ac433a55688d85eba5d79ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=173de6d66d3d61147ac433a5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 18 21:33:57 2018 +0900 gdi32: Fix synthetic bold outline text metrics. Without this fix, synthetic tmAveCharWidth value unintentionally affects SCALE_X calculation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68f9fb556d6ac51ed628d106a33737c13095fad4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7016095..2a95643 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7553,6 +7553,11 @@ static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm) SCALE_Y(ptm->tmExternalLeading); SCALE_Y(ptm->tmOverhang); + if(FT_IS_SCALABLE(font->ft_face) && font->fake_bold) + { + ptm->tmAveCharWidth++; + ptm->tmMaxCharWidth++; + } SCALE_X(ptm->tmAveCharWidth); SCALE_X(ptm->tmMaxCharWidth); @@ -7777,11 +7782,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) } TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin); TM.tmWeight = FW_REGULAR; - if (font->fake_bold) { - TM.tmAveCharWidth++; - TM.tmMaxCharWidth++; + if (font->fake_bold) TM.tmWeight = FW_BOLD; - } else { if (ft_face->style_flags & FT_STYLE_FLAG_BOLD)

1 0

Akihiro Sagawa : gdi32/tests: Add more text metrics tests in synthetic bold bitmap fonts.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: a1e691aeaf0aebd4964ed30eefd974bba596f131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e691aeaf0aebd4964ed30e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 18 21:34:40 2018 +0900 gdi32/tests: Add more text metrics tests in synthetic bold bitmap fonts. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b4a10d17c62d340a9578e8bf7715d78ec34551bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9f02095..de0693b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6439,7 +6439,7 @@ static void test_fake_bold_font(void) ABC abc; INT w; GLYPHMETRICS gm; - } data[2]; + } data[4]; int i; DWORD r; @@ -6496,6 +6496,63 @@ static void test_fake_bold_font(void) "expected %d, got %d\n", data[0].gm.gmCellIncX + 1, data[1].gm.gmCellIncX); ok(data[0].gm.gmCellIncY == data[1].gm.gmCellIncY, "expected %d, got %d\n", data[0].gm.gmCellIncY, data[1].gm.gmCellIncY); + + /* Test bitmap font */ + memset(&data, 0xaa, sizeof(data)); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Courier"); + lf.lfCharSet = ANSI_CHARSET; + + hdc = GetDC(NULL); + + for (i = 0; i < 4; i++) + { + HFONT hfont, hfont_old; + + lf.lfWeight = (i % 2) ? FW_BOLD : FW_NORMAL; + lf.lfHeight = (i > 1) ? data[0].tm.tmHeight * x2_mat.eM11.value : 0; + hfont = CreateFontIndirectA(&lf); + hfont_old = SelectObject(hdc, hfont); + + ret = GetTextMetricsA(hdc, &data[i].tm); + ok(ret, "got %d\n", ret); + ret = pGetCharWidth32A(hdc, 0x76, 0x76, &data[i].w); + ok(ret, "got %d\n", ret); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + } + ReleaseDC(NULL, hdc); + + /* compare results (bitmap) */ + for (i = 0; i < 4; i+=2) + { + int diff = (i > 1) ? x2_mat.eM11.value : 1; + if (data[i].tm.tmPitchAndFamily & TMPF_TRUETYPE) + { + skip("TrueType font is selected (expected a bitmap one)\n"); + continue; + } + ok(data[i].tm.tmHeight == data[i+1].tm.tmHeight, + "expected %d, got %d\n", data[i].tm.tmHeight, data[i+1].tm.tmHeight); + ok(data[i].tm.tmAscent == data[i+1].tm.tmAscent, + "expected %d, got %d\n", data[i].tm.tmAscent, data[i+1].tm.tmAscent); + ok(data[i].tm.tmDescent == data[i+1].tm.tmDescent, + "expected %d, got %d\n", data[i].tm.tmDescent, data[i+1].tm.tmDescent); + todo_wine + ok(data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth == diff, + "expected %d, got %d\n", diff, data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth); + todo_wine + ok(data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth == diff, + "expected %d, got %d\n", diff, data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth); + ok(data[i].tm.tmOverhang == 0, + "expected 0, got %d\n", data[i].tm.tmOverhang); + todo_wine + ok(data[i+1].tm.tmOverhang == 1, + "expected 1, got %d\n", data[i+1].tm.tmOverhang); + ok(data[i].w + 1 == data[i+1].w, + "expected %d, got %d\n", data[i].w + 1, data[i+1].w); + } } static void test_bitmap_font_glyph_index(void)

1 0

Akihiro Sagawa : gdi32: Fix text metrics in synthetic bold bitmap fonts.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: fa56e8458394236b4b9ab3e5b7003802c096ec78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa56e8458394236b4b9ab3e5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 18 21:34:42 2018 +0900 gdi32: Fix text metrics in synthetic bold bitmap fonts. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dce3e171858d831e9861ed02df30a5aeddcc3a64) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 9 +++++++-- dlls/gdi32/tests/font.c | 3 --- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2a95643..3244ad3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7522,6 +7522,9 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) TM.tmPitchAndFamily = FT_IS_FIXED_WIDTH(ft_face) ? 0 : TMPF_FIXED_PITCH; TM.tmCharSet = font->charset; } + + if(font->fake_bold) + TM.tmWeight = FW_BOLD; #undef TM return TRUE; @@ -7551,10 +7554,12 @@ static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm) SCALE_Y(ptm->tmDescent); SCALE_Y(ptm->tmInternalLeading); SCALE_Y(ptm->tmExternalLeading); - SCALE_Y(ptm->tmOverhang); - if(FT_IS_SCALABLE(font->ft_face) && font->fake_bold) + SCALE_X(ptm->tmOverhang); + if(font->fake_bold) { + if(!FT_IS_SCALABLE(font->ft_face)) + ptm->tmOverhang++; ptm->tmAveCharWidth++; ptm->tmMaxCharWidth++; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index de0693b..ec4b29e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6539,15 +6539,12 @@ static void test_fake_bold_font(void) "expected %d, got %d\n", data[i].tm.tmAscent, data[i+1].tm.tmAscent); ok(data[i].tm.tmDescent == data[i+1].tm.tmDescent, "expected %d, got %d\n", data[i].tm.tmDescent, data[i+1].tm.tmDescent); - todo_wine ok(data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth == diff, "expected %d, got %d\n", diff, data[i+1].tm.tmAveCharWidth - data[i].tm.tmAveCharWidth); - todo_wine ok(data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth == diff, "expected %d, got %d\n", diff, data[i+1].tm.tmMaxCharWidth - data[i].tm.tmMaxCharWidth); ok(data[i].tm.tmOverhang == 0, "expected 0, got %d\n", data[i].tm.tmOverhang); - todo_wine ok(data[i+1].tm.tmOverhang == 1, "expected 1, got %d\n", data[i+1].tm.tmOverhang); ok(data[i].w + 1 == data[i+1].w,

1 0

Nikolay Sivov : oleaut32: Don't reset property page site to NULL.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: c36ccb4bb5aec8858f86e1f70ec558f011434fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c36ccb4bb5aec8858f86e1f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 14:58:35 2018 +0300 oleaut32: Don't reset property page site to NULL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1ac1c78f0552f983b512cfebbf3f3207a3dbf709) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/olepropframe.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/oleaut32/olepropframe.c b/dlls/oleaut32/olepropframe.c index 73af745..1a89024 100644 --- a/dlls/oleaut32/olepropframe.c +++ b/dlls/oleaut32/olepropframe.c @@ -308,10 +308,8 @@ HRESULT WINAPI OleCreatePropertyFrameIndirect(LPOCPFIPARAMS lpParams) PropertySheetW(&property_sheet); for(i=0; i<lpParams->cPages; i++) { - if(property_page[i]) { - IPropertyPage_SetPageSite(property_page[i], NULL); + if(property_page[i]) IPropertyPage_Release(property_page[i]); - } } HeapFree(GetProcessHeap(), 0, dialogs);

1 0

Vijay Kiran Kamuju : shdocvw: Add stub DoOrganizeFavDlg.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 64493afc04f61348e5218a1bb801a60c947e522e URL: https://source.winehq.org/git/wine.git/?a=commit;h=64493afc04f61348e5218a1b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jan 14 21:53:06 2018 +0100 shdocvw: Add stub DoOrganizeFavDlg. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8901bfc76509f40173aa4fcb57dacddc5d447dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shdocvw/shdocvw.spec | 4 ++-- dlls/shdocvw/shdocvw_main.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 0d581b2..485d160 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -113,8 +113,8 @@ @ stub DoAddToFavDlgW @ stdcall DoFileDownload(wstr) @ stub DoFileDownloadEx -@ stub DoOrganizeFavDlg -@ stub DoOrganizeFavDlgW +@ stdcall DoOrganizeFavDlg(long str) +@ stdcall DoOrganizeFavDlgW(long wstr) @ stub DoPrivacyDlg @ stub HlinkFrameNavigate @ stub HlinkFrameNavigateNHL diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 5d89f77..52c622c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -560,3 +560,32 @@ BOOL WINAPI DoFileDownload(LPWSTR filename) FIXME("(%s) stub\n", debugstr_w(filename)); return FALSE; } + +/****************************************************************** + * DoOrganizeFavDlgW (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlgW(HWND hwnd, LPCWSTR initDir) +{ + FIXME("(%p %s) stub\n", hwnd, debugstr_w(initDir)); + return FALSE; +} + +/****************************************************************** + * DoOrganizeFavDlg (SHDOCVW.@) + */ +BOOL WINAPI DoOrganizeFavDlg(HWND hwnd, LPCSTR initDir) +{ + LPWSTR initDirW = NULL; + BOOL res; + + TRACE("(%p %s)\n", hwnd, debugstr_a(initDir)); + + if (initDir) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, initDir, -1, NULL, 0); + initDirW = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, initDir, -1, initDirW, len); + } + res = DoOrganizeFavDlgW(hwnd, initDirW); + heap_free(initDirW); + return res; +}

1 0

Alistair Leslie-Hughes : d3dx9: Stub D3DXCreateKeyframedAnimationSet().
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 255b9bbdc295077996543483485ea0c997416eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=255b9bbdc295077996543483… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 31 02:02:22 2018 +0100 d3dx9: Stub D3DXCreateKeyframedAnimationSet(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5db63eb3caa3afa12c5e2342416a62cfe1f7f9f2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/animation.c | 12 ++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 32 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=255b9bbdc29507799654…

1 0