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

Hans Leidekker : secur32: Fix potential leaks of the NTLM session key.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 81213a88e83b19c73e244e00bffac2e4057d513c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81213a88e83b19c73e244e00b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:04:53 2012 +0200 secur32: Fix potential leaks of the NTLM session key. --- dlls/secur32/dispatcher.c | 1 + dlls/secur32/ntlm.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 33b0512..5a9e26a 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -281,6 +281,7 @@ void cleanup_helper(PNegoHelper helper) return; HeapFree(GetProcessHeap(), 0, helper->com_buf); + HeapFree(GetProcessHeap(), 0, helper->session_key); /* closing stdin will terminate ntlm_auth */ close(helper->pipe_out); diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index d002b37..524eec3 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -825,7 +825,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_BUFFER_TOO_SMALL; if ((phContext == NULL) && (pInput == NULL)) { - HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -844,7 +843,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_BUFFER_TOO_SMALL; if ((phContext == NULL) && (pInput == NULL)) { - HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -858,7 +856,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_INTERNAL_ERROR; if ((phContext == NULL) && (pInput == NULL)) { - HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -907,8 +904,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( helper->session_key = HeapAlloc(GetProcessHeap(), 0, bin_len); if(!helper->session_key) { - TRACE("Failed to allocate memory for session key\n"); - ret = SEC_E_INTERNAL_ERROR; + ret = SEC_E_INSUFFICIENT_MEMORY; goto isc_end; } memcpy(helper->session_key, bin, bin_len); @@ -1288,7 +1284,13 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( if(strncmp(buffer, "BH ", 3) == 0) { TRACE("Helper sent %s\n", debugstr_a(buffer+3)); + HeapFree(GetProcessHeap(), 0, helper->session_key); helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); + if (!helper->session_key) + { + ret = SEC_E_INSUFFICIENT_MEMORY; + goto asc_end; + } /*FIXME: Generate the dummy session key = MD4(MD4(password))*/ memset(helper->session_key, 0 , 16); } @@ -1300,11 +1302,11 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext( TRACE("Failed to decode session key\n"); } TRACE("Session key is %s\n", debugstr_a(buffer+3)); + HeapFree(GetProcessHeap(), 0, helper->session_key); helper->session_key = HeapAlloc(GetProcessHeap(), 0, 16); if(!helper->session_key) { - TRACE("Failed to allocate memory for session key\n"); - ret = SEC_E_INTERNAL_ERROR; + ret = SEC_E_INSUFFICIENT_MEMORY; goto asc_end; } memcpy(helper->session_key, bin, 16); @@ -1356,7 +1358,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContex phContext->dwLower = 0; SECUR32_arc4Cleanup(helper->crypt.ntlm.a4i); - HeapFree(GetProcessHeap(), 0, helper->session_key); SECUR32_arc4Cleanup(helper->crypt.ntlm2.send_a4i); SECUR32_arc4Cleanup(helper->crypt.ntlm2.recv_a4i); HeapFree(GetProcessHeap(), 0, helper->crypt.ntlm2.send_sign_key);

1 0

Hans Leidekker : secur32: Remove some unused variables.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: ebab1c72cf4bf6a5bc250b3d6228b6fdb2f2bb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebab1c72cf4bf6a5bc250b3d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:05:07 2012 +0200 secur32: Remove some unused variables. --- dlls/secur32/ntlm.c | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 524eec3..da02366 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -142,7 +142,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( { SECURITY_STATUS ret; PNtlmCredentials ntlm_cred = NULL; - SEC_WCHAR *username = NULL, *domain = NULL; TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, @@ -222,10 +221,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( phCredential = NULL; ret = SEC_E_UNKNOWN_CREDENTIALS; } - - HeapFree(GetProcessHeap(), 0, username); - HeapFree(GetProcessHeap(), 0, domain); - return ret; } @@ -433,7 +428,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; - PNtlmCredentials ntlm_cred = NULL; + PNtlmCredentials ntlm_cred; PNegoHelper helper = NULL; ULONG ctxt_attr = 0; char* buffer, *want_flags = NULL; @@ -1783,9 +1778,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, if(helper->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCHANGE) SECUR32_arc4Process(helper->crypt.ntlm2.send_a4i, ((BYTE *)pMessage->pBuffers[token_idx].pvBuffer)+4, 8); - - - return SEC_E_OK; } else { @@ -1808,9 +1800,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle phContext, if(helper->neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN || helper->neg_flags == 0) memset(sig+4, 0, 4); - } - return SEC_E_OK; }

1 0

Hans Leidekker : secur32: Update NTLM capabilities to match native.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: bd7e46976077d83b8374dc6590d7b047342f18f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7e46976077d83b8374dc659… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:05:26 2012 +0200 secur32: Update NTLM capabilities to match native. --- dlls/secur32/ntlm.c | 18 ++++++++++-------- include/sspi.h | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index da02366..6a1199b 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1938,14 +1938,16 @@ static WCHAR ntlm_name_W[] = NTLM_NAME; /* According to Windows, NTLM has the following capabilities. */ #define CAPS ( \ - SECPKG_FLAG_INTEGRITY | \ - SECPKG_FLAG_PRIVACY | \ - SECPKG_FLAG_TOKEN_ONLY | \ - SECPKG_FLAG_CONNECTION | \ - SECPKG_FLAG_MULTI_REQUIRED | \ - SECPKG_FLAG_IMPERSONATION | \ - SECPKG_FLAG_ACCEPT_WIN32_NAME | \ - SECPKG_FLAG_READONLY_WITH_CHECKSUM) + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON | \ + SECPKG_FLAG_RESTRICTED_TOKENS ) static const SecPkgInfoW infoW = { CAPS, diff --git a/include/sspi.h b/include/sspi.h index 6e69c09..bd2241c 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -130,6 +130,7 @@ typedef struct _SecPkgInfoW #define SECPKG_FLAG_MUTUAL_AUTH 0x00010000 #define SECPKG_FLAG_DELEGATION 0x00020000 #define SECPKG_FLAG_READONLY_WITH_CHECKSUM 0x00040000 +#define SECPKG_FLAG_RESTRICTED_TOKENS 0x00080000 #define SECPKG_ID_NONE 0xffff

1 0

Hans Leidekker : secur32: Add an option to disable use of cached Samba credentials.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 3181577810a6d14ac88866ea273eaf2165f104fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=3181577810a6d14ac88866ea2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:05:48 2012 +0200 secur32: Add an option to disable use of cached Samba credentials. --- dlls/secur32/ntlm.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 6a1199b..38d2045 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -52,6 +52,7 @@ typedef struct _NtlmCredentials char *domain_arg; char *password; /* not nul-terminated */ int pwlen; + int no_cached_credentials; /* don't try to use cached Samba credentials */ } NtlmCredentials, *PNtlmCredentials; /*********************************************************************** @@ -141,7 +142,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { SECURITY_STATUS ret; - PNtlmCredentials ntlm_cred = NULL; + PNtlmCredentials ntlm_cred; TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, @@ -160,6 +161,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; + ntlm_cred->no_cached_credentials = 0; + phCredential->dwUpper = fCredentialUse; phCredential->dwLower = (ULONG_PTR)ntlm_cred; ret = SEC_E_OK; @@ -178,6 +181,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; + ntlm_cred->no_cached_credentials = 0; if(pAuthData != NULL) { @@ -539,7 +543,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( else { status = NetWkstaUserGetInfo(NULL, 1, (LPBYTE *)&ui); - if (status != NERR_Success || ui == NULL) + if (status != NERR_Success || ui == NULL || ntlm_cred->no_cached_credentials) { ret = SEC_E_NO_CREDENTIALS; goto isc_end;

1 0

Hans Leidekker : secur32: Implement a Negotiate provider that forwards to NTLM.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 19f8c79f9eaff076edd959a0187657633216f0e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f8c79f9eaff076edd959a01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 10 13:06:20 2012 +0200 secur32: Implement a Negotiate provider that forwards to NTLM. --- dlls/secur32/negotiate.c | 484 ++++++++++++++++++++++++------------------- dlls/secur32/ntlm.c | 95 ++------- dlls/secur32/secur32_priv.h | 30 +++ 3 files changed, 318 insertions(+), 291 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19f8c79f9eaff076edd95…

1 0

Alexandre Julliard : wininet/tests: Mark a failing test as broken.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 0b3b6ba26df9b072e72a3584409d1dcceecfb752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b3b6ba26df9b072e72a35844… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 23:20:51 2012 +0200 wininet/tests: Mark a failing test as broken. --- dlls/wininet/tests/internet.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index fc15b2a..7b0ee47 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -284,8 +284,9 @@ static void test_max_conns(void) val = 0; res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)); - ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER, 0) succeeded\n"); - ok(GetLastError() == ERROR_BAD_ARGUMENTS, "GetLastError() = %u\n", GetLastError()); + ok(!res || broken(res), /* <= w2k3 */ + "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER, 0) succeeded\n"); + if (!res) ok(GetLastError() == ERROR_BAD_ARGUMENTS, "GetLastError() = %u\n", GetLastError()); val = 2; res = InternetSetOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, sizeof(val)-1);

1 0

Alexandre Julliard : kernel32/tests: Remove a couple of invalid tests.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 5f20ecc62a774eb295ed3222d5842eecb68c8d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f20ecc62a774eb295ed3222d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 9 23:21:07 2012 +0200 kernel32/tests: Remove a couple of invalid tests. --- dlls/kernel32/tests/virtual.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 73a5206..d02ca34 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -851,7 +851,6 @@ static void test_MapViewOfFile(void) ret = VirtualQuery(ptr, &info, sizeof(info)); ok(ret, "VirtualQuery error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); - ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect); @@ -932,7 +931,6 @@ static void test_MapViewOfFile(void) ret = VirtualQuery(ptr, &info, sizeof(info)); ok(ret, "VirtualQuery error %d\n", GetLastError()); ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); - ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect);

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 10 May '12

10 May '12

Module: wine Branch: master Commit: 8c3a1eb759b75e1d24e3c98b14359dd335a29c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3a1eb759b75e1d24e3c98b1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 9 23:16:23 2012 +0900 po: Update Japanese translation. --- po/ja.po | 222 +++++++++++++++++++++++++------------------------------------- 1 files changed, 88 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c3a1eb759b75e1d24e3c…

1 0

Nikolay Sivov : msxml3/tests: Really test load() on files with leading spaces.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 9c0486d7a802c2f618a56a2074c5d790d329e3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0486d7a802c2f618a56a207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 9 20:30:58 2012 +0400 msxml3/tests: Really test load() on files with leading spaces. --- dlls/msxml3/tests/domdoc.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 09165c3..2aa2906 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2061,8 +2061,12 @@ static void test_domdoc( void ) LONG code, ref; LONG nLength = 0; WCHAR buff[100]; + char path[MAX_PATH]; int index; + GetTempPathA(MAX_PATH, path); + strcat(path, "leading_spaces.xml"); + /* Load document with leading spaces * * Test all CLSIDs with all test data XML strings @@ -2087,13 +2091,24 @@ static void test_domdoc( void ) i = 0; while (*data_ptr) { BSTR data = _bstr_(*data_ptr); + DWORD written; + HANDLE file; + + file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(file != INVALID_HANDLE_VALUE, "can't create file %s: %u\n", path, GetLastError()); + + WriteFile(file, data, lstrlenW(data)*sizeof(WCHAR), &written, NULL); + CloseHandle(file); b = 0xc; V_VT(&var) = VT_BSTR; - V_BSTR(&var) = data; + V_BSTR(&var) = _bstr_(path); hr = IXMLDOMDocument_load(doc, var, &b); + todo_wine { EXPECT_HR(hr, class_ptr->ret[0].hr); ok(b == class_ptr->ret[0].b, "%d:%d, got %d, expected %d\n", index, i, b, class_ptr->ret[0].b); + } + DeleteFileA(path); b = 0xc; hr = IXMLDOMDocument_loadXML(doc, data, &b); @@ -2103,8 +2118,10 @@ static void test_domdoc( void ) data_ptr++; i++; } + class_ptr++; index++; + free_bstrs(); } doc = create_document(&IID_IXMLDOMDocument);

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmapSource methods.
by Alexandre Julliard 09 May '12

09 May '12

Module: wine Branch: master Commit: 3c353607b1c6d12f5a89929237948fb0494a65da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c353607b1c6d12f5a8992923… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 10:29:27 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmapSource methods. --- dlls/windowscodecs/proxy.c | 30 ++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 10 +++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index c3209cc..f6d9649 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICBitmapSource_GetSize_Proxy_W(IWICBitmapSource *iface, + UINT *puiWidth, UINT *puiHeight) +{ + return IWICBitmapSource_GetSize(iface, puiWidth, puiHeight); +} + +HRESULT WINAPI IWICBitmapSource_GetPixelFormat_Proxy_W(IWICBitmapSource *iface, + WICPixelFormatGUID *pPixelFormat) +{ + return IWICBitmapSource_GetPixelFormat(iface, pPixelFormat); +} + +HRESULT WINAPI IWICBitmapSource_GetResolution_Proxy_W(IWICBitmapSource *iface, + double *pDpiX, double *pDpiY) +{ + return IWICBitmapSource_GetResolution(iface, pDpiX, pDpiY); +} + +HRESULT WINAPI IWICBitmapSource_CopyPalette_Proxy_W(IWICBitmapSource *iface, + IWICPalette *pIPalette) +{ + return IWICBitmapSource_CopyPalette(iface, pIPalette); +} + +HRESULT WINAPI IWICBitmapSource_CopyPixels_Proxy_W(IWICBitmapSource *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + return IWICBitmapSource_CopyPixels(iface, prc, cbStride, cbBufferSize, pbBuffer); +} + HRESULT WINAPI IWICColorContext_InitializeFromMemory_Proxy_W(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 269fda5..c4b8873 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -44,11 +44,11 @@ @ stub IWICBitmapLock_GetDataPointer_STA_Proxy @ stub IWICBitmapLock_GetStride_Proxy @ stub IWICBitmapScaler_Initialize_Proxy -@ stub IWICBitmapSource_CopyPalette_Proxy -@ stub IWICBitmapSource_CopyPixels_Proxy -@ stub IWICBitmapSource_GetPixelFormat_Proxy -@ stub IWICBitmapSource_GetResolution_Proxy -@ stub IWICBitmapSource_GetSize_Proxy +@ stdcall IWICBitmapSource_CopyPalette_Proxy(ptr ptr) IWICBitmapSource_CopyPalette_Proxy_W +@ stdcall IWICBitmapSource_CopyPixels_Proxy(ptr ptr long long ptr) IWICBitmapSource_CopyPixels_Proxy_W +@ stdcall IWICBitmapSource_GetPixelFormat_Proxy(ptr ptr) IWICBitmapSource_GetPixelFormat_Proxy_W +@ stdcall IWICBitmapSource_GetResolution_Proxy(ptr ptr ptr) IWICBitmapSource_GetResolution_Proxy_W +@ stdcall IWICBitmapSource_GetSize_Proxy(ptr ptr ptr) IWICBitmapSource_GetSize_Proxy_W @ stub IWICBitmap_Lock_Proxy @ stub IWICBitmap_SetPalette_Proxy @ stub IWICBitmap_SetResolution_Proxy

1 0