June 2015 - Wine-commits - list.winehq.org

Michael Müller : advapi32: Add initial implementation for GetWindowsAccountDomainSid.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 4f3acf31deef5893b057778695fa5691ccac32df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3acf31deef5893b05777869… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Jun 24 02:35:27 2015 +0200 advapi32: Add initial implementation for GetWindowsAccountDomainSid. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 46 ++++++++++++++++++++++ dlls/advapi32/tests/security.c | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- 5 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 4600142..ec27440 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -363,7 +363,7 @@ @ stdcall GetTrusteeTypeW(ptr) @ stdcall GetUserNameA(ptr ptr) @ stdcall GetUserNameW(ptr ptr) -# @ stub GetWindowsAccountDomainSid +@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) # @ stub I_QueryTagInformation # @ stub I_ScGetCurrentGroupStateW # @ stub I_ScIsSecurityProcess diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 028dcc6..c2ce1e1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1538,6 +1538,52 @@ BOOL WINAPI SetSecurityDescriptorControl( PSECURITY_DESCRIPTOR pSecurityDescript pSecurityDescriptor, ControlBitsOfInterest, ControlBitsToSet ) ); } +/****************************************************************************** + * GetWindowsAccountDomainSid [ADVAPI32.@] + */ +BOOL WINAPI GetWindowsAccountDomainSid( PSID sid, PSID domain_sid, DWORD *size ) +{ + SID_IDENTIFIER_AUTHORITY domain_ident = { SECURITY_NT_AUTHORITY }; + DWORD required_size; + int i; + + FIXME( "(%p %p %p): semi-stub\n", sid, domain_sid, size ); + + if (!sid || !IsValidSid( sid )) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + if (!size) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (*GetSidSubAuthorityCount( sid ) < 4) + { + SetLastError( ERROR_INVALID_SID ); + return FALSE; + } + + required_size = GetSidLengthRequired( 4 ); + if (*size < required_size || !domain_sid) + { + *size = required_size; + SetLastError( domain_sid ? ERROR_INSUFFICIENT_BUFFER : + ERROR_INVALID_PARAMETER ); + return FALSE; + } + + InitializeSid( domain_sid, &domain_ident, 4 ); + for (i = 0; i < 4; i++) + *GetSidSubAuthority( domain_sid, i ) = *GetSidSubAuthority( sid, i ); + + *size = required_size; + return TRUE; +} + /* ############################## ###### ACL FUNCTIONS ###### ############################## diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 898ddba..098fa8f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5938,7 +5938,7 @@ static void test_GetWindowsAccountDomainSid(void) if (!pGetWindowsAccountDomainSid) { - skip("GetWindowsAccountDomainSid not available\n"); + win_skip("GetWindowsAccountDomainSid not available\n"); return; } diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index 4277706..edae6d1 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -57,7 +57,7 @@ @ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation -@ stub GetWindowsAccountDomainSid +@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid @ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 3adef23..e19fe53 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -63,7 +63,7 @@ @ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation -@ stub GetWindowsAccountDomainSid +@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid @ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken @ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser @ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf

1 0

André Hentschel : include: Add IMAGE_LOAD_CONFIG_DIRECTORY64 definition.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 8d4917e865e8c423a554267f6e8a7a6bc9043d7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4917e865e8c423a554267f6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 23 20:57:32 2015 +0200 include: Add IMAGE_LOAD_CONFIG_DIRECTORY64 definition. --- dlls/ntdll/tests/generated.c | 396 +++++++++++++++++++++++++++++-------------- include/winnt.h | 35 +++- tools/winapi/tests.dat | 2 + 3 files changed, 306 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d4917e865e8c423a5542…

1 0

Jacek Caban : msscript.ocx: Added typelib.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 90466296e34f16520602fff1dcd523aeb3949899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90466296e34f16520602fff1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 24 10:26:03 2015 +0200 msscript.ocx: Added typelib. --- configure | 2 +- configure.ac | 2 +- dlls/msscript.ocx/Makefile.in | 1 + dlls/msscript.ocx/msscript.idl | 303 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 306 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90466296e34f16520602f…

1 0

Jacek Caban : msscript.ocx: Added DLL registration implementation.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 611b6725e12aa1d4a3e6b724dafe8cd6c3e75f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611b6725e12aa1d4a3e6b724d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 24 10:26:12 2015 +0200 msscript.ocx: Added DLL registration implementation. --- dlls/msscript.ocx/Makefile.in | 1 + dlls/msscript.ocx/msscript.c | 11 ++++++++--- dlls/msscript.ocx/msscript.idl | 5 ++++- dlls/msscript.ocx/msscript.rc | 20 ++++++++++++++++++++ dlls/msscript.ocx/msscript.rgs | 27 +++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 6c0e09a..0cbc964 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -1,4 +1,5 @@ MODULE = msscript.ocx +RC_SRCS = msscript.rc IDL_SRCS = msscript.idl C_SRCS = \ diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 330ad76..30666a0 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -17,11 +17,15 @@ */ #include "windows.h" +#include "ole2.h" +#include "rpcproxy.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msscript); +static HINSTANCE msscript_instance; + /****************************************************************** * DllMain (msscript.ocx.@) */ @@ -33,6 +37,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID lpv) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + msscript_instance = instance; DisableThreadLibraryCalls(instance); break; } @@ -63,8 +68,8 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllRegisterServer(void) { - FIXME("()\n"); - return E_NOTIMPL; + TRACE("()\n"); + return __wine_register_resources(msscript_instance); } /*********************************************************************** @@ -73,5 +78,5 @@ HRESULT WINAPI DllRegisterServer(void) HRESULT WINAPI DllUnregisterServer(void) { TRACE("()\n"); - return E_NOTIMPL; + return __wine_unregister_resources(msscript_instance); } diff --git a/dlls/msscript.ocx/msscript.idl b/dlls/msscript.ocx/msscript.idl index e498723..244e85b 100644 --- a/dlls/msscript.ocx/msscript.idl +++ b/dlls/msscript.ocx/msscript.idl @@ -294,7 +294,10 @@ library MSScriptControl [ helpstring("ScriptControl Object"), - uuid(0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc) + uuid(0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc), + threading(apartment), + progid("MSScriptControl.ScriptControl.1"), + vi_progid("MSScriptControl.ScriptControl") ] coclass ScriptControl { [default] interface IScriptControl; diff --git a/dlls/msscript.ocx/msscript.rc b/dlls/msscript.ocx/msscript.rc new file mode 100644 index 0000000..8a766fa --- /dev/null +++ b/dlls/msscript.ocx/msscript.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * 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 + */ + +/* @makedep: msscript.rgs */ +2 WINE_REGISTRY msscript.rgs diff --git a/dlls/msscript.ocx/msscript.rgs b/dlls/msscript.ocx/msscript.rgs new file mode 100644 index 0000000..46c266a --- /dev/null +++ b/dlls/msscript.ocx/msscript.rgs @@ -0,0 +1,27 @@ +HKCR +{ + NoRemove CLSID + { + '{0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc}' + { + 'Implemented Categories' + { + '{0de86a52-2baa-11cf-a229-00aa003d7352}' + '{0de86a53-2baa-11cf-a229-00aa003d7352}' + '{0de86a57-2baa-11cf-a229-00aa003d7352}' + '{40fc6ed4-2438-11cf-a3db-080036f12502}' + '{40fc6ed5-2438-11cf-a3db-080036f12502}' + } + Control + MiscStatus = s '0' + { + '1' = s '132499' + } + } + } + 'ScriptControl' = s 'ScriptControl Object' + { + CLSID = s '{0e59f1d5-1fbe-11d0-8ff2-00a0d10038bc}' + CurVer = s 'MSScriptControl.ScriptControl.1' + } +}

1 0

Hugh McMaster : regsvr32: Convert codebase to Unicode.
by Alexandre Julliard 24 Jun '15

24 Jun '15

1 0

Hugh McMaster : regsvr32: Add WriteFile fallback if WriteConsole fails.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 485b8dfcf2e4865b2633ce10f046d7689db68d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485b8dfcf2e4865b2633ce10f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 23 21:27:23 2015 +1000 regsvr32: Add WriteFile fallback if WriteConsole fails. --- programs/regsvr32/regsvr32.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 1c9d1b0..2e7af5b 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -93,9 +93,23 @@ static void __cdecl output_write(UINT id, ...) ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL); + /* WriteConsole fails if its output is redirected to a file. + * If this occurs, we should use an OEM codepage and call WriteFile. + */ if (!ret) - WINE_WARN("regsvr32: WriteConsoleW() failed.\n"); + { + DWORD lenA; + char *strA; + lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, NULL, 0, NULL, NULL); + strA = HeapAlloc(GetProcessHeap(), 0, lenA); + if (strA) + { + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE); + HeapFree(GetProcessHeap(), 0, strA); + } + } LocalFree(str); }

1 0

Hugh McMaster : regsvr32: Make Dll* exports WINAPI.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 3f01461ddc2743ee931bfa683bcef88974ab6462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f01461ddc2743ee931bfa683… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 28 20:00:57 2015 +1000 regsvr32: Make Dll* exports WINAPI. --- programs/regsvr32/regsvr32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 2e7af5b..c539095 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -59,9 +59,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(regsvr32); -typedef HRESULT (*DLLREGISTER) (void); -typedef HRESULT (*DLLUNREGISTER) (void); -typedef HRESULT (*DLLINSTALL) (BOOL,LPCWSTR); +typedef HRESULT (WINAPI *DLLREGISTER) (void); +typedef HRESULT (WINAPI *DLLUNREGISTER) (void); +typedef HRESULT (WINAPI *DLLINSTALL) (BOOL,LPCWSTR); static BOOL Silent = FALSE;

1 0

Nikolay Sivov : qmgr: Simplify GetProgress() with a structure copy.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 91e4394c1b9a3e9e8f785c895bde9259787990dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e4394c1b9a3e9e8f785c895… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 19:59:40 2015 +0300 qmgr: Simplify GetProgress() with a structure copy. --- dlls/qmgr/file.c | 4 +--- dlls/qmgr/job.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index b92e52f..c132c7e 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -122,9 +122,7 @@ static HRESULT WINAPI BackgroundCopyFile_GetProgress( TRACE("(%p)->(%p)\n", file, pVal); EnterCriticalSection(&file->owner->cs); - pVal->BytesTotal = file->fileProgress.BytesTotal; - pVal->BytesTransferred = file->fileProgress.BytesTransferred; - pVal->Completed = file->fileProgress.Completed; + *pVal = file->fileProgress; LeaveCriticalSection(&file->owner->cs); return S_OK; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index fda7a01..f6891e3 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -506,10 +506,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetProgress( return E_INVALIDARG; EnterCriticalSection(&This->cs); - pVal->BytesTotal = This->jobProgress.BytesTotal; - pVal->BytesTransferred = This->jobProgress.BytesTransferred; - pVal->FilesTotal = This->jobProgress.FilesTotal; - pVal->FilesTransferred = This->jobProgress.FilesTransferred; + *pVal = This->jobProgress; LeaveCriticalSection(&This->cs); return S_OK;

1 0

Nikolay Sivov : amstream: Create a surface if it wasn' t provided in CreateSample().
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: ed06707bacece1dfe03338039738d453af11fa30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed06707bacece1dfe03338039… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 23:24:46 2015 +0300 amstream: Create a surface if it wasn't provided in CreateSample(). --- dlls/amstream/mediastream.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 15 +++++++++++++-- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index ca4f0ce..947be1e 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -364,6 +364,7 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetDirect HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); if (FAILED(hr)) return hr; + IDirectDraw7_SetCooperativeLevel(This->ddraw, NULL, DDSCL_NORMAL); } return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); @@ -979,7 +980,39 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD IDirectDrawSurface_AddRef(surface); } else - FIXME("create ddraw surface\n"); + { + DDSURFACEDESC desc; + IDirectDraw *ddraw; + + hr = IDirectDrawMediaStream_GetDirectDraw(parent, &ddraw); + if (FAILED(hr)) + { + IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); + return hr; + } + + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT; + desc.dwHeight = 100; + desc.dwWidth = 100; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + desc.ddpfPixelFormat.dwRGBBitCount = 32; + desc.ddpfPixelFormat.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0; + desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY|DDSCAPS_OFFSCREENPLAIN; + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &object->surface, NULL); + IDirectDraw_Release(ddraw); + if (FAILED(hr)) + { + ERR("failed to create surface, 0x%08x\n", hr); + IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); + return hr; + } + } if (rect) object->rect = *rect; @@ -995,7 +1028,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD } } - *ddraw_stream_sample = (IDirectDrawStreamSample*)&object->IDirectDrawStreamSample_iface; + *ddraw_stream_sample = &object->IDirectDrawStreamSample_iface; return S_OK; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b961084..909a738 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -452,11 +452,13 @@ static void test_media_streams(void) static void test_IDirectDrawStreamSample(void) { + DDSURFACEDESC desc = { sizeof(desc) }; IAMMultiMediaStream *pams; HRESULT hr; IMediaStream *pvidstream = NULL; IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; + IDirectDrawSurface7 *surface7; IDirectDrawSurface *surface, *surface2; IDirectDraw *ddraw, *ddraw2; IDirectDraw7 *ddraw7; @@ -504,9 +506,18 @@ static void test_IDirectDrawStreamSample(void) surface = NULL; hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(surface != NULL, "got %p\n", surface); -if (surface) + + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void**)&surface7); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDirectDrawSurface7_Release(surface7); + + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(desc.dwWidth == 100, "width %d\n", desc.dwWidth); + ok(desc.dwHeight == 100, "height %d\n", desc.dwHeight); + ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "format flags %08x\n", desc.ddpfPixelFormat.dwFlags); + ok(desc.ddpfPixelFormat.dwRGBBitCount, "dwRGBBitCount %d\n", desc.ddpfPixelFormat.dwRGBBitCount); IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(pddsample);

1 0

Sebastian Lackner : ntoskrnl: Use SIZE_T to store 64-bit offset to USER_SHARED_DATA page.
by Alexandre Julliard 24 Jun '15

24 Jun '15

Module: wine Branch: master Commit: 3d203b1ecb4ac1ab79888a1a333d993da464dd45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d203b1ecb4ac1ab79888a1a3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jun 24 01:54:40 2015 +0200 ntoskrnl: Use SIZE_T to store 64-bit offset to USER_SHARED_DATA page. --- dlls/ntoskrnl.exe/instr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 1306d5f..85b872e 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -684,7 +684,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) BYTE *data = INSTR_GetOperandAddr( context, instr + 2, long_addr, rex, segprefix, &len ); unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1; - unsigned int offset = data - user_shared_data; + SIZE_T offset = data - user_shared_data; if (offset <= sizeof(KSHARED_USER_DATA) - data_size) { @@ -705,7 +705,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) BYTE *data = INSTR_GetOperandAddr( context, instr + 1, long_addr, rex, segprefix, &len ); unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1; - unsigned int offset = data - user_shared_data; + SIZE_T offset = data - user_shared_data; if (offset <= sizeof(KSHARED_USER_DATA) - data_size) { @@ -725,7 +725,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { BYTE *data = (BYTE *)(long_addr ? *(DWORD64 *)(instr + 1) : *(DWORD *)(instr + 1)); unsigned int data_size = (*instr == 0xa1) ? get_op_size( long_op, rex ) : 1; - unsigned int offset = data - user_shared_data; + SIZE_T offset = data - user_shared_data; len = long_addr ? sizeof(DWORD64) : sizeof(DWORD); if (offset <= sizeof(KSHARED_USER_DATA) - data_size)

1 0