wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Hans Leidekker : webservices: Implement WsDecodeUrl.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 24bdad63e4c94a671367b7885ff341185143a7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24bdad63e4c94a671367b7885… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 26 10:56:47 2016 +0200 webservices: Implement WsDecodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/url.c | 194 +++++++++++++++++++++++++++++++++ dlls/webservices/url.c | 214 +++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 67 ++++++++++++ 6 files changed, 478 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24bdad63e4c94a671367b…

1 0

Alex Henrie : ncrypt: Add stub dll.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 084827e90154f3c534d50979f606c88f997ee669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084827e90154f3c534d50979f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 25 23:21:09 2016 -0600 ncrypt: Add stub dll. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ncrypt/Makefile.in | 4 ++ dlls/ncrypt/main.c | 45 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 138 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 4 ++ 6 files changed, 194 insertions(+) diff --git a/configure b/configure index 5abf6ae..c1d1bf8 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_msxml2 enable_msxml3 enable_msxml4 enable_msxml6 +enable_ncrypt enable_nddeapi enable_ndis_sys enable_netapi32 @@ -17882,6 +17883,7 @@ wine_fn_config_dll msxml3 enable_msxml3 clean wine_fn_config_test dlls/msxml3/tests msxml3_test clean wine_fn_config_dll msxml4 enable_msxml4 clean wine_fn_config_dll msxml6 enable_msxml6 clean +wine_fn_config_dll ncrypt enable_ncrypt wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll ndis.sys enable_ndis_sys wine_fn_config_dll netapi32 enable_netapi32 implib diff --git a/configure.ac b/configure.ac index f25c965..e42e35d 100644 --- a/configure.ac +++ b/configure.ac @@ -3129,6 +3129,7 @@ WINE_CONFIG_DLL(msxml3,,[clean]) WINE_CONFIG_TEST(dlls/msxml3/tests,[clean]) WINE_CONFIG_DLL(msxml4,,[clean]) WINE_CONFIG_DLL(msxml6,,[clean]) +WINE_CONFIG_DLL(ncrypt) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(ndis.sys) WINE_CONFIG_DLL(netapi32,,[implib]) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in new file mode 100644 index 0000000..d54b921 --- /dev/null +++ b/dlls/ncrypt/Makefile.in @@ -0,0 +1,4 @@ +MODULE = ncrypt.dll + +C_SRCS = \ + main.c diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c new file mode 100644 index 0000000..9c09600 --- /dev/null +++ b/dlls/ncrypt/main.c @@ -0,0 +1,45 @@ +/* + * New cryptographic library (ncrypt.dll) + * + * Copyright 2016 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec new file mode 100644 index 0000000..1322f1e --- /dev/null +++ b/dlls/ncrypt/ncrypt.spec @@ -0,0 +1,138 @@ +@ stub BCryptAddContextFunction +@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider +@ stub BCryptConfigureContext +@ stub BCryptConfigureContextFunction +@ stub BCryptCreateContext +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeleteContext +@ stub BCryptDeriveKey +@ stub BCryptDeriveKeyCapi +@ stub BCryptDeriveKeyPBKDF2 +@ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms +@ stub BCryptEnumContextFunctionProviders +@ stub BCryptEnumContextFunctions +@ stub BCryptEnumContexts +@ stub BCryptEnumProviders +@ stub BCryptEnumRegisteredProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash +@ stub BCryptFreeBuffer +@ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty +@ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash +@ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider +@ stub BCryptQueryContextConfiguration +@ stub BCryptQueryContextFunctionConfiguration +@ stub BCryptQueryContextFunctionProperty +@ stub BCryptQueryProviderRegistration +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptRegisterProvider +@ stub BCryptRemoveContextFunction +@ stub BCryptRemoveContextFunctionProvider +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetAuditingInterface +@ stub BCryptSetContextFunctionProperty +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptUnregisterProvider +@ stub BCryptVerifySignature +@ stub GetIsolationServerInterface +@ stub GetKeyStorageInterface +@ stub GetSChannelInterface +@ stub NCryptCloseKeyProtector +@ stub NCryptCloseProtectionDescriptor +@ stub NCryptCreateClaim +@ stub NCryptCreatePersistedKey +@ stub NCryptCreateProtectionDescriptor +@ stub NCryptDecrypt +@ stub NCryptDeleteKey +@ stub NCryptDeriveKey +@ stub NCryptDuplicateKeyProtectorHandle +@ stub NCryptEncrypt +@ stub NCryptEnumAlgorithms +@ stub NCryptEnumKeys +@ stub NCryptEnumStorageProviders +@ stub NCryptExportKey +@ stub NCryptFinalizeKey +@ stub NCryptFreeBuffer +@ stub NCryptFreeObject +@ stub NCryptGetProperty +@ stub NCryptGetProtectionDescriptorInfo +@ stub NCryptImportKey +@ stub NCryptIsAlgSupported +@ stub NCryptIsKeyHandle +@ stub NCryptKeyDerivation +@ stub NCryptNotifyChangeKey +@ stub NCryptOpenKey +@ stub NCryptOpenKeyProtector +@ stub NCryptOpenStorageProvider +@ stub NCryptProtectKey +@ stub NCryptProtectSecret +@ stub NCryptQueryProtectionDescriptorName +@ stub NCryptRegisterProtectionDescriptorName +@ stub NCryptSecretAgreement +@ stub NCryptSetAuditingInterface +@ stub NCryptSetProperty +@ stub NCryptSignHash +@ stub NCryptStreamClose +@ stub NCryptStreamOpenToProtect +@ stub NCryptStreamOpenToUnprotect +@ stub NCryptStreamOpenToUnprotectEx +@ stub NCryptStreamUpdate +@ stub NCryptTranslateHandle +@ stub NCryptUnprotectKey +@ stub NCryptUnprotectSecret +@ stub NCryptVerifyClaim +@ stub NCryptVerifySignature +@ stub SslChangeNotify +@ stub SslComputeClientAuthHash +@ stub SslComputeEapKeyBlock +@ stub SslComputeFinishedHash +@ stub SslComputeSessionHash +@ stub SslCreateClientAuthHash +@ stub SslCreateEphemeralKey +@ stub SslCreateHandshakeHash +@ stub SslDecrementProviderReferenceCount +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslEnumCipherSuites +@ stub SslEnumEccCurves +@ stub SslEnumProtocolProviders +@ stub SslExportKey +@ stub SslExportKeyingMaterial +@ stub SslFreeBuffer +@ stub SslFreeObject +@ stub SslGenerateMasterKey +@ stub SslGeneratePreMasterKey +@ stub SslGenerateSessionKeys +@ stub SslGetCipherSuitePRFHashAlgorithm +@ stub SslGetKeyProperty +@ stub SslGetProviderProperty +@ stub SslHashHandshake +@ stub SslImportKey +@ stub SslImportMasterKey +@ stub SslIncrementProviderReferenceCount +@ stub SslLookupCipherLengths +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenPrivateKey +@ stub SslOpenProvider +@ stub SslSignHash +@ stub SslVerifySignature diff --git a/tools/make_specfiles b/tools/make_specfiles index 774687e..feb65b4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -289,6 +289,10 @@ my @dll_groups = "sfc_os", "sfc", ], + [ + "bcrypt", + "ncrypt", + ], ); my $update_flags = 0;

1 0

Alexandre Julliard : winex11: Subtract the tray window from the work area in desktop mode.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 6c6814056f067f863a4cf47f756c9336dcdf8afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6814056f067f863a4cf47f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 21:47:51 2016 +0900 winex11: Subtract the tray window from the work area in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xinerama.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 7e28726..0419535 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -87,6 +87,20 @@ static void query_work_area( RECT *rc_work ) } } +static void query_desktop_work_area( RECT *rc_work ) +{ + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + RECT rect; + HWND hwnd = FindWindowW( trayW, NULL ); + + if (!hwnd || !IsWindowVisible( hwnd )) return; + if (!GetWindowRect( hwnd, &rect )) return; + if (rect.top) rc_work->bottom = rect.top; + else rc_work->top = rect.bottom; + TRACE( "found tray %p %s work area %s\n", hwnd, + wine_dbgstr_rect( &rect ), wine_dbgstr_rect( rc_work )); +} + #ifdef SONAME_LIBXINERAMA #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -198,6 +212,8 @@ void xinerama_init( unsigned int width, unsigned int height ) default_monitor.rcWork = default_monitor.rcMonitor = rect; if (root_window == DefaultRootWindow( gdi_display )) query_work_area( &default_monitor.rcWork ); + else + query_desktop_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; }

1 0

Alexandre Julliard : user32: Make spacing consistent between DrawCaptionTemp and NC_DrawCaption.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 5fdcacad0ad73195cd52250a23f3b489f16a7a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fdcacad0ad73195cd52250a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 22:12:08 2016 +0900 user32: Make spacing consistent between DrawCaptionTemp and NC_DrawCaption. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index d3598b1..3352e46 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -312,12 +312,13 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, if (!hIcon) hIcon = NC_IconForWindow(hwnd); DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL); - rc.left += (rc.bottom - rc.top); + rc.left = pt.x + GetSystemMetrics( SM_CXSMICON ); } /* drawing text */ if (uFlags & DC_TEXT) { HFONT hOldFont; + WCHAR text[128]; if (uFlags & DC_INBUTTON) SetTextColor (hdc, GetSysColor (COLOR_BTNTEXT)); @@ -340,16 +341,14 @@ BOOL WINAPI DrawCaptionTempW (HWND hwnd, HDC hdc, const RECT *rect, HFONT hFont, hOldFont = SelectObject (hdc, hNewFont); } - if (str) - DrawTextW (hdc, str, -1, &rc, - DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT); - else { - WCHAR szText[128]; - INT nLen; - nLen = GetWindowTextW (hwnd, szText, 128); - DrawTextW (hdc, szText, nLen, &rc, - DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT); + if (!str) + { + if (!GetWindowTextW( hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + str = text; } + rc.left += 2; + DrawTextW( hdc, str, -1, &rc, ((uFlags & 0x4000) ? DT_CENTER : DT_LEFT) | + DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_END_ELLIPSIS ); if (hFont) SelectObject (hdc, hOldFont);

1 0

Alexandre Julliard : user32: Use the monitor rectangle to position icons on the desktop.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: b4bccfee05ac49e1c685d86c6ac3cea375f07381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bccfee05ac49e1c685d86c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 16:38:36 2016 +0900 user32: Use the monitor rectangle to position icons on the desktop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index e0e4a62..cf54329 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -859,7 +859,17 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); parent = GetAncestor( hwnd, GA_PARENT ); - GetClientRect( parent, &rectParent ); + if (parent == GetDesktopWindow()) + { + MONITORINFO mon_info; + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + + mon_info.cbSize = sizeof( mon_info ); + GetMonitorInfoW( monitor, &mon_info ); + rectParent = mon_info.rcWork; + } + else GetClientRect( parent, &rectParent ); + if ((pt.x >= rectParent.left) && (pt.x + GetSystemMetrics(SM_CXICON) < rectParent.right) && (pt.y >= rectParent.top) && (pt.y + GetSystemMetrics(SM_CYICON) < rectParent.bottom)) return pt; /* The icon already has a suitable position */ @@ -2486,7 +2496,18 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) metrics.cbSize = sizeof(metrics); SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); - GetClientRect( parent, &rectParent ); + + if (parent == GetDesktopWindow()) + { + MONITORINFO mon_info; + HMONITOR monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + + mon_info.cbSize = sizeof( mon_info ); + GetMonitorInfoW( monitor, &mon_info ); + rectParent = mon_info.rcWork; + } + else GetClientRect( parent, &rectParent ); + x = y = 0; xspacing = GetSystemMetrics(SM_CXICONSPACING); yspacing = GetSystemMetrics(SM_CYICONSPACING);

1 0

Alexandre Julliard : user32: Take the arrange flags into account when positioning icon windows.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 100239d90fb7e3bb1d83a165c60e4280c7a4276e URL: http://source.winehq.org/git/wine.git/?a=commit;h=100239d90fb7e3bb1d83a165c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:53:37 2016 +0900 user32: Take the arrange flags into account when positioning icon windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 61 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 4915aad..e0e4a62 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -852,7 +852,11 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) RECT rect, rectParent; HWND parent, child; HRGN hrgn, tmp; - int xspacing, yspacing; + int x, y, xspacing, yspacing; + MINIMIZEDMETRICS metrics; + + metrics.cbSize = sizeof(metrics); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); parent = GetAncestor( hwnd, GA_PARENT ); GetClientRect( parent, &rectParent ); @@ -868,7 +872,7 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) hrgn = CreateRectRgn( 0, 0, 0, 0 ); tmp = CreateRectRgn( 0, 0, 0, 0 ); - for (child = GetWindow( parent, GW_HWNDFIRST ); child; child = GetWindow( child, GW_HWNDNEXT )) + for (child = GetWindow( parent, GW_CHILD ); child; child = GetWindow( child, GW_HWNDNEXT )) { if (child == hwnd) continue; if ((GetWindowLongW( child, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != (WS_VISIBLE|WS_MINIMIZE)) @@ -881,12 +885,30 @@ static POINT WINPOS_FindIconPos( HWND hwnd, POINT pt ) } DeleteObject( tmp ); - for (rect.bottom = rectParent.bottom; rect.bottom >= yspacing; rect.bottom -= yspacing) + for (y = 0; y < (rectParent.bottom - rectParent.top) / yspacing; y++) { - for (rect.left = rectParent.left; rect.left <= rectParent.right - xspacing; rect.left += xspacing) + if (metrics.iArrange & ARW_STARTTOP) { - rect.right = rect.left + xspacing; + rect.top = rectParent.top + y * yspacing; + rect.bottom = rect.top + yspacing; + } + else + { + rect.bottom = rectParent.bottom - y * yspacing; rect.top = rect.bottom - yspacing; + } + for (x = 0; x < (rectParent.right - rectParent.left) / xspacing; x++) + { + if (metrics.iArrange & ARW_STARTRIGHT) + { + rect.right = rectParent.right - x * xspacing; + rect.left = rect.right - xspacing; + } + else + { + rect.left = rectParent.left + x * xspacing; + rect.right = rect.left + xspacing; + } if (!RectInRegion( hrgn, &rect )) { /* No window was found, so it's OK for us */ @@ -2459,10 +2481,13 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) RECT rectParent; HWND hwndChild; INT x, y, xspacing, yspacing; + POINT pt; + MINIMIZEDMETRICS metrics; + metrics.cbSize = sizeof(metrics); + SystemParametersInfoW( SPI_GETMINIMIZEDMETRICS, sizeof(metrics), &metrics, 0 ); GetClientRect( parent, &rectParent ); - x = rectParent.left; - y = rectParent.bottom; + x = y = 0; xspacing = GetSystemMetrics(SM_CXICONSPACING); yspacing = GetSystemMetrics(SM_CYICONSPACING); @@ -2473,17 +2498,25 @@ UINT WINAPI ArrangeIconicWindows( HWND parent ) { WINPOS_ShowIconTitle( hwndChild, FALSE ); - SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2, - y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); + if (metrics.iArrange & ARW_STARTRIGHT) + pt.x = rectParent.right - (x + 1) * xspacing; + else + pt.x = rectParent.left + x * xspacing; + if (metrics.iArrange & ARW_STARTTOP) + pt.y = rectParent.top + y * yspacing; + else + pt.y = rectParent.bottom - (y + 1) * yspacing; + + SetWindowPos( hwndChild, 0, pt.x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2, + pt.y + (yspacing - GetSystemMetrics(SM_CYICON)) / 2, 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE ); if( IsWindow(hwndChild) ) WINPOS_ShowIconTitle(hwndChild , TRUE ); - if (x <= rectParent.right - xspacing) x += xspacing; - else + if (++x >= (rectParent.right - rectParent.left) / xspacing) { - x = rectParent.left; - y -= yspacing; + x = 0; + y++; } } hwndChild = GetWindow( hwndChild, GW_HWNDNEXT );

1 0

Henri Verbeet : d3d10: Initialise the type tree in D3D10CreateEffectFromMemory() (AFL).
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: c8ef7e835caacb807996a2beb0335ef6baf304dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ef7e835caacb807996a2beb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:05 2016 +0200 d3d10: Initialise the type tree in D3D10CreateEffectFromMemory() (AFL). Otherwise we'd crash if we failed parsing the effect before parse_fx10_body(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_main.c | 23 +++++++++++++++++++++++ dlls/d3d10/effect.c | 22 ---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 0f2af09..6ca75b6 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -199,6 +199,22 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER return S_OK; } +static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); + const DWORD *id = key; + + return *id - t->id; +} + +static const struct wine_rb_functions d3d10_effect_type_rb_functions = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_effect_type_compare, +}; + HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) { @@ -215,6 +231,13 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return E_OUTOFMEMORY; } + if (wine_rb_init(&object->types, &d3d10_effect_type_rb_functions) == -1) + { + ERR("Failed to initialize type rbtree.\n"); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; object->refcount = 1; ID3D10Device_AddRef(device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 1ce022b..6955445 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2066,14 +2066,6 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, return S_OK; } -static int d3d10_effect_type_compare(const void *key, const struct wine_rb_entry *entry) -{ - const struct d3d10_effect_type *t = WINE_RB_ENTRY_VALUE(entry, const struct d3d10_effect_type, entry); - const DWORD *id = key; - - return *id - t->id; -} - static void d3d10_effect_type_member_destroy(struct d3d10_effect_type_member *typem) { TRACE("effect type member %p.\n", typem); @@ -2110,26 +2102,12 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context HeapFree(GetProcessHeap(), 0, t); } -static const struct wine_rb_functions d3d10_effect_type_rb_functions = -{ - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, - d3d10_effect_type_compare, -}; - static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr = data + e->index_offset; unsigned int i; HRESULT hr; - if (wine_rb_init(&e->types, &d3d10_effect_type_rb_functions) == -1) - { - ERR("Failed to initialize type rbtree.\n"); - return E_FAIL; - } - if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) { ERR("Failed to allocate local buffer memory.\n");

1 0

Henri Verbeet : d3d10: Validate offsets and sizes in read_value_list() ( AFL).
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 6042c2a36bde1c7ce7c8046bd9f1ee31d2be516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6042c2a36bde1c7ce7c8046bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:04 2016 +0200 d3d10: Validate offsets and sizes in read_value_list() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 378f23f..1ce022b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1178,17 +1178,31 @@ static BOOL read_int8_value(DWORD value, D3D_SHADER_VARIABLE_TYPE in_type, INT8 } } -static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, - UINT out_base, UINT out_size, void *out_data) +static BOOL read_value_list(const char *data, size_t data_size, DWORD offset, + D3D_SHADER_VARIABLE_TYPE out_type, UINT out_base, UINT out_size, void *out_data) { D3D_SHADER_VARIABLE_TYPE in_type; + const char *ptr; DWORD t, value; DWORD count, i; + if (offset >= data_size || !require_space(offset, 1, sizeof(count), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return FALSE; + } + + ptr = data + offset; read_dword(&ptr, &count); if (count != out_size) return FALSE; + if (!require_space(ptr - data, count, 2 * sizeof(DWORD), data_size)) + { + WARN("Invalid value count %#x (offset %#x, data size %#lx).\n", count, offset, (long)data_size); + return FALSE; + } + TRACE("%u values:\n", count); for (i = 0; i < count; ++i) { @@ -1228,8 +1242,8 @@ static BOOL read_value_list(const char *ptr, D3D_SHADER_VARIABLE_TYPE out_type, return TRUE; } -static BOOL parse_fx10_state_group(const char **ptr, const char *data, - D3D_SHADER_VARIABLE_TYPE container_type, void *container) +static BOOL parse_fx10_state_group(const char *data, size_t data_size, + const char **ptr, D3D_SHADER_VARIABLE_TYPE container_type, void *container) { const struct d3d10_effect_state_property_info *property_info; UINT value_offset; @@ -1269,7 +1283,7 @@ static BOOL parse_fx10_state_group(const char **ptr, const char *data, return FALSE; } - if (!read_value_list(data + value_offset, property_info->type, idx, + if (!read_value_list(data, data_size, value_offset, property_info->type, idx, property_info->size, (char *)container + property_info->offset)) { ERR("Failed to read values for property %#x.\n", id); @@ -1335,7 +1349,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_STENCIL_REF: - if (!read_value_list(data + offset, D3D10_SVT_UINT, 0, 1, &o->pass->stencil_ref)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->stencil_ref)) { ERR("Failed to read stencil ref.\n"); return E_FAIL; @@ -1343,7 +1357,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_SAMPLE_MASK: - if (!read_value_list(data + offset, D3D10_SVT_UINT, 0, 1, &o->pass->sample_mask)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->sample_mask)) { FIXME("Failed to read sample mask.\n"); return E_FAIL; @@ -1351,7 +1365,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_BLEND_FACTOR: - if (!read_value_list(data + offset, D3D10_SVT_FLOAT, 0, 4, &o->pass->blend_factor[0])) + if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &o->pass->blend_factor[0])) { FIXME("Failed to read blend factor.\n"); return E_FAIL; @@ -1822,7 +1836,7 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, var = v; memcpy(&var->u.state.desc, storage_info->default_state, storage_info->size); - if (!parse_fx10_state_group(ptr, data, var->type->basetype, &var->u.state.desc)) + if (!parse_fx10_state_group(data, data_size, ptr, var->type->basetype, &var->u.state.desc)) { ERR("Failed to read property list.\n"); return E_FAIL;

1 0

Henri Verbeet : d3d10: Validate offsets in parse_fx10_object() (AFL).
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 2594f58eb0e8db888ff4c341989583e98aaf3e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2594f58eb0e8db888ff4c3419… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:03 2016 +0200 d3d10: Validate offsets in parse_fx10_object() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 87 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2085d93..378f23f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -244,7 +244,7 @@ static const struct d3d10_effect_state_storage_info d3d10_effect_state_storage_i {D3D10_SVT_SAMPLER, sizeof(default_sampler_desc), &default_sampler_desc }, }; -static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, char **s) +static BOOL fx10_get_string(const char *data, size_t data_size, DWORD offset, const char **s, size_t *l) { size_t len, max_len; @@ -258,20 +258,40 @@ static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, c if (!(len = strnlen(data + offset, max_len))) { *s = NULL; + *l = 0; return TRUE; } if (len == max_len) return FALSE; - ++len; + *s = data + offset; + *l = ++len; + + return TRUE; +} + +static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, char **s) +{ + const char *p; + size_t len; + + if (!fx10_get_string(data, data_size, offset, &p, &len)) + return FALSE; + + if (!p) + { + *s = NULL; + return TRUE; + } + if (!(*s = HeapAlloc(GetProcessHeap(), 0, len))) { ERR("Failed to allocate string memory.\n"); return FALSE; } - memcpy(*s, data + offset, len); + memcpy(*s, p, len); return TRUE; } @@ -302,21 +322,13 @@ static BOOL copy_name(const char *ptr, char **name) static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) { - size_t len, max_len; - - if (offset >= data_size) - { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); - return NULL; - } - - max_len = data_size - offset; - len = strnlen(data + offset, max_len); + const char *s; + size_t l; - if (len == max_len) + if (!fx10_get_string(data, data_size, offset, &s, &l)) return NULL; - return data + offset; + return l ? s : ""; } static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct d3d10_effect_shader_signature *s) @@ -1268,7 +1280,8 @@ static BOOL parse_fx10_state_group(const char **ptr, const char *data, return TRUE; } -static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr, const char *data) +static HRESULT parse_fx10_object(const char *data, size_t data_size, + const char **ptr, struct d3d10_effect_object *o) { ID3D10EffectVariable *variable = &null_variable.ID3D10EffectVariable_iface; const char *data_ptr = NULL; @@ -1278,6 +1291,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr struct d3d10_effect *effect = o->pass->technique->effect; ID3D10Effect *e = &effect->ID3D10Effect_iface; DWORD tmp, variable_idx = 0; + const char *name; + size_t name_len; + + if (!require_space(*ptr - data, 4, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#lx (data size %#lx).\n", (long)(*ptr - data), (long)data_size); + return E_FAIL; + } read_dword(ptr, &o->type); TRACE("Effect object is of type %#x.\n", o->type); @@ -1345,19 +1366,36 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr case D3D10_EOO_PARSED_OBJECT: /* This is a local object, we've parsed in parse_fx10_local_object. */ - TRACE("Variable name %s.\n", debugstr_a(data + offset)); + if (!fx10_get_string(data, data_size, offset, &name, &name_len)) + { + WARN("Failed to get variable name.\n"); + return E_FAIL; + } + TRACE("Variable name %s.\n", debugstr_a(name)); - variable = e->lpVtbl->GetVariableByName(e, data + offset); + variable = e->lpVtbl->GetVariableByName(e, name); break; case D3D10_EOO_PARSED_OBJECT_INDEX: /* This is a local object, we've parsed in parse_fx10_local_object, which has an array index. */ + if (offset >= data_size || !require_space(offset, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } data_ptr = data + offset; read_dword(&data_ptr, &offset); read_dword(&data_ptr, &variable_idx); - TRACE("Variable name %s[%u].\n", debugstr_a(data + offset), variable_idx); - variable = e->lpVtbl->GetVariableByName(e, data + offset); + if (!fx10_get_string(data, data_size, offset, &name, &name_len)) + { + WARN("Failed to get variable name.\n"); + return E_FAIL; + } + + TRACE("Variable name %s[%u].\n", debugstr_a(name), variable_idx); + + variable = e->lpVtbl->GetVariableByName(e, name); break; case D3D10_EOO_ANONYMOUS_SHADER: @@ -1370,6 +1408,11 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr return E_FAIL; } + if (offset >= data_size || !require_space(offset, 1, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } data_ptr = data + offset; read_dword(&data_ptr, &offset); TRACE("Effect object starts at offset %#x.\n", offset); @@ -1527,8 +1570,8 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, o->pass = p; - hr = parse_fx10_object(o, ptr, data); - if (FAILED(hr)) return hr; + if (FAILED(hr = parse_fx10_object(data, data_size, ptr, o))) + return hr; } return hr;

1 0

Henri Verbeet : d3d10: Introduce fx10_copy_string() (AFL).
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: d76f7f12042b1c82002537b2d7b6823fdb778238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76f7f12042b1c82002537b2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:02 2016 +0200 d3d10: Introduce fx10_copy_string() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 142 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d76f7f12042b1c8200253…

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
55
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 May 2016