August 2021 - Wine-commits - list.winehq.org

Jacek Caban : gdi32: Use ntgdi names for object functions.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 111b9def835190a1ea1f1552e59880ea99ba0599 URL: https://source.winehq.org/git/wine.git/?a=commit;h=111b9def835190a1ea1f1552… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:57:05 2021 +0200 gdi32: Use ntgdi names for object functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi32.spec | 8 ++++---- dlls/gdi32/gdiobj.c | 26 +++++++++++--------------- dlls/gdi32/palette.c | 2 +- include/ntgdi.h | 3 +++ 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 878c0de4006..a3147c9b0c4 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1439,7 +1439,7 @@ BOOL WINAPI PlayEnhMetaFileRecord( { const EMRSETCOLORADJUSTMENT *lpSetColorAdjust = (const EMRSETCOLORADJUSTMENT *)mr; - SetColorAdjustment( hdc, &lpSetColorAdjust->ColorAdjustment ); + NtGdiSetColorAdjustment( hdc, &lpSetColorAdjust->ColorAdjustment ); break; } diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 4e0f0bf37a3..0e5c83926f8 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -189,7 +189,7 @@ # @ stub GdiEndPageEMF @ stdcall GdiEntry13() # @ stub GdiFixUpHandle -@ stdcall GdiFlush() +@ stdcall GdiFlush() NtGdiFlush # @ stub GdiFullscreenControl @ stdcall GdiGetBatchLimit() @ stdcall GdiGetCharDimensions(long ptr ptr) @@ -266,7 +266,7 @@ @ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetClipBox(long ptr) NtGdiGetAppClipBox @ stdcall GetClipRgn(long long) -@ stdcall GetColorAdjustment(long ptr) +@ stdcall GetColorAdjustment(long ptr) NtGdiGetColorAdjustment @ stdcall GetColorSpace(long) @ stdcall GetCurrentObject(long long) @ stdcall GetCurrentPositionEx(long ptr) @@ -482,7 +482,7 @@ @ stdcall SetBoundsRect(long ptr long) NtGdiSetBoundsRect # @ stub SetBrushAttributes @ stdcall SetBrushOrgEx(long long long ptr) -@ stdcall SetColorAdjustment(long ptr) +@ stdcall SetColorAdjustment(long ptr) NtGdiSetColorAdjustment @ stdcall SetColorSpace(long long) @ stdcall SetDCBrushColor(long long) @ stdcall SetDCPenColor(long long) @@ -539,7 +539,7 @@ @ stdcall TextOutW(long long long wstr long) @ stdcall TranslateCharsetInfo(ptr ptr long) @ stub UnloadNetworkFonts -@ stdcall UnrealizeObject(long) +@ stdcall UnrealizeObject(long) NtGdiUnrealizeObject @ stdcall UpdateColors(long) NtGdiUpdateColors @ stdcall UpdateICMRegKey(long str str long) UpdateICMRegKeyA @ stdcall UpdateICMRegKeyA(long str str long) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 07277a12e8c..2e99d6a830b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -407,7 +407,7 @@ static const struct DefaultFontInfo default_fonts[] = /************************************************************************* - * __wine_make_gdi_object_system (GDI32.@) + * __wine_make_gdi_object_system (win32u.@) * * USER has to tell GDI that its system brushes and pens are non-deletable. * For a description of the GDI object magics and their flags, @@ -1065,9 +1065,9 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type) /*********************************************************************** - * UnrealizeObject (GDI32.@) + * NtGdiUnrealizeObject (win32u.@) */ -BOOL WINAPI UnrealizeObject( HGDIOBJ obj ) +BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ) { const struct gdi_obj_funcs *funcs = NULL; GDI_HANDLE_ENTRY *entry; @@ -1180,9 +1180,9 @@ DWORD WINAPI GdiInitializeLanguagePack( DWORD arg ) } /*********************************************************************** - * GdiFlush (GDI32.@) + * NtGdiFlush (win32u.@) */ -BOOL WINAPI GdiFlush(void) +BOOL WINAPI NtGdiFlush(void) { return TRUE; /* FIXME */ } @@ -1207,23 +1207,19 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit ) /******************************************************************* - * GetColorAdjustment [GDI32.@] - * - * + * NtGdiGetColorAdjustment (win32u.@) */ -BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) +BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ) { - FIXME("stub\n"); + FIXME( "stub\n" ); return FALSE; } /******************************************************************* - * SetColorAdjustment [GDI32.@] - * - * + * NtGdiSetColorAdjustment (win32u.@) */ -BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca) +BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca ) { - FIXME("stub\n"); + FIXME( "stub\n" ); return FALSE; } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 3d2e27c1fc6..aa7745dc65f 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -215,7 +215,7 @@ static UINT set_palette_entries( HPALETTE hpalette, UINT start, UINT count, if (start+count > numEntries) count = numEntries - start; memcpy( &palPtr->entries[start], entries, count * sizeof(PALETTEENTRY) ); GDI_ReleaseObj( hpalette ); - UnrealizeObject( hpalette ); + NtGdiUnrealizeObject( hpalette ); return count; } diff --git a/include/ntgdi.h b/include/ntgdi.h index 81f5a49f665..7fa2b09b2e0 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -253,6 +253,7 @@ INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escap BOOL WINAPI NtGdiExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT type ); BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, const WCHAR *str, UINT count, const INT *dx, DWORD cp ); +BOOL WINAPI NtGdiFlush(void); BOOL WINAPI NtGdiFrameRgn( HDC hdc, HRGN hrgn, HBRUSH brush, INT width, INT height ); BOOL WINAPI NtGdiFillPath( HDC hdc ); @@ -265,6 +266,7 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *c BOOL WINAPI NtGdiGetCharWidthInfo( HDC hdc, struct char_width_info *info ); BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WCHAR *chars, ULONG flags, void *buffer ); +BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); @@ -343,6 +345,7 @@ LONG WINAPI NtGdiSetBitmapBits( HBITMAP hbitmap, LONG count, const void *bit BOOL WINAPI NtGdiSetBitmapDimension( HBITMAP hbitmap, INT x, INT y, SIZE *prev_size ); BOOL WINAPI NtGdiSetBrushOrg( HDC hdc, INT x, INT y, POINT *prev_org ); UINT WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags ); +BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca ); INT WINAPI NtGdiSetDIBitsToDeviceInternal( HDC hdc, INT x_dst, INT y_dst, DWORD cx, DWORD cy, INT x_src, INT y_src, UINT startscan, UINT lines, const void *bits, const BITMAPINFO *bmi,

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.190.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: a16760ac392ba6b0b81fd125dd594e792a887b2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16760ac392ba6b0b81fd125… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Aug 30 09:51:45 2021 +0200 winevulkan: Update to VK spec version 1.2.190. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 35 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1027 ++++++++++++++++++++------------------- 4 files changed, 577 insertions(+), 489 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a16760ac392ba6b0b81f…

1 0

Francois Gouget : shlwapi: Fix ASCII / ANSI mixups in comments.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 25978317ce910037e85bc5723142f700fa095c8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25978317ce910037e85bc572… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:17:19 2021 +0200 shlwapi: Fix ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/assoc.c | 2 +- dlls/shlwapi/ordinal.c | 6 +++--- dlls/shlwapi/string.c | 34 +++++++++++++++++----------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index e4850d41972..5a9928cc0eb 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************* * SHLWAPI_ParamAToW * - * Internal helper function: Convert ASCII parameter to Unicode. + * Internal helper function: Convert ANSI parameter to Unicode. */ static BOOL SHLWAPI_ParamAToW(LPCSTR lpszParam, LPWSTR lpszBuff, DWORD dwLen, LPWSTR* lpszOut) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e73ba6efa7b..52cc3b725fa 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1253,7 +1253,7 @@ static BOOL CALLBACK SHLWAPI_EnumChildProc(HWND hWnd, LPARAM lParam) * Nothing. * * NOTES - * The appropriate ASCII or Unicode function is called for the window. + * The appropriate ANSI or Unicode function is called for the window. */ void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lParam, BOOL bSend) { @@ -2038,7 +2038,7 @@ void WINAPI SHUnregisterClassesW(HINSTANCE hInst, LPCWSTR *lppClasses, INT iCoun /************************************************************************* * @ [SHLWAPI.240] * - * Call The correct (Ascii/Unicode) default window procedure for a window. + * Call The correct (ANSI/Unicode) default window procedure for a window. * * PARAMS * hWnd [I] Window to call the default procedure for @@ -2264,7 +2264,7 @@ VOID WINAPI SHWeakReleaseInterface(IUnknown *lpDest, IUnknown **lppUnknown) /************************************************************************* * @ [SHLWAPI.269] * - * Convert an ASCII string of a CLSID into a CLSID. + * Convert an ANSI string of a CLSID into a CLSID. * * PARAMS * idstr [I] String representing a CLSID in registry format diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index f4c6ca85d64..e2c9c6af81f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -539,7 +539,7 @@ LPWSTR WINAPI StrNCatW(LPWSTR lpszStr, LPCWSTR lpszCat, INT cchMax) /************************************************************************* * _SHStrDupAA [INTERNAL] * - * Duplicates a ASCII string to ASCII. The destination buffer is allocated. + * Duplicates a ANSI string to ANSI. The destination buffer is allocated. */ static HRESULT _SHStrDupAA(LPCSTR src, LPSTR * dest) { @@ -606,7 +606,7 @@ HRESULT WINAPI SHStrDupA(LPCSTR lpszStr, LPWSTR * lppszDest) /************************************************************************* * _SHStrDupAW [INTERNAL] * - * Duplicates a UNICODE to a ASCII string. The destination buffer is allocated. + * Duplicates a UNICODE to a ANSI string. The destination buffer is allocated. */ static HRESULT _SHStrDupAW(LPCWSTR src, LPSTR * dest) { @@ -942,7 +942,7 @@ LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) * lpszDest. * * NOTES - * The Ascii and Unicode versions of this function accept a different + * The ANSI and Unicode versions of this function accept a different * integer type for dwBytes. See StrFormatByteSize64A(). */ LPSTR WINAPI StrFormatByteSizeA(DWORD dwBytes, LPSTR lpszDest, UINT cchMax) @@ -1020,11 +1020,11 @@ WCHAR WINAPI SHStripMneumonicW(LPCWSTR lpszStr) /************************************************************************* * @ [SHLWAPI.216] * - * Convert an Ascii string to Unicode. + * Convert an ANSI string to Unicode. * * PARAMS * dwCp [I] Code page for the conversion - * lpSrcStr [I] Source Ascii string to convert + * lpSrcStr [I] Source ANSI string to convert * lpDstStr [O] Destination for converted Unicode string * iLen [I] Length of lpDstStr * @@ -1043,10 +1043,10 @@ DWORD WINAPI SHAnsiToUnicodeCP(DWORD dwCp, LPCSTR lpSrcStr, LPWSTR lpDstStr, int /************************************************************************* * @ [SHLWAPI.215] * - * Convert an Ascii string to Unicode. + * Convert an ANSI string to Unicode. * * PARAMS - * lpSrcStr [I] Source Ascii string to convert + * lpSrcStr [I] Source ANSI string to convert * lpDstStr [O] Destination for converted Unicode string * iLen [I] Length of lpDstStr * @@ -1064,12 +1064,12 @@ DWORD WINAPI SHAnsiToUnicode(LPCSTR lpSrcStr, LPWSTR lpDstStr, int iLen) /************************************************************************* * @ [SHLWAPI.218] * - * Convert a Unicode string to Ascii. + * Convert a Unicode string to ANSI. * * PARAMS * CodePage [I] Code page to use for the conversion * lpSrcStr [I] Source Unicode string to convert - * lpDstStr [O] Destination for converted Ascii string + * lpDstStr [O] Destination for converted ANSI string * dstlen [I] Length of buffer at lpDstStr * * RETURNS @@ -1167,11 +1167,11 @@ DWORD WINAPI SHUnicodeToAnsiCP(UINT CodePage, LPCWSTR lpSrcStr, LPSTR lpDstStr, /************************************************************************* * @ [SHLWAPI.217] * - * Convert a Unicode string to Ascii. + * Convert a Unicode string to ANSI. * * PARAMS * lpSrcStr [I] Source Unicode string to convert - * lpDstStr [O] Destination for converted Ascii string + * lpDstStr [O] Destination for converted ANSI string * iLen [O] Length of lpDstStr in characters * * RETURNS @@ -1188,15 +1188,15 @@ INT WINAPI SHUnicodeToAnsi(LPCWSTR lpSrcStr, LPSTR lpDstStr, INT iLen) /************************************************************************* * @ [SHLWAPI.364] * - * Determine if an Ascii string converts to Unicode and back identically. + * Determine if an ANSI string converts to Unicode and back identically. * * PARAMS * lpSrcStr [I] Source Unicode string to convert - * lpDst [O] Destination for resulting Ascii string + * lpDst [O] Destination for resulting ANSI string * iLen [I] Length of lpDst in characters * * RETURNS - * TRUE, since Ascii strings always convert identically. + * TRUE, since ANSI strings always convert identically. */ BOOL WINAPI DoesStringRoundTripA(LPCSTR lpSrcStr, LPSTR lpDst, INT iLen) { @@ -1207,15 +1207,15 @@ BOOL WINAPI DoesStringRoundTripA(LPCSTR lpSrcStr, LPSTR lpDst, INT iLen) /************************************************************************* * @ [SHLWAPI.365] * - * Determine if a Unicode string converts to Ascii and back identically. + * Determine if a Unicode string converts to ANSI and back identically. * * PARAMS * lpSrcStr [I] Source Unicode string to convert - * lpDst [O] Destination for resulting Ascii string + * lpDst [O] Destination for resulting ANSI string * iLen [I] Length of lpDst in characters * * RETURNS - * TRUE, if lpSrcStr converts to Ascii and back identically, + * TRUE, if lpSrcStr converts to ANSI and back identically, * FALSE otherwise. */ BOOL WINAPI DoesStringRoundTripW(LPCWSTR lpSrcStr, LPSTR lpDst, INT iLen)

1 0

Francois Gouget : shlwapi: Tweak the wording of the _SHStrDupAToBSTR() documentation.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: ab8b99daf4dcbd79f58e552c33f947530647657e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8b99daf4dcbd79f58e552c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:17:35 2021 +0200 shlwapi: Tweak the wording of the _SHStrDupAToBSTR() documentation. This also fixes an ASCII / ANSI mixup. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index e2c9c6af81f..fc565f45355 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -370,7 +370,7 @@ HRESULT WINAPI StrRetToStrW(LPSTRRET lpStrRet, const ITEMIDLIST *pidl, LPWSTR *p return hRet; } -/* Create an ASCII string copy using SysAllocString() */ +/* Makes a Unicode copy of an ANSI string using SysAllocString() */ static HRESULT _SHStrDupAToBSTR(LPCSTR src, BSTR *pBstrOut) { *pBstrOut = NULL;

1 0

Francois Gouget : shlwapi/tests: Fix some ASCII / ANSI mixups in ok() messages.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 372b5e15a00990c96860329efc6176d249b4f5c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=372b5e15a00990c96860329e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:18:12 2021 +0200 shlwapi/tests: Fix some ASCII / ANSI mixups in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 2e1df632016..9e04c6d7b6f 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -668,7 +668,7 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const wszConvertedPart = GetWideString(szPart); ok(lstrcmpW(wszPart,wszConvertedPart)==0, - "Strings didn't match between ascii and unicode UrlGetPart!\n"); + "Strings didn't match between ansi and unicode UrlGetPart!\n"); FreeWideString(wszConvertedPart); } @@ -860,7 +860,7 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H wszConvertedUrl = GetWideString(szReturnUrl); ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, - "Strings didn't match between ascii and unicode UrlCanonicalize, index %d!\n", index); + "Strings didn't match between ansi and unicode UrlCanonicalize, index %d!\n", index); FreeWideString(wszConvertedUrl); } @@ -1284,7 +1284,7 @@ static void test_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFla ok(dwSize == dwExpectLen, "Got length %d, expected %d\n", dwSize, dwExpectLen); if(SUCCEEDED(hr)) { wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ascii and unicode UrlCombine!\n"); + ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, "Strings didn't match between ansi and unicode UrlCombine!\n"); FreeWideString(wszConvertedUrl); } }

1 0

Francois Gouget : winex11.drv: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: e201c4f36e03b63e192af399c06e904f5a170e9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e201c4f36e03b63e192af399… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:19:06 2021 +0200 winex11.drv: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fd39b58bb3b..791787cfd3a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1539,7 +1539,7 @@ void destroy_gl_drawable( HWND hwnd ) * * Get the pixel-format descriptor associated to the given id */ -static int WINAPI describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) +static int describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) { /*XVisualInfo *vis;*/ int value;

1 0

Francois Gouget : kerberos: Make accept_context() static.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: efe44b5702bb2dbc7ea56e8d50037f7e1d76a2f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efe44b5702bb2dbc7ea56e8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:24:20 2021 +0200 kerberos: Make accept_context() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 6f53609e2ed..cceb99b2b36 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -493,7 +493,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) return ret; } -NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, +static NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *expiry ) {

1 0

Francois Gouget : quartz: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: e950ec2c3be88340f13904a7db62baf3f9ff650a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e950ec2c3be88340f13904a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:22:32 2021 +0200 quartz: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9ecdb280cc6..3a6b7764634 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -283,7 +283,7 @@ static HRESULT DSoundRender_SendSampleData(struct dsound_render *This, return S_OK; } -static HRESULT WINAPI DSoundRender_PrepareReceive(struct dsound_render *This, IMediaSample *pSample) +static HRESULT DSoundRender_PrepareReceive(struct dsound_render *This, IMediaSample *pSample) { HRESULT hr; AM_MEDIA_TYPE *amt; @@ -320,7 +320,7 @@ static HRESULT WINAPI DSoundRender_PrepareReceive(struct dsound_render *This, IM return S_OK; } -static HRESULT WINAPI DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSample *pSample) +static HRESULT DSoundRender_DoRenderSample(struct dsound_render *This, IMediaSample *pSample) { LPBYTE pbSrcStream = NULL; LONG cbSrcStream = 0;

1 0

Francois Gouget : windowscodecs: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 7f1cd647f61fc0992ce9572784a7cf62a5705a2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1cd647f61fc0992ce95727… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Aug 30 17:22:44 2021 +0200 windowscodecs: Remove WINAPI on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index 89e352b8946..2c72cdfc1b5 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -565,7 +565,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetContainerFormat(IWICMetadataBl return S_OK; } -static HRESULT WINAPI CommonDecoderFrame_InitializeMetadata(CommonDecoderFrame *This) +static HRESULT CommonDecoderFrame_InitializeMetadata(CommonDecoderFrame *This) { HRESULT hr=S_OK;

1 0

Connor McAdams : oleacc: Implement AccessibleObjectFromEvent.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 602a36a2538e356ae8e64b442e9a5ad7f3748bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602a36a2538e356ae8e64b44… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Aug 30 11:27:41 2021 -0400 oleacc: Implement AccessibleObjectFromEvent. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index f6b66a8bcab..beceb2ff1fb 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -331,6 +331,53 @@ HRESULT WINAPI AccessibleObjectFromPoint( POINT ptScreen, IAccessible** ppacc, V return E_NOTIMPL; } +static void variant_init_i4( VARIANT *v, int val ) +{ + V_VT(v) = VT_I4; + V_I4(v) = val; +} + +HRESULT WINAPI AccessibleObjectFromEvent( HWND hwnd, DWORD object_id, DWORD child_id, + IAccessible **acc_out, VARIANT *child_id_out ) +{ + VARIANT child_id_variant; + IAccessible *acc = NULL; + IDispatch *child = NULL; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", hwnd, object_id, child_id, acc_out, child_id_out); + + if (!acc_out) + return E_INVALIDARG; + *acc_out = NULL; + VariantInit(child_id_out); + + hr = AccessibleObjectFromWindow(hwnd, object_id, &IID_IAccessible, (void **)&acc); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, child_id); + hr = IAccessible_get_accChild(acc, child_id_variant, &child); + if (FAILED(hr)) + TRACE("get_accChild failed with %#x!\n", hr); + + if (SUCCEEDED(hr) && child) + { + IAccessible_Release(acc); + hr = IDispatch_QueryInterface(child, &IID_IAccessible, (void **)&acc); + IDispatch_Release(child); + if (FAILED(hr)) + return hr; + + variant_init_i4(&child_id_variant, CHILDID_SELF); + } + + *acc_out = acc; + *child_id_out = child_id_variant; + + return S_OK; +} + HRESULT WINAPI AccessibleObjectFromWindow( HWND hwnd, DWORD dwObjectID, REFIID riid, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 4cff0b8effc..9ad6e915965 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,5 +1,5 @@ @ stdcall AccessibleChildren(ptr long long ptr ptr) -@ stub AccessibleObjectFromEvent +@ stdcall AccessibleObjectFromEvent(ptr long long ptr ptr) @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr) @ stdcall CreateStdAccessibleObject(ptr long ptr ptr)

1 0