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

Vincent Povirk : mscoree: Install Wine Mono on prefix update.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 1e721a487775a2f306512a7c719b5fa3301f433d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e721a487775a2f306512a7c7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 29 10:35:36 2012 -0500 mscoree: Install Wine Mono on prefix update. --- dlls/mscoree/mscoree_main.c | 120 +++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0aa736f..c7a50c1 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -617,8 +617,128 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return hr; } +static void parse_msi_version_string(const char *version, int *parts) +{ + const char *minor_start, *build_start; + + parts[0] = atoi(version); + + parts[1] = parts[2] = 0; + + minor_start = strchr(version, '.'); + if (minor_start) + { + minor_start++; + parts[1] = atoi(minor_start); + + build_start = strchr(minor_start, '.'); + if (build_start) + parts[2] = atoi(build_start+1); + } +} + +static BOOL install_wine_mono(void) +{ + BOOL is_wow64=0; + HMODULE hmsi; + UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); + char versionstringbuf[15]; + UINT res; + DWORD buffer_size; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR app[MAX_PATH]; + WCHAR *args; + LONG len; + BOOL ret; + + static const char* mono_version = "0.0.4"; + static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; + + static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; + static const WCHAR argsW[] = + {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (is_wow64) + { + TRACE("not installing mono in wow64 process\n"); + return TRUE; + } + + hmsi = LoadLibraryA("msi"); + + if (!hmsi) + { + ERR("couldn't load msi.dll\n"); + return FALSE; + } + + pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + + buffer_size = sizeof(versionstringbuf); + + res = pMsiGetProductInfoA(mono_product_code, "VersionString", versionstringbuf, &buffer_size); + + FreeLibrary(hmsi); + + if (res == ERROR_SUCCESS) + { + int current_version[3], wanted_version[3], i; + + TRACE("found installed version %s\n", versionstringbuf); + + parse_msi_version_string(versionstringbuf, current_version); + parse_msi_version_string(mono_version, wanted_version); + + for (i=0; i<3; i++) + { + if (current_version[i] < wanted_version[i]) + break; + else if (current_version[i] > wanted_version[i]) + { + TRACE("installed version is newer than %s, quitting\n", mono_version); + return TRUE; + } + } + + if (i == 3) + { + TRACE("version %s is already installed, quitting\n", mono_version); + return TRUE; + } + } + + len = GetSystemDirectoryW(app, MAX_PATH-sizeof(controlW)/sizeof(WCHAR)); + memcpy(app+len, controlW, sizeof(controlW)); + + args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); + if(!args) + return FALSE; + + memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); + memcpy(args + len + sizeof(controlW)/sizeof(WCHAR)-1, argsW, sizeof(argsW)); + + TRACE("starting %s\n", debugstr_w(args)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, args); + if (ret) { + CloseHandle(pi.hThread); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + } + + return ret; +} + HRESULT WINAPI DllRegisterServer(void) { + install_wine_mono(); + return __wine_register_resources( MSCOREE_hInstance ); } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e8bf101..d4b53cf 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2502,6 +2502,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,devenum.dll,1 +11,,mscoree.dll,1 11,,mshtml.dll,1 11,,msisip.dll,1 11,,qcap.dll,1

1 0

Juan Lang : crypt32/tests: Add more tests for CertCreateSelfSignCertificate .
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 1a03839bf0b64b62e232bae1f761f5b3b383975d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a03839bf0b64b62e232bae1f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 30 13:49:38 2012 -0700 crypt32/tests: Add more tests for CertCreateSelfSignCertificate. --- dlls/crypt32/tests/cert.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 92a92b5..5d95711 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2254,6 +2254,86 @@ static void testCreateSelfSignCert(void) pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + + /* Acquire a CSP and generate an AT_KEYEXCHANGE key in it. */ + pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + + context = pCertCreateSelfSignCertificate(csp, &name, 0, NULL, NULL, NULL, + NULL, NULL); + ok(!context && GetLastError() == NTE_NO_KEY, + "Expected NTE_NO_KEY, got %08x\n", GetLastError()); + ret = CryptGenKey(csp, AT_KEYEXCHANGE, 0, &key); + ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); + + memset(&info,0,sizeof(info)); + info.dwProvType = PROV_RSA_FULL; + info.dwKeySpec = AT_SIGNATURE; + info.pwszProvName = (LPWSTR) MS_DEF_PROV_W; + info.pwszContainerName = cspNameW; + /* This should fail because the CSP doesn't have the specified key. */ + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + todo_wine + ok(context == NULL, "expected failure\n"); + if (context != NULL) + CertFreeCertificateContext(context); + else + ok(GetLastError() == NTE_NO_KEY, "expected NTE_NO_KEY, got %08x\n", + GetLastError()); + /* Again, with a CSP, AT_KEYEXCHANGE and key info. This succeeds because the + * CSP has an AT_KEYEXCHANGE key in it. + */ + info.dwKeySpec = AT_KEYEXCHANGE; + SetLastError(0xdeadbeef); + context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, + NULL, NULL); + ok(context != NULL, + "CertCreateSelfSignCertificate failed: %08x\n", GetLastError()); + if (context) + { + DWORD size = 0; + + /* The context must have a key provider info property */ + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret && size, "Expected non-zero key provider info\n"); + if (size) + { + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) + { + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); + if (ret) + { + /* Sanity-check the key provider */ + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), + "Unexpected key container\n"); + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), + "Unexpected provider\n"); + ok(pInfo->dwKeySpec == AT_KEYEXCHANGE, + "Expected AT_KEYEXCHANGE, got %d\n", pInfo->dwKeySpec); + } + HeapFree(GetProcessHeap(), 0, pInfo); + } + } + + CertFreeCertificateContext(context); + } + + CryptReleaseContext(csp, 0); + ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); + ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); + } static void testIntendedKeyUsage(void)

1 0

Vincent Povirk : Revert "windowscodecs: Add a stubbed out IWICMetadataBlockReader interface.".
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 568233621f03d0f36d8f060f3a41eaa12dbeff32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568233621f03d0f36d8f060f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 30 14:55:35 2012 -0500 Revert "windowscodecs: Add a stubbed out IWICMetadataBlockReader interface.". This reverts commit 882c1026a865a703711f2d78235075320b02f48c. --- dlls/windowscodecs/metadatahandler.c | 69 ---------------------------------- dlls/windowscodecs/tests/metadata.c | 2 +- 2 files changed, 1 insertions(+), 70 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index ffe6763..afcff21 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -39,7 +39,6 @@ typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface; LONG ref; IWICPersistStream IWICPersistStream_iface; - IWICMetadataBlockReader IWICMetadataBlockReader_iface; const MetadataHandlerVtbl *vtable; MetadataItem *items; DWORD item_count; @@ -56,11 +55,6 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if return CONTAINING_RECORD(iface, MetadataHandler, IWICPersistStream_iface); } -static inline MetadataHandler *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) -{ - return CONTAINING_RECORD(iface, MetadataHandler, IWICMetadataBlockReader_iface); -} - static void MetadataHandler_FreeItems(MetadataHandler *This) { int i; @@ -98,10 +92,6 @@ static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface, { *ppv = &This->IWICPersistStream_iface; } - else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) - { - *ppv = &This->IWICMetadataBlockReader_iface; - } else { *ppv = NULL; @@ -327,64 +317,6 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { MetadataHandler_SaveEx }; -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_QueryInterface(IWICMetadataBlockReader *iface, - REFIID iid, void **ppv) -{ - MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); - return IWICMetadataWriter_QueryInterface(&This->IWICMetadataWriter_iface, iid, ppv); -} - -static ULONG WINAPI MetadataHandler_MetadataBlockReader_AddRef(IWICMetadataBlockReader *iface) -{ - MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); - return IWICMetadataWriter_AddRef(&This->IWICMetadataWriter_iface); -} - -static ULONG WINAPI MetadataHandler_MetadataBlockReader_Release(IWICMetadataBlockReader *iface) -{ - MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); - return IWICMetadataWriter_Release(&This->IWICMetadataWriter_iface); -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetContainerFormat( - IWICMetadataBlockReader *iface, GUID *guid) -{ - FIXME("(%p,%p): stub\n", iface, guid); - return E_NOTIMPL; -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetCount( - IWICMetadataBlockReader *iface, UINT *count) -{ - FIXME("(%p,%p): stub\n", iface, count); - return E_NOTIMPL; -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetReaderByIndex( - IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) -{ - FIXME("(%p,%u,%p): stub\n", iface, index, reader); - return E_NOTIMPL; -} - -static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetEnumerator( - IWICMetadataBlockReader *iface, IEnumUnknown **enum_metadata) -{ - FIXME("(%p,%p): stub\n", iface, enum_metadata); - return E_NOTIMPL; -} - -static const IWICMetadataBlockReaderVtbl MetadataHandler_MetadataBlockReader_Vtbl = -{ - MetadataHandler_MetadataBlockReader_QueryInterface, - MetadataHandler_MetadataBlockReader_AddRef, - MetadataHandler_MetadataBlockReader_Release, - MetadataHandler_MetadataBlockReader_GetContainerFormat, - MetadataHandler_MetadataBlockReader_GetCount, - MetadataHandler_MetadataBlockReader_GetReaderByIndex, - MetadataHandler_MetadataBlockReader_GetEnumerator -}; - HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) { MetadataHandler *This; @@ -401,7 +333,6 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO This->IWICMetadataWriter_iface.lpVtbl = &MetadataHandler_Vtbl; This->IWICPersistStream_iface.lpVtbl = &MetadataHandler_PersistStream_Vtbl; - This->IWICMetadataBlockReader_iface.lpVtbl = &MetadataHandler_MetadataBlockReader_Vtbl; This->ref = 1; This->vtable = vtable; This->items = NULL; diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 5cde494..1292bbf 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -199,7 +199,7 @@ static void test_metadata_unknown(void) } hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); - todo_wine ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); + ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr); if (SUCCEEDED(hr)) IWICMetadataBlockReader_Release(blockreader);

1 0

Juan Lang : crypt32: Don' t fail if HCRYPTPROV and PCRYPT_KEY_PROV_INFO parameters are both non-NULL.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 6ccdbab6c860546a80c7dd1eab34e8b64bdb8ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccdbab6c860546a80c7dd1ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 18 15:27:52 2012 -0700 crypt32: Don't fail if HCRYPTPROV and PCRYPT_KEY_PROV_INFO parameters are both non-NULL. --- dlls/crypt32/cert.c | 5 ----- dlls/crypt32/tests/cert.c | 3 +-- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 557a17b..be7d07c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3201,11 +3201,6 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN releaseContext = TRUE; } } - else if (pKeyProvInfo) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL, &pubKeySize); diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 52d3013..92a92b5 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2156,11 +2156,11 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); + todo_wine ok(context == NULL, "expected failure\n"); if (context != NULL) CertFreeCertificateContext(context); else - todo_wine ok(GetLastError() == NTE_NO_KEY, "expected NTE_NO_KEY, got %08x\n", GetLastError()); /* Again, with a CSP, AT_SIGNATURE and key info */ @@ -2168,7 +2168,6 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); - todo_wine ok(context != NULL, "CertCreateSelfSignCertificate failed: %08x\n", GetLastError()); if (context)

1 0

Juan Lang : crypt32: Fail earlier if CryptExportPublicKeyInfo fails.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: da53cfc8bb15813fc6870d82aac059d50b95ccac URL: http://source.winehq.org/git/wine.git/?a=commit;h=da53cfc8bb15813fc6870d82a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri May 18 15:29:03 2012 -0700 crypt32: Fail earlier if CryptExportPublicKeyInfo fails. --- dlls/crypt32/cert.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index be7d07c..2d6697c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3202,8 +3202,10 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN } } - CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL, + ret = CryptExportPublicKeyInfo(hProv, dwKeySpec, X509_ASN_ENCODING, NULL, &pubKeySize); + if (!ret) + goto end; pubKey = CryptMemAlloc(pubKeySize); if (pubKey) { @@ -3237,6 +3239,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN } CryptMemFree(pubKey); } +end: if (releaseContext) CryptReleaseContext(hProv, 0); return context;

1 0

Alexandre Julliard : gdi32: Move DC hook private definitions out of wingdi. h.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: f1bf4ea3fc7386d0aec24d8e735f4595da0d3577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bf4ea3fc7386d0aec24d8e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 11:44:23 2012 +0200 gdi32: Move DC hook private definitions out of wingdi.h. --- dlls/gdi.exe16/gdi.c | 3 ++- dlls/user32/painting.c | 1 + dlls/user32/sysparams.c | 1 + include/wine/gdi_driver.h | 16 ++++++++++++++++ include/wingdi.h | 19 ------------------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 4eff2bc..45c2c78 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -2017,7 +2017,8 @@ DWORD WINAPI GetDCHook16( HDC16 hdc16, FARPROC16 *phookProc ) */ WORD WINAPI SetHookFlags16( HDC16 hdc, WORD flags ) { - return SetHookFlags( HDC_32(hdc), flags ); + FIXME( "%04x %x: not supported\n", hdc, flags ); + return 0; } diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 60252c6..5a3614c 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -36,6 +36,7 @@ #include "win.h" #include "user_private.h" #include "controls.h" +#include "wine/gdi_driver.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6a80687..fecaeda 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -39,6 +39,7 @@ #include "controls.h" #include "user_private.h" +#include "wine/gdi_driver.h" #include "wine/unicode.h" #include "wine/debug.h" diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index fffc459..5568eaa 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -235,4 +235,20 @@ static inline void push_dc_driver( PHYSDEV *dev, PHYSDEV physdev, const struct g *dev = physdev; } +/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */ + +#define DCHC_INVALIDVISRGN 0x0001 +#define DCHC_DELETEDC 0x0002 +#define DCHF_INVALIDATEVISRGN 0x0001 +#define DCHF_VALIDATEVISRGN 0x0002 + +typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); + +WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); +WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); +WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); + +extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); +extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); + #endif /* __WINE_WINE_GDI_DRIVER_H */ diff --git a/include/wingdi.h b/include/wingdi.h index 2f9fa08..858d3c1 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3785,25 +3785,6 @@ WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,I WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,INT,LPGLYPHMETRICSFLOAT); #define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines) -#ifdef __WINESRC__ -/* the DC hook support is only exported on Win16, the 32-bit version is a Wine extension */ - -#define DCHC_INVALIDVISRGN 0x0001 -#define DCHC_DELETEDC 0x0002 -#define DCHF_INVALIDATEVISRGN 0x0001 -#define DCHF_VALIDATEVISRGN 0x0002 - -typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM); - -WINGDIAPI DWORD_PTR WINAPI GetDCHook(HDC,DCHOOKPROC*); -WINGDIAPI BOOL WINAPI SetDCHook(HDC,DCHOOKPROC,DWORD_PTR); -WINGDIAPI WORD WINAPI SetHookFlags(HDC,WORD); - -extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); -extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); - -#endif /* __WINESRC__ */ - #ifdef __cplusplus } #endif

1 0

Juan Lang : crypt32: Initialize key spec correctly.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: f86ab49be2a3f8ce778fb6ed5fa3e91e9ccfad75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86ab49be2a3f8ce778fb6ed5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 30 14:26:56 2012 -0700 crypt32: Initialize key spec correctly. --- dlls/crypt32/cert.c | 4 ++-- dlls/crypt32/tests/cert.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2d6697c..478fff3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3139,7 +3139,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN PCCERT_CONTEXT context = NULL; BOOL ret, releaseContext = FALSE; PCERT_PUBLIC_KEY_INFO pubKey = NULL; - DWORD pubKeySize = 0,dwKeySpec = AT_SIGNATURE; + DWORD pubKeySize = 0, dwKeySpec; TRACE("(%08lx, %p, %08x, %p, %p, %p, %p, %p)\n", hProv, pSubjectIssuerBlob, dwFlags, pKeyProvInfo, pSignatureAlgorithm, pStartTime, @@ -3151,6 +3151,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN return NULL; } + dwKeySpec = pKeyProvInfo ? pKeyProvInfo->dwKeySpec : AT_SIGNATURE; if (!hProv) { if (!pKeyProvInfo) @@ -3181,7 +3182,6 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN if (!ret) return NULL; } - dwKeySpec = pKeyProvInfo->dwKeySpec; /* check if the key is here */ ret = CryptGetUserKey(hProv,dwKeySpec,&hKey); if(!ret) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 5d95711..f31236a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2156,7 +2156,6 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); - todo_wine ok(context == NULL, "expected failure\n"); if (context != NULL) CertFreeCertificateContext(context); @@ -2278,7 +2277,6 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); - todo_wine ok(context == NULL, "expected failure\n"); if (context != NULL) CertFreeCertificateContext(context);

1 0

Juan Lang : crypt32/tests: Don' t shadow a variable with a variable of a different type.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 03e409bbd2bdea748e2e2d6b44a63091688bb59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e409bbd2bdea748e2e2d6b4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 17 15:55:16 2012 -0700 crypt32/tests: Don't shadow a variable with a variable of a different type. --- dlls/crypt32/tests/cert.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 9678053..6e46a57 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2098,7 +2098,6 @@ static void testCreateSelfSignCert(void) if (context) { DWORD size = 0; - PCRYPT_KEY_PROV_INFO info; /* The context must have a key provider info property */ ret = CertGetCertificateContextProperty(context, @@ -2106,24 +2105,25 @@ static void testCreateSelfSignCert(void) ok(ret && size, "Expected non-zero key provider info\n"); if (size) { - info = HeapAlloc(GetProcessHeap(), 0, size); - if (info) + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) { ret = CertGetCertificateContextProperty(context, - CERT_KEY_PROV_INFO_PROP_ID, info, &size); + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(info->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), "Unexpected key container\n"); - ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); - ok(info->dwKeySpec == AT_SIGNATURE, - "Expected AT_SIGNATURE, got %d\n", info->dwKeySpec); + ok(pInfo->dwKeySpec == AT_SIGNATURE, + "Expected AT_SIGNATURE, got %d\n", pInfo->dwKeySpec); } - HeapFree(GetProcessHeap(), 0, info); + HeapFree(GetProcessHeap(), 0, pInfo); } } @@ -2152,7 +2152,6 @@ static void testCreateSelfSignCert(void) if (context) { DWORD size = 0; - PCRYPT_KEY_PROV_INFO info; /* The context must have a key provider info property */ ret = CertGetCertificateContextProperty(context, @@ -2160,24 +2159,25 @@ static void testCreateSelfSignCert(void) ok(ret && size, "Expected non-zero key provider info\n"); if (size) { - info = HeapAlloc(GetProcessHeap(), 0, size); - if (info) + PCRYPT_KEY_PROV_INFO pInfo = HeapAlloc(GetProcessHeap(), 0, size); + + if (pInfo) { ret = CertGetCertificateContextProperty(context, - CERT_KEY_PROV_INFO_PROP_ID, info, &size); + CERT_KEY_PROV_INFO_PROP_ID, pInfo, &size); ok(ret, "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); if (ret) { /* Sanity-check the key provider */ - ok(!lstrcmpW(info->pwszContainerName, cspNameW), + ok(!lstrcmpW(pInfo->pwszContainerName, cspNameW), "Unexpected key container\n"); - ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), + ok(!lstrcmpW(pInfo->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); - ok(info->dwKeySpec == AT_KEYEXCHANGE, - "Expected AT_KEYEXCHANGE, got %d\n", info->dwKeySpec); + ok(pInfo->dwKeySpec == AT_KEYEXCHANGE, + "Expected AT_KEYEXCHANGE, got %d\n", pInfo->dwKeySpec); } - HeapFree(GetProcessHeap(), 0, info); + HeapFree(GetProcessHeap(), 0, pInfo); } }

1 0

Alexandre Julliard : gdi32: Make sure the bounds are always updated in ExtTextOutW.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: af4871f862a224452e06c1d4c1c465d6dfa54e66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4871f862a224452e06c1d4c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 23 17:49:59 2012 +0200 gdi32: Make sure the bounds are always updated in ExtTextOutW. --- dlls/gdi32/dibdrv/graphics.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 835f7d7..0237acf 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -675,7 +675,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, free_clipped_rects( &clipped_rects ); get_clipped_rects( &pdev->dib, NULL, pdev->clip, &clipped_rects ); } - if (!clipped_rects.count) return TRUE; + if (!clipped_rects.count) goto done; text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); @@ -712,9 +712,9 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, origin.y += metrics.gmCellIncY; } } - add_clipped_bounds( pdev, &bounds, pdev->clip ); done: + add_clipped_bounds( pdev, &bounds, pdev->clip ); free_clipped_rects( &clipped_rects ); return TRUE; }

1 0

Alexandre Julliard : setupapi: Add support for a WinePreInstall section for registry keys that need to be created before anything else .
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 9a6a1126b9b8b4b5f17b16249eba761063be4be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6a1126b9b8b4b5f17b16249… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 20:25:37 2012 +0200 setupapi: Add support for a WinePreInstall section for registry keys that need to be created before anything else. --- dlls/setupapi/install.c | 10 ++++++++++ tools/wine.inf.in | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 96eb914..874b4a9 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -91,6 +91,7 @@ static const WCHAR Name[] = {'N','a','m','e',0}; static const WCHAR CmdLine[] = {'C','m','d','L','i','n','e',0}; static const WCHAR SubDir[] = {'S','u','b','D','i','r',0}; static const WCHAR WineFakeDlls[] = {'W','i','n','e','F','a','k','e','D','l','l','s',0}; +static const WCHAR WinePreInstall[] = {'W','i','n','e','P','r','e','I','n','s','t','a','l','l',0}; static const WCHAR DisplayName[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR ServiceBinary[] = {'S','e','r','v','i','c','e','B','i','n','a','r','y',0}; @@ -1067,6 +1068,15 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, BOOL ret; int i; + if (flags & SPINST_REGISTRY) + { + struct registry_callback_info info; + + info.default_root = key_root; + info.delete = FALSE; + if (!iterate_section_fields( hinf, section, WinePreInstall, registry_callback, &info )) + return FALSE; + } if (flags & SPINST_FILES) { struct files_callback_info info; diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f95d9dc..e8bf101 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -80,6 +80,7 @@ AddReg=\ [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDlls +WinePreInstall=Wow64 UpdateInis=SystemIni CopyFiles=(a)l_intl.nls AddReg=\ @@ -102,8 +103,7 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - VersionInfo,\ - Wow64 + VersionInfo [Wow64Install] RegisterDlls=RegisterDllsSection

1 0