wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

André Hentschel : user32: Fix DrawMenuBarTemp spec file entry.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 76793a8e4b10fe8827bdd762f77e6f8632e70020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76793a8e4b10fe8827bdd762f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:47:12 2017 +0100 user32: Fix DrawMenuBarTemp spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 65a5bfe..c2d43e7 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -191,7 +191,7 @@ @ stdcall DrawIcon(long long long long) @ stdcall DrawIconEx(long long long long long long long long long) @ stdcall DrawMenuBar(long) -@ stdcall DrawMenuBarTemp(long long long long long) +@ stdcall DrawMenuBarTemp(long long ptr long long) @ stdcall DrawStateA(long long ptr long long long long long long long) @ stdcall DrawStateW(long long ptr long long long long long long long) @ stdcall DrawTextA(long str long ptr long)

1 0

André Hentschel : shell32: Fix some spec file entries.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 1eede2926f5a29237b5b4c4260d2021507d374cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eede2926f5a29237b5b4c426… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:47:04 2017 +0100 shell32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shell-shellcom-l1-1-0.spec | 2 +- .../api-ms-win-shell-shellfolders-l1-1-0.spec | 2 +- dlls/shell32/shell32.spec | 44 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec b/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec index bf9f656..0036f17 100644 --- a/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec +++ b/dlls/api-ms-win-shell-shellcom-l1-1-0/api-ms-win-shell-shellcom-l1-1-0.spec @@ -1 +1 @@ -@ stdcall SHCoCreateInstance(wstr ptr long ptr ptr) shell32.SHCoCreateInstance +@ stdcall SHCoCreateInstance(wstr ptr ptr ptr ptr) shell32.SHCoCreateInstance diff --git a/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec index 5909c04..5860527 100644 --- a/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec +++ b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec @@ -7,7 +7,7 @@ @ stdcall SHGetFolderPathA(long long long long ptr) shell32.SHGetFolderPathA @ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) shell32.SHGetFolderPathAndSubDirW @ stdcall SHGetFolderPathW(long long long long ptr) shell32.SHGetFolderPathW -@ stdcall SHGetInstanceExplorer(long) shell32.SHGetInstanceExplorer +@ stdcall SHGetInstanceExplorer(ptr) shell32.SHGetInstanceExplorer @ stdcall SHGetKnownFolderPath(ptr long ptr ptr) shell32.SHGetKnownFolderPath @ stdcall SHGetSpecialFolderPathA(long ptr long long) shell32.SHGetSpecialFolderPathA @ stdcall SHGetSpecialFolderPathW(long ptr long long) shell32.SHGetSpecialFolderPathW diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index cd4f24a..0f26a34 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -48,7 +48,7 @@ 50 stdcall -noname PathStripToRoot(ptr) PathStripToRootAW 51 stdcall PathResolve(str long long) PathResolveAW 52 stdcall -noname PathGetArgs(str) PathGetArgsAW - 53 stdcall DoEnvironmentSubst(long long) DoEnvironmentSubstAW + 53 stdcall DoEnvironmentSubst(ptr long) DoEnvironmentSubstAW 54 stub LogoffWindowsDialog 55 stdcall -noname PathQuoteSpaces(ptr) PathQuoteSpacesAW 56 stdcall -noname PathUnquoteSpaces(str) PathUnquoteSpacesAW @@ -56,18 +56,18 @@ 58 stdcall -noname ParseField(str long ptr long) ParseFieldAW 59 stdcall -ordinal RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) - 61 stdcall -noname RunFileDlg(long long long str str long) RunFileDlgAW - 62 stdcall -ordinal PickIconDlg(long long long long) - 63 stdcall -ordinal GetFileNameFromBrowse(long long long long str str str) GetFileNameFromBrowseAW + 61 stdcall -noname RunFileDlg(long long str str str long) RunFileDlgAW + 62 stdcall -ordinal PickIconDlg(long long long ptr) + 63 stdcall -ordinal GetFileNameFromBrowse(long ptr long str str str str) GetFileNameFromBrowseAW 64 stdcall -ordinal DriveType(long) 65 stdcall -noname InvalidateDriveType(long) 66 stdcall -ordinal IsNetDrive(long) 67 stdcall -ordinal Shell_MergeMenus(long long long long long long) 68 stdcall -ordinal SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource - 70 stdcall -noname SHCreateDefClassObject(long long long long long) + 70 stdcall -noname SHCreateDefClassObject(long long long ptr long) 71 stdcall -ordinal Shell_GetImageLists(ptr ptr) - 72 stdcall -ordinal Shell_GetCachedImageIndex(ptr ptr long) Shell_GetCachedImageIndexAW + 72 stdcall -ordinal Shell_GetCachedImageIndex(str long long) Shell_GetCachedImageIndexAW 73 stdcall -ordinal SHShellFolderView_Message(long long long) 74 stdcall -ordinal SHCreateStdEnumFmtEtc(long ptr ptr) 75 stdcall -ordinal PathYetAnotherMakeUniqueName(ptr wstr wstr wstr) @@ -89,12 +89,12 @@ 94 stdcall -noname Win32RemoveDirectory(wstr) Win32RemoveDirectoryAW 95 stdcall -noname SHLogILFromFSIL(ptr) 96 stdcall -noname StrRetToStrN(ptr long ptr ptr) StrRetToStrNAW - 97 stdcall -noname SHWaitForFileToOpen (long long long) + 97 stdcall -noname SHWaitForFileToOpen (ptr long long) 98 stdcall -ordinal SHGetRealIDL(ptr ptr ptr) 99 stdcall -noname SetAppStartingCursor(long long) 100 stdcall -ordinal SHRestricted(long) - 102 stdcall -ordinal SHCoCreateInstance(wstr ptr long ptr ptr) + 102 stdcall -ordinal SHCoCreateInstance(wstr ptr ptr ptr ptr) 103 stdcall -ordinal SignalFileOpen(ptr) 104 stdcall -noname FileMenu_DeleteAllItems(long) 105 stdcall -noname FileMenu_DrawItem(long ptr) @@ -126,7 +126,7 @@ 131 stdcall -ordinal DAD_DragEnterEx(long int64) 132 stdcall -ordinal DAD_DragLeave() 134 stdcall -ordinal DAD_DragMove(int64) - 136 stdcall -ordinal DAD_SetDragImage(long long) + 136 stdcall -ordinal DAD_SetDragImage(long ptr) 137 stdcall -ordinal DAD_ShowDragImage(long) 139 stub Desktop_UpdateBriefcaseOnEvent 140 stdcall -noname FileMenu_DeleteItemByIndex(long long) @@ -136,14 +136,14 @@ 144 stdcall -noname FileMenu_GetItemExtent(long long) 145 stdcall -noname PathFindOnPath(ptr ptr) PathFindOnPathAW 146 stdcall -noname RLBuildListOfPaths() - 147 stdcall -ordinal SHCLSIDFromString(long long) SHCLSIDFromStringAW + 147 stdcall -ordinal SHCLSIDFromString(ptr ptr) SHCLSIDFromStringAW 148 stdcall -noname SHMapIDListToImageListIndexAsync(ptr ptr ptr long ptr ptr ptr ptr ptr) 149 stdcall -ordinal SHFind_InitMenuPopup(long long long long) 151 stdcall -noname SHLoadOLE(long) 152 stdcall -ordinal ILGetSize(ptr) 153 stdcall -ordinal ILGetNext(ptr) - 154 stdcall -ordinal ILAppendID(long long long) + 154 stdcall -ordinal ILAppendID(ptr ptr long) 155 stdcall -ordinal ILFree(ptr) 156 stdcall -noname ILGlobalFree(ptr) 157 stdcall -ordinal ILCreateFromPath(ptr) ILCreateFromPathAW @@ -165,15 +165,15 @@ 173 stdcall -ordinal SHValidateUNC(long wstr long) 174 stdcall -ordinal SHCreateShellFolderViewEx(ptr ptr) 175 stdcall -noname SHGetSpecialFolderPath(long long long long) SHGetSpecialFolderPathAW - 176 stdcall -ordinal SHSetInstanceExplorer(long) + 176 stdcall -ordinal SHSetInstanceExplorer(ptr) 177 stub DAD_SetDragImageFromListView 178 stdcall -ordinal SHObjectProperties(long long wstr wstr) - 179 stdcall -ordinal SHGetNewLinkInfoA(str str ptr long long) - 180 stdcall -ordinal SHGetNewLinkInfoW(wstr wstr ptr long long) + 179 stdcall -ordinal SHGetNewLinkInfoA(str str ptr ptr long) + 180 stdcall -ordinal SHGetNewLinkInfoW(wstr wstr ptr ptr long) 181 stdcall -noname RegisterShellHook(long long) 182 varargs -ordinal ShellMessageBoxW(long long wstr wstr long) 183 varargs -ordinal ShellMessageBoxA(long long str str long) - 184 stdcall -noname ArrangeWindows(long long long long long) + 184 stdcall -noname ArrangeWindows(long long ptr long long) 185 stub SHHandleDiskFull 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) 187 stub ILGetPseudoNameW @@ -233,7 +233,7 @@ 525 stub RealDriveTypeFlags 526 stdcall SHFlushSFCache() - 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long long) + 640 stdcall -noname NTSHChangeNotifyRegister(long long long long long ptr) 641 stdcall -noname NTSHChangeNotifyDeregister(long) 643 stub SHChangeNotifyReceive @@ -285,8 +285,8 @@ @ stdcall -private DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stdcall DoEnvironmentSubstA(str str) -@ stdcall DoEnvironmentSubstW(wstr wstr) +@ stdcall DoEnvironmentSubstA(str long) +@ stdcall DoEnvironmentSubstW(wstr long) @ stdcall DragAcceptFiles(long long) @ stdcall DragFinish(long) @ stdcall DragQueryFile(long long ptr long) DragQueryFileA @@ -296,8 +296,8 @@ @ stdcall DragQueryPoint(long ptr) @ stdcall DuplicateIcon(long long) @ stdcall ExtractAssociatedIconA(long str ptr) -@ stdcall ExtractAssociatedIconExA(long str long long) -@ stdcall ExtractAssociatedIconExW(long wstr long long) +@ stdcall ExtractAssociatedIconExA(long str ptr ptr) +@ stdcall ExtractAssociatedIconExW(long wstr ptr ptr) @ stdcall ExtractAssociatedIconW(long wstr ptr) @ stdcall ExtractIconA(long str long) @ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA @@ -378,7 +378,7 @@ @ stdcall SHGetIconOverlayIndexA(str long) @ stdcall SHGetIconOverlayIndexW(wstr long) @ stdcall SHGetIDListFromObject(ptr ptr) -@ stdcall SHGetInstanceExplorer(long) +@ stdcall SHGetInstanceExplorer(ptr) @ stdcall SHGetItemFromDataObject(ptr long ptr ptr) @ stdcall SHGetItemFromObject(ptr ptr ptr) @ stdcall SHGetKnownFolderIDList(ptr long ptr ptr) @@ -387,7 +387,7 @@ @ stdcall SHGetLocalizedName(wstr ptr long ptr) @ stdcall SHGetMalloc(ptr) @ stdcall SHGetNameFromIDList(ptr long ptr) -@ stdcall SHGetNewLinkInfo(str str ptr long long) SHGetNewLinkInfoA +@ stdcall SHGetNewLinkInfo(str str ptr ptr long) SHGetNewLinkInfoA @ stdcall SHGetPathFromIDList(ptr ptr) SHGetPathFromIDListA @ stdcall SHGetPathFromIDListA(ptr ptr) @ stdcall SHGetPathFromIDListW(ptr ptr)

1 0

André Hentschel : mscms: Fix some spec file entries.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 321b34d66fc6861d69245965f45495f3fb0a8262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321b34d66fc6861d69245965f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:46:59 2017 +0100 mscms: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/mscms.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index f728c79..e420dd8 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -18,13 +18,13 @@ @ stdcall EnumColorProfilesW(ptr ptr ptr ptr ptr) @ stdcall GenerateCopyFilePaths(wstr wstr ptr long ptr ptr ptr ptr long) @ stdcall GetCMMInfo(ptr long) -@ stdcall GetColorDirectoryA(ptr ptr long) -@ stdcall GetColorDirectoryW(ptr ptr long) +@ stdcall GetColorDirectoryA(ptr ptr ptr) +@ stdcall GetColorDirectoryW(ptr ptr ptr) @ stdcall GetColorProfileElement(ptr long long ptr ptr ptr) @ stdcall GetColorProfileElementTag(ptr long ptr) @ stdcall GetColorProfileFromHandle(ptr ptr ptr) @ stdcall GetColorProfileHeader(ptr ptr) -@ stdcall GetCountColorProfileElements(ptr long) +@ stdcall GetCountColorProfileElements(ptr ptr) @ stdcall GetNamedProfileInfo(ptr ptr) @ stdcall GetPS2ColorRenderingDictionary(ptr long ptr ptr ptr) @ stdcall GetPS2ColorRenderingIntent(ptr long ptr ptr) @@ -40,7 +40,7 @@ @ stub InternalGetPS2PreviewCRD @ stub InternalSetDeviceConfig @ stdcall IsColorProfileTagPresent(ptr long ptr) -@ stdcall IsColorProfileValid(ptr long) +@ stdcall IsColorProfileValid(ptr ptr) @ stdcall OpenColorProfileA(ptr long long long) @ stdcall OpenColorProfileW(ptr long long long) @ stdcall RegisterCMMA(ptr long ptr)

1 0

André Hentschel : msi: Fix some spec file entries.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: c6592229a36090cf613c6ee06f2caadb05c5ad0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6592229a36090cf613c6ee06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 26 23:47:01 2017 +0100 msi: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index d48f08b..6f7266a 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -7,7 +7,7 @@ 11 stdcall MsiConfigureFeatureA(str str long) 12 stub MsiConfigureFeatureFromDescriptorA 13 stub MsiConfigureFeatureFromDescriptorW -14 stdcall MsiConfigureFeatureW(wstr wstr ptr) +14 stdcall MsiConfigureFeatureW(wstr wstr long) 15 stdcall MsiConfigureProductA(str long long) 16 stdcall MsiConfigureProductW(wstr long long) 17 stdcall MsiCreateRecord(long) @@ -60,10 +60,10 @@ 64 stdcall MsiGetMode(long long) 65 stdcall MsiGetProductCodeA(str str) 66 stdcall MsiGetProductCodeW(wstr wstr) -67 stdcall MsiGetProductInfoA(str str ptr long) +67 stdcall MsiGetProductInfoA(str str ptr ptr) 68 stub MsiGetProductInfoFromScriptA 69 stub MsiGetProductInfoFromScriptW -70 stdcall MsiGetProductInfoW(wstr wstr ptr long) +70 stdcall MsiGetProductInfoW(wstr wstr ptr ptr) 71 stdcall MsiGetProductPropertyA(long str ptr ptr) 72 stdcall MsiGetProductPropertyW(long wstr ptr ptr) 73 stdcall MsiGetPropertyA(ptr str ptr ptr) @@ -82,8 +82,8 @@ 86 stub MsiInstallMissingFileW 87 stdcall MsiInstallProductA(str str) 88 stdcall MsiInstallProductW(wstr wstr) -89 stdcall MsiLocateComponentA(str ptr long) -90 stdcall MsiLocateComponentW(wstr ptr long) +89 stdcall MsiLocateComponentA(str ptr ptr) +90 stdcall MsiLocateComponentW(wstr ptr ptr) 91 stdcall MsiOpenDatabaseA(str str ptr) 92 stdcall MsiOpenDatabaseW(wstr wstr ptr) 93 stdcall MsiOpenPackageA(str ptr)

1 0

Michael Müller : msvideo.dll16: Implement DrawDibProfileDisplay.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 03435a55770927afcae84d3ee170b5fbe670c763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03435a55770927afcae84d3ee… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jan 26 22:24:42 2017 -0200 msvideo.dll16: Implement DrawDibProfileDisplay. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvideo.dll16/msvideo.dll16.spec | 2 +- dlls/msvideo.dll16/msvideo16.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msvideo.dll16/msvideo.dll16.spec b/dlls/msvideo.dll16/msvideo.dll16.spec index f45f644..02e2c95 100644 --- a/dlls/msvideo.dll16/msvideo.dll16.spec +++ b/dlls/msvideo.dll16/msvideo.dll16.spec @@ -35,7 +35,7 @@ 111 stub DRAWDIBCHANGEPALETTE 112 pascal -ret16 DrawDibRealize(word word word) DrawDibRealize16 113 stub DRAWDIBTIME -114 stub DRAWDIBPROFILEDISPLAY +114 pascal -ret16 DrawDibProfileDisplay(ptr) DrawDibProfileDisplay16 115 stub STRETCHDIB 118 pascal -ret16 DrawDibStart(word long) DrawDibStart16 119 pascal -ret16 DrawDibStop(word) DrawDibStop16 diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c index 8f02cc1..28f126c 100644 --- a/dlls/msvideo.dll16/msvideo16.c +++ b/dlls/msvideo.dll16/msvideo16.c @@ -121,6 +121,15 @@ UINT16 VFWAPI DrawDibRealize16(HDRAWDIB16 hdd, HDC16 hdc, } /************************************************************************* + * DrawDibProfileDisplay [MSVIDEO.114] + */ +BOOL16 VFWAPI DrawDibProfileDisplay16(LPBITMAPINFOHEADER lpbi) +{ + TRACE("(%p)\n", lpbi); + return DrawDibProfileDisplay(lpbi); +} + +/************************************************************************* * DrawDibStart [MSVIDEO.118] */ BOOL16 VFWAPI DrawDibStart16(HDRAWDIB16 hdd, DWORD rate)

1 0

Erich E. Hoover : maintainers: Volunteer for auto-assigned patch review.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 4b9bc3a6f4dbbdac00e673b39969cd459e1458a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b9bc3a6f4dbbdac00e673b39… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Jan 25 12:38:43 2017 -0700 maintainers: Volunteer for auto-assigned patch review. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f936afe..e5224ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -165,6 +165,7 @@ F: programs/netstat/ Network P: Bruno Jesus <00cpxxx(a)gmail.com> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: dlls/iphlpapi/ F: dlls/ws2_32/ @@ -248,6 +249,7 @@ F: dlls/wmiutils/ Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Sebastian Lackner <sebastian(a)fds-team.de> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ Winemaker @@ -283,6 +285,7 @@ P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> +P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */

1 0

Nikolay Sivov : dwrite: Implement GetOverhangMetrics().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 426a5d4a5f61612411500b0cc1aa6d7c9c8a9906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426a5d4a5f61612411500b0cc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:42:13 2017 +0300 dwrite: Implement GetOverhangMetrics(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/freetype.c | 31 ++++++++++ dlls/dwrite/layout.c | 135 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 155 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 882567c..d91735d 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -287,6 +287,7 @@ extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; extern BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; extern INT freetype_get_charmap_index(IDWriteFontFace4*,BOOL*) DECLSPEC_HIDDEN; extern INT32 freetype_get_glyph_advance(IDWriteFontFace4*,FLOAT,UINT16,DWRITE_MEASURING_MODE) DECLSPEC_HIDDEN; +extern void freetype_get_design_glyph_bbox(IDWriteFontFace4*,UINT16,UINT16,RECT*) DECLSPEC_HIDDEN; /* Glyph shaping */ enum SCRIPT_JUSTIFY diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 9cc157e..596e8a5 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -639,6 +639,32 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) SetRect(&bitmap->bbox, bbox.xMin, -bbox.yMax, bbox.xMax, -bbox.yMin); } +void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) +{ + FTC_ScalerRec scaler; + FT_Size size; + + scaler.face_id = fontface; + scaler.width = unitsperEm; + scaler.height = unitsperEm; + scaler.pixel = 1; + scaler.x_res = 0; + scaler.y_res = 0; + + EnterCriticalSection(&freetype_cs); + if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { + if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_SCALE) == 0) { + FT_Glyph_Metrics *metrics = &size->face->glyph->metrics; + + bbox->left = metrics->horiBearingX; + bbox->right = bbox->left + metrics->horiAdvance; + bbox->top = -metrics->horiBearingY; + bbox->bottom = bbox->top + metrics->height; + } + } + LeaveCriticalSection(&freetype_cs); +} + static BOOL freetype_get_aliased_glyph_bitmap(struct dwrite_glyphbitmap *bitmap, FT_Glyph glyph) { const RECT *bbox = &bitmap->bbox; @@ -889,6 +915,11 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) memset(&bitmap->bbox, 0, sizeof(bitmap->bbox)); } +void freetype_get_design_glyph_bbox(IDWriteFontFace4 *fontface, UINT16 unitsperEm, UINT16 glyph, RECT *bbox) +{ + memset(bbox, 0, sizeof(*bbox)); +} + BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) { return FALSE; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0d1ffb4..014fba4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -223,10 +223,12 @@ struct layout_cluster { }; enum layout_recompute_mask { - RECOMPUTE_CLUSTERS = 1 << 0, - RECOMPUTE_MINIMAL_WIDTH = 1 << 1, - RECOMPUTE_LINES = 1 << 2, - RECOMPUTE_EVERYTHING = 0xffff + RECOMPUTE_CLUSTERS = 1 << 0, + RECOMPUTE_MINIMAL_WIDTH = 1 << 1, + RECOMPUTE_LINES = 1 << 2, + RECOMPUTE_OVERHANGS = 1 << 3, + RECOMPUTE_LINES_AND_OVERHANGS = RECOMPUTE_LINES | RECOMPUTE_OVERHANGS, + RECOMPUTE_EVERYTHING = 0xffff }; struct dwrite_textlayout { @@ -267,6 +269,7 @@ struct dwrite_textlayout { UINT32 line_alloc; DWRITE_TEXT_METRICS1 metrics; + DWRITE_OVERHANG_METRICS overhangs; DWRITE_MEASURING_MODE measuringmode; @@ -2905,7 +2908,7 @@ static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout3 *iface, FL This->metrics.layoutWidth = maxWidth; if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -2923,7 +2926,7 @@ static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout3 *iface, F This->metrics.layoutHeight = maxHeight; if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -3468,11 +3471,119 @@ static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout3 *iface, DWR return hr; } -static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout3 *iface, DWRITE_OVERHANG_METRICS *overhangs) +static void scale_glyph_bbox(RECT *bbox, FLOAT emSize, UINT16 units_per_em, D2D_RECT_F *ret) +{ +#define SCALE(x) ((FLOAT)x * emSize / (FLOAT)units_per_em) + ret->left = SCALE(bbox->left); + ret->right = SCALE(bbox->right); + ret->top = SCALE(bbox->top); + ret->bottom = SCALE(bbox->bottom); +#undef SCALE +} + +static void d2d_rect_offset(D2D_RECT_F *rect, FLOAT x, FLOAT y) +{ + rect->left += x; + rect->right += x; + rect->top += y; + rect->bottom += y; +} + +static BOOL d2d_rect_is_empty(const D2D_RECT_F *rect) +{ + return ((rect->left >= rect->right) || (rect->top >= rect->bottom)); +} + +static void d2d_rect_union(D2D_RECT_F *dst, const D2D_RECT_F *src) +{ + if (d2d_rect_is_empty(dst)) { + if (d2d_rect_is_empty(src)) { + dst->left = dst->right = dst->top = dst->bottom = 0.0f; + return; + } + else + *dst = *src; + } + else { + if (!d2d_rect_is_empty(src)) { + dst->left = min(dst->left, src->left); + dst->right = max(dst->right, src->right); + dst->top = min(dst->top, src->top); + dst->bottom = max(dst->bottom, src->bottom); + } + } +} + +static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout_effective_run *run, D2D_RECT_F *bbox) +{ + const struct regular_layout_run *regular = &run->run->u.regular; + UINT32 start_glyph = regular->clustermap[run->start]; + const DWRITE_GLYPH_RUN *glyph_run = &regular->run; + DWRITE_FONT_METRICS font_metrics; + D2D_POINT_2F origin = { 0 }; + UINT32 i; + + IDWriteFontFace_GetMetrics(glyph_run->fontFace, &font_metrics); + + origin.x = run->origin_x + run->align_dx; + origin.y = run->origin_y; + for (i = 0; i < run->glyphcount; i++) { + D2D_RECT_F glyph_bbox; + RECT design_bbox; + + freetype_get_design_glyph_bbox((IDWriteFontFace4 *)glyph_run->fontFace, font_metrics.designUnitsPerEm, + glyph_run->glyphIndices[i + start_glyph], &design_bbox); + + scale_glyph_bbox(&design_bbox, glyph_run->fontEmSize, font_metrics.designUnitsPerEm, &glyph_bbox); + d2d_rect_offset(&glyph_bbox, origin.x + glyph_run->glyphOffsets[i + start_glyph].advanceOffset, + origin.y + glyph_run->glyphOffsets[i + start_glyph].ascenderOffset); + d2d_rect_union(bbox, &glyph_bbox); + + /* FIXME: take care of vertical/rtl */ + origin.x += glyph_run->glyphAdvances[i + start_glyph]; + } +} + +static HRESULT WINAPI dwritetextlayout_GetOverhangMetrics(IDWriteTextLayout3 *iface, + DWRITE_OVERHANG_METRICS *overhangs) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - FIXME("(%p)->(%p): stub\n", This, overhangs); - return E_NOTIMPL; + struct layout_effective_run *run; + D2D_RECT_F bbox = { 0 }; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, overhangs); + + memset(overhangs, 0, sizeof(*overhangs)); + + if (!(This->recompute & RECOMPUTE_OVERHANGS)) { + *overhangs = This->overhangs; + return S_OK; + } + + hr = layout_compute_effective_runs(This); + if (FAILED(hr)) + return hr; + + LIST_FOR_EACH_ENTRY(run, &This->eruns, struct layout_effective_run, entry) { + D2D_RECT_F run_bbox; + + layout_get_erun_bbox(This, run, &run_bbox); + d2d_rect_union(&bbox, &run_bbox); + } + + /* FIXME: iterate over inline objects too */ + + /* deltas from text content metrics */ + This->overhangs.left = -bbox.left; + This->overhangs.top = -bbox.top; + This->overhangs.right = bbox.right - This->metrics.layoutWidth; + This->overhangs.bottom = bbox.bottom - This->metrics.layoutHeight; + This->recompute &= ~RECOMPUTE_OVERHANGS; + + *overhangs = This->overhangs; + + return S_OK; } static HRESULT WINAPI dwritetextlayout_GetClusterMetrics(IDWriteTextLayout3 *iface, @@ -3739,7 +3850,7 @@ static HRESULT WINAPI dwritetextlayout3_SetLineSpacing(IDWriteTextLayout3 *iface return hr; if (changed) - This->recompute = RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -3930,7 +4041,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetWordWrapping(IDWriteTextFormat1 return hr; if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return S_OK; } @@ -3990,7 +4101,7 @@ static HRESULT WINAPI dwritetextformat_layout_SetTrimming(IDWriteTextFormat1 *if hr = format_set_trimming(&This->format, trimming, trimming_sign, &changed); if (changed) - This->recompute |= RECOMPUTE_LINES; + This->recompute |= RECOMPUTE_LINES_AND_OVERHANGS; return hr; }

1 0

Nikolay Sivov : scrobj: Implement get_GUID().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 0fa152791f324d992c4f3716b9b0165576ceba45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa152791f324d992c4f3716b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:12 2017 +0300 scrobj: Implement get_GUID(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/Makefile.in | 2 +- dlls/scrobj/scrobj.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in index 75dd7ec..179409a 100644 --- a/dlls/scrobj/Makefile.in +++ b/dlls/scrobj/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrobj.dll -IMPORTS = uuid oleaut32 +IMPORTS = uuid ole32 oleaut32 C_SRCS = \ scrobj.c diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 44cb778..38f1c65 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -113,6 +113,8 @@ struct scriptlet_typelib { IGenScriptletTLib IGenScriptletTLib_iface; LONG ref; + + BSTR guid; }; static inline struct scriptlet_typelib *impl_from_IGenScriptletTLib(IGenScriptletTLib *iface) @@ -155,7 +157,10 @@ static ULONG WINAPI scriptlet_typelib_Release(IGenScriptletTLib *iface) TRACE("(%p)->(%u)\n", This, ref); if (!ref) + { + SysFreeString(This->guid); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -346,13 +351,34 @@ static HRESULT WINAPI scriptlet_typelib_put_GUID(IGenScriptletTLib *iface, BSTR return E_NOTIMPL; } -static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR *guid) +static HRESULT WINAPI scriptlet_typelib_get_GUID(IGenScriptletTLib *iface, BSTR *ret) { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); - FIXME("(%p, %p): stub\n", This, guid); + TRACE("(%p, %p)\n", This, ret); - return E_NOTIMPL; + *ret = NULL; + + if (!This->guid) + { + WCHAR guidW[39]; + GUID guid; + HRESULT hr; + + hr = CoCreateGuid(&guid); + if (FAILED(hr)) + return hr; + + hr = StringFromGUID2(&guid, guidW, sizeof(guidW)/sizeof(guidW[0])); + if (FAILED(hr)) + return hr; + + if (!(This->guid = SysAllocString(guidW))) + return E_OUTOFMEMORY; + } + + *ret = SysAllocString(This->guid); + return *ret ? S_OK : E_OUTOFMEMORY; } static const IGenScriptletTLibVtbl scriptlet_typelib_vtbl = @@ -434,6 +460,7 @@ HRESULT WINAPI scriptlet_typelib_CreateInstance(IClassFactory *factory, IUnknown This->IGenScriptletTLib_iface.lpVtbl = &scriptlet_typelib_vtbl; This->ref = 1; + This->guid = NULL; hr = IGenScriptletTLib_QueryInterface(&This->IGenScriptletTLib_iface, riid, obj); IGenScriptletTLib_Release(&This->IGenScriptletTLib_iface);

1 0

Nikolay Sivov : scrobj: Added IDispatch support for Scriptlet.TypeLib object.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 99a9f5313870d64d51f5f241eb740c0093f854db URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a9f5313870d64d51f5f241e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:11 2017 +0300 scrobj: Added IDispatch support for Scriptlet.TypeLib object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/Makefile.in | 2 +- dlls/scrobj/scrobj.c | 115 ++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 108 insertions(+), 9 deletions(-) diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in index 3d5962c..75dd7ec 100644 --- a/dlls/scrobj/Makefile.in +++ b/dlls/scrobj/Makefile.in @@ -1,5 +1,5 @@ MODULE = scrobj.dll -IMPORTS = uuid +IMPORTS = uuid oleaut32 C_SRCS = \ scrobj.c diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index d2f9908..44cb778 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -34,6 +34,81 @@ WINE_DEFAULT_DEBUG_CHANNEL(scrobj); static HINSTANCE scrobj_instance; +typedef enum tid_t +{ + NULL_tid, + IGenScriptletTLib_tid, + LAST_tid +} tid_t; + +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static REFIID tid_ids[] = { + &IID_NULL, + &IID_IGenScriptletTLib, +}; + +static HRESULT load_typelib(void) +{ + HRESULT hres; + ITypeLib *tl; + + if (typelib) + return S_OK; + + hres = LoadRegTypeLib(&LIBID_Scriptlet, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if (FAILED(hres)) + { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + + if (InterlockedCompareExchangePointer((void **)&typelib, tl, NULL)) + ITypeLib_Release(tl); + return hres; +} + +static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if (FAILED(hres = load_typelib())) + return hres; + + if (!typeinfos[tid]) + { + ITypeInfo *ti; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + if (FAILED(hres)) { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + return hres; + } + + if (InterlockedCompareExchangePointer((void **)(typeinfos+tid), ti, NULL)) + ITypeInfo_Release(ti); + } + + *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(typeinfos[tid]); + return S_OK; +} + +static void release_typelib(void) +{ + unsigned i; + + if (!typelib) + return; + + for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if (typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); +} + struct scriptlet_typelib { IGenScriptletTLib IGenScriptletTLib_iface; @@ -89,9 +164,10 @@ static HRESULT WINAPI scriptlet_typelib_GetTypeInfoCount(IGenScriptletTLib *ifac { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); - FIXME("(%p, %p): stub\n", This, count); + TRACE("(%p, %p)\n", This, count); - return E_NOTIMPL; + *count = 1; + return S_OK; } static HRESULT WINAPI scriptlet_typelib_GetTypeInfo(IGenScriptletTLib *iface, UINT index, LCID lcid, @@ -99,30 +175,49 @@ static HRESULT WINAPI scriptlet_typelib_GetTypeInfo(IGenScriptletTLib *iface, UI { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); - FIXME("(%p, %u, %x, %p): stub\n", This, index, lcid, tinfo); + TRACE("(%p, %u, %x, %p)\n", This, index, lcid, tinfo); - return E_NOTIMPL; + return get_typeinfo(IGenScriptletTLib_tid, tinfo); } static HRESULT WINAPI scriptlet_typelib_GetIDsOfNames(IGenScriptletTLib *iface, REFIID riid, LPOLESTR *names, UINT cNames, LCID lcid, DISPID *dispid) { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p, %s, %p, %u, %x, %p): stub\n", This, debugstr_guid(riid), names, cNames, lcid, dispid); + TRACE("(%p, %s, %p, %u, %x, %p)\n", This, debugstr_guid(riid), names, cNames, lcid, dispid); - return E_NOTIMPL; + hr = get_typeinfo(IGenScriptletTLib_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, cNames, dispid); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI scriptlet_typelib_Invoke(IGenScriptletTLib *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *ei, UINT *argerr) { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("(%p, %d, %s, %x, %x, %p, %p, %p, %p): stub\n", This, dispid, debugstr_guid(riid), lcid, flags, + TRACE("(%p, %d, %s, %x, %x, %p, %p, %p, %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, params, result, ei, argerr); - return E_NOTIMPL; + hr = get_typeinfo(IGenScriptletTLib_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &This->IGenScriptletTLib_iface, dispid, flags, + params, result, ei, argerr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI scriptlet_typelib_AddURL(IGenScriptletTLib *iface, BSTR url) @@ -298,6 +393,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) DisableThreadLibraryCalls(hinst); scrobj_instance = hinst; break; + case DLL_PROCESS_DETACH: + if (reserved) break; + release_typelib(); + break; } return TRUE; }

1 0

Nikolay Sivov : scrobj: Added IGenScriptletTLib stub.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 387dee7ff2ec8c271acb14c0df87ed586e2b0376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387dee7ff2ec8c271acb14c0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 00:36:10 2017 +0300 scrobj: Added IGenScriptletTLib stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/Makefile.in | 1 + dlls/scrobj/scrobj.c | 335 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/scrobj.idl | 1 + 3 files changed, 337 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=387dee7ff2ec8c271acb1…

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
50
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 January 2017