September 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : wordpad: Add font size list.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 58b09f02277cc8b90d7e80ef5c6ab3d5296e79d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b09f02277cc8b90d7e80ef5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 24 19:45:54 2007 +0200 wordpad: Add font size list. --- programs/wordpad/resource.h | 11 ++- programs/wordpad/wordpad.c | 150 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 150 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58b09f02277cc8b90d7e8…

1 0

Juan Lang : wintrust: Implement SoftpubCleanup.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: b13d16a0da4f02c577bc8b4ee02e5124e749ad19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13d16a0da4f02c577bc8b4ee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 12 08:58:45 2007 -0700 wintrust: Implement SoftpubCleanup. --- dlls/wintrust/softpub.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 48632d5..2d892b5 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -569,3 +569,38 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) GetLastError(); return ret ? S_OK : S_FALSE; } + +HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) +{ + DWORD i, j; + + for (i = 0; i < data->csSigners; i++) + { + for (j = 0; j < data->pasSigners[i].csCertChain; j++) + CertFreeCertificateContext(data->pasSigners[i].pasCertChain[j].pCert); + data->psPfns->pfnFree(data->pasSigners[i].pasCertChain); + data->psPfns->pfnFree(data->pasSigners[i].psSigner); + CertFreeCertificateChain(data->pasSigners[i].pChainContext); + } + data->psPfns->pfnFree(data->pasSigners); + + for (i = 0; i < data->chStores; i++) + CertCloseStore(data->pahStores[i], 0); + data->psPfns->pfnFree(data->pahStores); + + if (data->u.pPDSip) + { + data->psPfns->pfnFree(data->u.pPDSip->pSip); + data->psPfns->pfnFree(data->u.pPDSip->pCATSip); + data->psPfns->pfnFree(data->u.pPDSip->psSipSubjectInfo); + data->psPfns->pfnFree(data->u.pPDSip->psSipCATSubjectInfo); + data->psPfns->pfnFree(data->u.pPDSip->psIndirectData); + } + + CryptMsgClose(data->hMsg); + + if (data->fOpenedFile) + CloseHandle(data->pWintrustData->u.pFile->hFile); + + return S_OK; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index c7ae993..f260193 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -58,7 +58,7 @@ @ stub OpenPersonalTrustDBDialog @ stub SoftpubAuthenticode @ stdcall SoftpubCheckCert(ptr long long long) -@ stub SoftpubCleanup +@ stdcall SoftpubCleanup(ptr) @ stub SoftpubDefCertInit @ stdcall SoftpubDllRegisterServer() @ stdcall SoftpubDllUnregisterServer()

1 0

Juan Lang : wintrust: Implement WinVerifyTrust.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 40f33d656819085d585943a2f38b9ad2a50f9132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40f33d656819085d585943a2f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 12 09:01:19 2007 -0700 wintrust: Implement WinVerifyTrust. --- dlls/wintrust/wintrust_main.c | 173 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 171 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index d6134b7..e4879b7 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -1,5 +1,6 @@ /* * Copyright 2001 Rein Klazes + * Copyright 2007 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +30,7 @@ #include "softpub.h" #include "mscat.h" #include "objbase.h" +#include "winuser.h" #include "wintrust_priv.h" #include "wine/debug.h" @@ -64,6 +66,138 @@ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert ) return ret; } +static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, + WINTRUST_DATA *data) +{ + DWORD err = ERROR_SUCCESS; + CRYPT_PROVIDER_DATA *provData; + BOOL ret; + + TRACE("(%p, %s, %p)\n", hwnd, debugstr_guid(actionID), data); + + provData = WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_DATA)); + if (!provData) + goto oom; + provData->cbStruct = sizeof(CRYPT_PROVIDER_DATA); + + provData->padwTrustStepErrors = + WINTRUST_Alloc(TRUSTERROR_MAX_STEPS * sizeof(DWORD)); + if (!provData->padwTrustStepErrors) + goto oom; + provData->cdwTrustStepErrors = TRUSTERROR_MAX_STEPS; + + provData->pPDSip = WINTRUST_Alloc(sizeof(PROVDATA_SIP)); + if (!provData->pPDSip) + goto oom; + provData->pPDSip->cbStruct = sizeof(PROVDATA_SIP); + + provData->psPfns = WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_FUNCTIONS)); + if (!provData->psPfns) + goto oom; + provData->psPfns->cbStruct = sizeof(CRYPT_PROVIDER_FUNCTIONS); + ret = WintrustLoadFunctionPointers(actionID, provData->psPfns); + if (!ret) + { + err = GetLastError(); + goto error; + } + + data->hWVTStateData = (HANDLE)provData; + provData->pWintrustData = data; + if (hwnd == INVALID_HANDLE_VALUE) + provData->hWndParent = GetDesktopWindow(); + else + provData->hWndParent = hwnd; + provData->pgActionID = actionID; + WintrustGetRegPolicyFlags(&provData->dwRegPolicySettings); + + err = provData->psPfns->pfnInitialize(provData); + if (err) + goto done; + err = provData->psPfns->pfnObjectTrust(provData); + if (err) + goto done; + err = provData->psPfns->pfnSignatureTrust(provData); + if (err) + goto done; + err = provData->psPfns->pfnCertificateTrust(provData); + if (err) + goto done; + err = provData->psPfns->pfnFinalPolicy(provData); + goto done; + +oom: + err = ERROR_OUTOFMEMORY; +error: + if (provData) + { + WINTRUST_Free(provData->padwTrustStepErrors); + WINTRUST_Free(provData->pPDSip); + WINTRUST_Free(provData->psPfns); + WINTRUST_Free(provData); + } +done: + TRACE("returning %08x\n", err); + return err; +} + +static LONG WINTRUST_DefaultClose(HWND hwnd, GUID *actionID, + WINTRUST_DATA *data) +{ + DWORD err = ERROR_SUCCESS; + CRYPT_PROVIDER_DATA *provData = (CRYPT_PROVIDER_DATA *)data->hWVTStateData; + + TRACE("(%p, %s, %p)\n", hwnd, debugstr_guid(actionID), data); + + if (provData) + { + err = provData->psPfns->pfnCleanupPolicy(provData); + WINTRUST_Free(provData->padwTrustStepErrors); + WINTRUST_Free(provData->pPDSip); + WINTRUST_Free(provData->psPfns); + WINTRUST_Free(provData); + data->hWVTStateData = NULL; + } + TRACE("returning %08x\n", err); + return err; +} + +static LONG WINTRUST_DefaultVerifyAndClose(HWND hwnd, GUID *actionID, + WINTRUST_DATA *data) +{ + LONG err; + + TRACE("(%p, %s, %p)\n", hwnd, debugstr_guid(actionID), data); + + err = WINTRUST_DefaultVerify(hwnd, actionID, data); + WINTRUST_DefaultClose(hwnd, actionID, data); + TRACE("returning %08x\n", err); + return err; +} + +static LONG WINTRUST_PublishedSoftware(HWND hwnd, GUID *actionID, + WINTRUST_DATA *data) +{ + WINTRUST_DATA wintrust_data = { sizeof(wintrust_data), 0 }; + /* Undocumented: the published software action is passed a path, + * and pSIPClientData points to a WIN_TRUST_SUBJECT_FILE. + */ + LPCWSTR path = (LPCWSTR)data->pFile; + LPWIN_TRUST_SUBJECT_FILE subjectFile = + (LPWIN_TRUST_SUBJECT_FILE)data->pSIPClientData; + WINTRUST_FILE_INFO fileInfo = { sizeof(fileInfo), 0 }; + + TRACE("subjectFile->hFile: %p\n", subjectFile->hFile); + TRACE("subjectFile->lpPath: %s\n", debugstr_w(subjectFile->lpPath)); + fileInfo.pcwszFilePath = path; + fileInfo.hFile = subjectFile->hFile; + wintrust_data.pFile = &fileInfo; + wintrust_data.dwUnionChoice = WTD_CHOICE_FILE; + wintrust_data.dwUIChoice = WTD_UI_NONE; + + return WINTRUST_DefaultVerifyAndClose(hwnd, actionID, &wintrust_data); +} + /*********************************************************************** * WinVerifyTrust (WINTRUST.@) * @@ -84,8 +218,43 @@ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert ) */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) { - FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); - return ERROR_SUCCESS; + static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47, + 0x00,0xC0,0x4F,0xC2,0x95,0xEE } }; + static const GUID published_software = WIN_SPUB_ACTION_PUBLISHED_SOFTWARE; + static const GUID generic_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; + LONG err = ERROR_SUCCESS; + WINTRUST_DATA *actionData = (WINTRUST_DATA *)ActionData; + + TRACE("(%p, %s, %p)\n", hwnd, debugstr_guid(ActionID), ActionData); + + /* Support for known old-style callers: */ + if (IsEqualGUID(ActionID, &published_software)) + err = WINTRUST_PublishedSoftware(hwnd, ActionID, ActionData); + else + { + /* Check known actions to warn of possible problems */ + if (!IsEqualGUID(ActionID, &unknown) && + !IsEqualGUID(ActionID, &generic_verify_v2)) + WARN("unknown action %s, default behavior may not be right\n", + debugstr_guid(ActionID)); + switch (actionData->dwStateAction) + { + case WTD_STATEACTION_IGNORE: + err = WINTRUST_DefaultVerifyAndClose(hwnd, ActionID, ActionData); + break; + case WTD_STATEACTION_VERIFY: + err = WINTRUST_DefaultVerify(hwnd, ActionID, ActionData); + break; + case WTD_STATEACTION_CLOSE: + err = WINTRUST_DefaultClose(hwnd, ActionID, ActionData); + break; + default: + FIXME("unimplemented for %d\n", actionData->dwStateAction); + } + } + + TRACE("returning %08x\n", err); + return err; } /***********************************************************************

1 0

Juan Lang : wintrust: Don't prefer native version.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: ae8e8a0a57954f4091c147e91d9fc78d206bbc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8e8a0a57954f4091c147e91… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 12 09:01:49 2007 -0700 wintrust: Don't prefer native version. --- dlls/wintrust/wintrust_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index e4879b7..503fbd9 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -44,8 +44,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( inst ); break;

1 0

Andrew Talbot : avifil32: Fix some memory leaks.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 3d61013e7c8e6a6e7f4329868d220727627ab21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d61013e7c8e6a6e7f4329868… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Sep 12 17:52:18 2007 +0100 avifil32: Fix some memory leaks. --- dlls/avifil32/api.c | 2 +- dlls/avifil32/avifile.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 592bac3..2717bf0 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1913,7 +1913,7 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, hres = AVIStreamReadFormat(pInStreams[curStream], sInfo.dwStart, lpBuffer, &lBufferSize); if (FAILED(hres)) - return hres; + goto error; AVIStreamSetFormat(pOutStreams[curStream], sInfo.dwStart, lpBuffer, lBufferSize); diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 3ed6386..a23e326 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1018,14 +1018,15 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, lppc->peNew[n].peFlags = 0; } - if (mmioSeek(This->paf->hmmio, This->paf->dwNextFramePos, SEEK_SET) == -1) - return AVIERR_FILEWRITE; - if (mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK) - return AVIERR_FILEWRITE; - if (mmioWrite(This->paf->hmmio, (HPSTR)lppc, ck.cksize) != ck.cksize) - return AVIERR_FILEWRITE; - if (mmioAscend(This->paf->hmmio, &ck, 0) != S_OK) + if (mmioSeek(This->paf->hmmio, This->paf->dwNextFramePos, SEEK_SET) == -1 || + mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK || + mmioWrite(This->paf->hmmio, (HPSTR)lppc, ck.cksize) != ck.cksize || + mmioAscend(This->paf->hmmio, &ck, 0) != S_OK) + { + HeapFree(GetProcessHeap(), 0, lppc); return AVIERR_FILEWRITE; + } + This->paf->dwNextFramePos += ck.cksize + 2 * sizeof(DWORD); HeapFree(GetProcessHeap(), 0, lppc); @@ -1939,6 +1940,7 @@ static HRESULT AVIFILE_LoadIndex(const IAVIFileImpl *This, DWORD size, DWORD off HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pStream->nIdxFrames * sizeof(AVIINDEXENTRY)); if (pStream->idxFrames == NULL && pStream->nIdxFrames > 0) { pStream->nIdxFrames = 0; + HeapFree(GetProcessHeap(), 0, lp); return AVIERR_MEMORY; } }

1 0

Juan Lang : wintrust: Save signer cert so chain can be created.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 277ef05efb3431b4f1b34266d9d0e9283e1eb693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277ef05efb3431b4f1b34266d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 12 08:59:18 2007 -0700 wintrust: Save signer cert so chain can be created. --- dlls/wintrust/softpub.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 2d892b5..86ef84e 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -375,17 +375,22 @@ static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) if (certInfo) { - CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, signerIdx, - CMSG_VERIFY_SIGNER_CERT, NULL }; - - para.pvSigner = (LPVOID)CertGetSubjectCertificateFromStore( + PCCERT_CONTEXT subject = CertGetSubjectCertificateFromStore( data->pahStores[0], data->dwEncoding, certInfo); - if (para.pvSigner) + + if (subject) { + CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, + signerIdx, CMSG_VERIFY_SIGNER_CERT, (LPVOID)subject }; + ret = CryptMsgControl(data->hMsg, 0, CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); if (!ret) SetLastError(TRUST_E_CERT_SIGNATURE); + else + data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, + subject); + CertFreeCertificateContext(subject); } else {

1 0

Juan Lang : wintrust: Partially implement SoftpubAuthenticode.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 0463f99b73ea92a6532ae38e5bf00d633049228c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0463f99b73ea92a6532ae38e5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 12 08:59:44 2007 -0700 wintrust: Partially implement SoftpubAuthenticode. --- dlls/wintrust/softpub.c | 49 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 50 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 86ef84e..3676652 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -575,6 +575,55 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) return ret ? S_OK : S_FALSE; } +HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data) +{ + BOOL ret; + CERT_CHAIN_POLICY_STATUS policyStatus = { sizeof(policyStatus), 0 }; + + if (data->pWintrustData->dwUIChoice != WTD_UI_NONE) + FIXME("unimplemented for UI choice %d\n", + data->pWintrustData->dwUIChoice); + if (!data->csSigners) + { + ret = FALSE; + policyStatus.dwError = TRUST_E_NOSIGNATURE; + } + else + { + DWORD i; + + ret = TRUE; + for (i = 0; ret && i < data->csSigners; i++) + { + CERT_CHAIN_POLICY_PARA policyPara = { sizeof(policyPara), 0 }; + + if (data->dwRegPolicySettings & WTPF_TRUSTTEST) + policyPara.dwFlags |= CERT_CHAIN_POLICY_TRUST_TESTROOT_FLAG; + if (data->dwRegPolicySettings & WTPF_TESTCANBEVALID) + policyPara.dwFlags |= CERT_CHAIN_POLICY_ALLOW_TESTROOT_FLAG; + if (data->dwRegPolicySettings & WTPF_IGNOREEXPIRATION) + policyPara.dwFlags |= + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG | + CERT_CHAIN_POLICY_IGNORE_CTL_NOT_TIME_VALID_FLAG | + CERT_CHAIN_POLICY_IGNORE_NOT_TIME_NESTED_FLAG; + if (data->dwRegPolicySettings & WTPF_IGNOREREVOKATION) + policyPara.dwFlags |= + CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG | + CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG | + CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG | + CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG; + CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_AUTHENTICODE, + data->pasSigners[i].pChainContext, &policyPara, &policyStatus); + if (policyStatus.dwError != NO_ERROR) + ret = FALSE; + } + } + if (!ret) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_POLICYPROV] = + policyStatus.dwError; + return ret ? S_OK : S_FALSE; +} + HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) { DWORD i, j; diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index f260193..a28257d 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -56,7 +56,7 @@ @ stub OfficeCleanupPolicy @ stub OfficeInitializePolicy @ stub OpenPersonalTrustDBDialog -@ stub SoftpubAuthenticode +@ stdcall SoftpubAuthenticode(ptr) @ stdcall SoftpubCheckCert(ptr long long long) @ stdcall SoftpubCleanup(ptr) @ stub SoftpubDefCertInit

1 0

Alexandre Julliard : gdi32: Don' t store a DC pointer in the metafile devices.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: f9ebe5ab8fdf0485c269d78dd6897f714c579e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ebe5ab8fdf0485c269d78dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 12 20:23:03 2007 +0200 gdi32: Don't store a DC pointer in the metafile devices. --- dlls/gdi32/enhmfdrv/dc.c | 4 +++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 16 +++++++--------- dlls/gdi32/mfdrv/init.c | 20 +++++++++----------- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 74300b4..0115991 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -34,6 +34,7 @@ INT EMFDRV_SaveDC( PHYSDEV dev ) BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) { EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev; + DC *dc = get_dc_ptr( physDev->hdc ); EMRRESTOREDC emr; emr.emr.iType = EMR_RESTOREDC; @@ -42,10 +43,11 @@ BOOL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) if (level < 0) emr.iRelative = level; else - emr.iRelative = level - physDev->dc->saveLevel - 1; + emr.iRelative = level - dc->saveLevel - 1; EMFDRV_WriteRecord( dev, &emr.emr ); + release_dc_ptr( dc ); return TRUE; } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index b0d6bf0..b3e6064 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -33,7 +33,6 @@ typedef struct { HDC hdc; - DC *dc; ENHMETAHEADER *emh; /* Pointer to enhanced metafile header */ UINT handles_size, cur_handles; HGDIOBJ *handles; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index d272f75..f5c4562 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -159,10 +159,9 @@ static const DC_FUNCTIONS EMFDRV_Funcs = /********************************************************************** * EMFDRV_DeleteDC */ -static BOOL EMFDRV_DeleteDC( PHYSDEV dev ) +static BOOL EMFDRV_DeleteDC( DC *dc ) { - EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dev; - DC *dc = physDev->dc; + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE *)dc->physDev; UINT index; if (physDev->emh) HeapFree( GetProcessHeap(), 0, physDev->emh ); @@ -324,7 +323,6 @@ HDC WINAPI CreateEnhMetaFileW( } dc->physDev = (PHYSDEV)physDev; physDev->hdc = dc->hSelf; - physDev->dc = dc; if(description) { /* App name\0Title\0\0 */ length = lstrlenW(description); @@ -405,11 +403,11 @@ HDC WINAPI CreateEnhMetaFileW( { if ((hFile = CreateFileW(filename, GENERIC_WRITE | GENERIC_READ, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { - EMFDRV_DeleteDC( dc->physDev ); + EMFDRV_DeleteDC( dc ); return 0; } if (!WriteFile( hFile, (LPSTR)physDev->emh, size, NULL, NULL )) { - EMFDRV_DeleteDC( dc->physDev ); + EMFDRV_DeleteDC( dc ); return 0; } physDev->hFile = hFile; @@ -479,7 +477,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) { CloseHandle( physDev->hFile ); - EMFDRV_DeleteDC( dc->physDev ); + EMFDRV_DeleteDC( dc ); return 0; } @@ -487,7 +485,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ sizeof(*physDev->emh), NULL, NULL)) { CloseHandle( physDev->hFile ); - EMFDRV_DeleteDC( dc->physDev ); + EMFDRV_DeleteDC( dc ); return 0; } HeapFree( GetProcessHeap(), 0, physDev->emh ); @@ -502,6 +500,6 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ hmf = EMF_Create_HENHMETAFILE( physDev->emh, (physDev->hFile != 0) ); physDev->emh = NULL; /* So it won't be deleted */ - EMFDRV_DeleteDC( dc->physDev ); + EMFDRV_DeleteDC( dc ); return hmf; } diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a73c701..aa10e96 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -175,7 +175,6 @@ static DC *MFDRV_AllocMetaFile(void) } dc->physDev = (PHYSDEV)physDev; physDev->hdc = dc->hSelf; - physDev->dc = dc; if (!(physDev->mh = HeapAlloc( GetProcessHeap(), 0, sizeof(*physDev->mh) ))) { @@ -204,10 +203,9 @@ static DC *MFDRV_AllocMetaFile(void) /********************************************************************** * MFDRV_DeleteDC */ -static BOOL MFDRV_DeleteDC( PHYSDEV dev ) +static BOOL MFDRV_DeleteDC( DC *dc ) { - METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dev; - DC *dc = physDev->dc; + METAFILEDRV_PDEVICE *physDev = (METAFILEDRV_PDEVICE *)dc->physDev; DWORD index; HeapFree( GetProcessHeap(), 0, physDev->mh ); @@ -251,12 +249,12 @@ HDC WINAPI CreateMetaFileW( LPCWSTR filename ) physDev->mh->mtType = METAFILE_DISK; if ((hFile = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) { - MFDRV_DeleteDC( dc->physDev ); + MFDRV_DeleteDC( dc ); return 0; } if (!WriteFile( hFile, physDev->mh, sizeof(*physDev->mh), NULL, NULL )) { - MFDRV_DeleteDC( dc->physDev ); + MFDRV_DeleteDC( dc ); return 0; } physDev->hFile = hFile; @@ -328,21 +326,21 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) if (!MFDRV_MetaParam0(dc->physDev, META_EOF)) { - MFDRV_DeleteDC( dc->physDev ); + MFDRV_DeleteDC( dc ); return 0; } if (physDev->mh->mtType == METAFILE_DISK) /* disk based metafile */ { if (SetFilePointer(physDev->hFile, 0, NULL, FILE_BEGIN) != 0) { - MFDRV_DeleteDC( dc->physDev ); + MFDRV_DeleteDC( dc ); return 0; } physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ if (!WriteFile(physDev->hFile, (LPSTR)physDev->mh, sizeof(*physDev->mh), NULL, NULL)) { - MFDRV_DeleteDC( dc->physDev ); + MFDRV_DeleteDC( dc ); return 0; } CloseHandle(physDev->hFile); @@ -394,7 +392,7 @@ HMETAFILE16 WINAPI CloseMetaFile16(HDC16 hdc) hmf = MF_Create_HMETAFILE16( physDev->mh ); physDev->mh = NULL; /* So it won't be deleted */ - MFDRV_DeleteDC( dc->physDev ); + MFDRV_DeleteDC( dc ); return hmf; } @@ -423,7 +421,7 @@ HMETAFILE WINAPI CloseMetaFile(HDC hdc) hmf = MF_Create_HMETAFILE( physDev->mh ); physDev->mh = NULL; /* So it won't be deleted */ - MFDRV_DeleteDC( dc->physDev ); + MFDRV_DeleteDC( dc ); return hmf; } diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 00cb8d4..df9032f 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -33,7 +33,6 @@ typedef struct { HDC hdc; - DC *dc; METAHEADER *mh; /* Pointer to metafile header */ UINT handles_size, cur_handles; HGDIOBJ *handles;

1 0

Alexandre Julliard : kernel32: GetTempPath should try the USERPROFILE and the Windows directory too.
by Alexandre Julliard Sept. 13, 2007

Sept. 13, 2007

Module: wine Branch: master Commit: 0a134e9e3f614dc88341c3c79f6a939216a76583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a134e9e3f614dc88341c3c79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 12 16:52:59 2007 +0200 kernel32: GetTempPath should try the USERPROFILE and the Windows directory too. --- dlls/kernel32/path.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 7932df0..7681880 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -577,15 +577,17 @@ DWORD WINAPI GetTempPathW( DWORD count, LPWSTR path ) { static const WCHAR tmp[] = { 'T', 'M', 'P', 0 }; static const WCHAR temp[] = { 'T', 'E', 'M', 'P', 0 }; + static const WCHAR userprofile[] = { 'U','S','E','R','P','R','O','F','I','L','E',0 }; WCHAR tmp_path[MAX_PATH]; UINT ret; TRACE("%u,%p\n", count, path); - if (!(ret = GetEnvironmentVariableW( tmp, tmp_path, MAX_PATH ))) - if (!(ret = GetEnvironmentVariableW( temp, tmp_path, MAX_PATH ))) - if (!(ret = GetCurrentDirectoryW( MAX_PATH, tmp_path ))) - return 0; + if (!(ret = GetEnvironmentVariableW( tmp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( temp, tmp_path, MAX_PATH )) && + !(ret = GetEnvironmentVariableW( userprofile, tmp_path, MAX_PATH )) && + !(ret = GetWindowsDirectoryW( tmp_path, MAX_PATH ))) + return 0; if (ret > MAX_PATH) {

1 0

Lionel Debroux : advapi32: Replace SERV_free by HeapFree.
by Alexandre Julliard Sept. 12, 2007

Sept. 12, 2007

Module: wine Branch: master Commit: 82ef8d72397592178dc873f4993b20c8e7b79a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82ef8d72397592178dc873f49… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Thu Sep 6 11:32:20 2007 +0200 advapi32: Replace SERV_free by HeapFree. --- dlls/advapi32/service.c | 61 ++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index fbc888d..a698f11 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -197,7 +197,9 @@ static void sc_handle_destroy_service(struct sc_handle *handle) } /****************************************************************************** - * String management functions + * String management functions (same behaviour as strdup) + * NOTE: the caller of those functions is responsible for calling HeapFree + * in order to release the memory allocated by those functions. */ static inline LPWSTR SERV_dup( LPCSTR str ) { @@ -231,11 +233,6 @@ static inline LPWSTR SERV_dupmulti(LPCSTR str) return wstr; } -static inline VOID SERV_free( LPWSTR wstr ) -{ - HeapFree( GetProcessHeap(), 0, wstr ); -} - /****************************************************************************** * registry access functions and data */ @@ -345,7 +342,7 @@ static HANDLE service_open_pipe(LPCWSTR service) if (GetLastError() != ERROR_PIPE_BUSY) break; } while (WaitNamedPipeW(szPipe, NMPWAIT_WAIT_FOREVER)); - SERV_free(szPipe); + HeapFree(GetProcessHeap(), 0, szPipe); return handle; } @@ -366,7 +363,7 @@ static HANDLE service_get_event_handle(LPCWSTR service) strcpyW(name, prefix); strcatW(name, service); handle = CreateEventW(NULL, TRUE, FALSE, name); - SERV_free(name); + HeapFree(GetProcessHeap(), 0, name); return handle; } @@ -458,7 +455,7 @@ static BOOL service_handle_start(HANDLE pipe, service_data *service, DWORD count goto end; } - SERV_free(service->args); + HeapFree(GetProcessHeap(), 0, service->args); service->args = args; args = NULL; service->thread = CreateThread( NULL, 0, service_thread, @@ -688,7 +685,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) name = service_get_pipe_name(service->name); pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL ); - SERV_free(name); + HeapFree(GetProcessHeap(), 0, name); /* let the process who started us know we've tried to create a pipe */ event = service_get_event_handle(service->name); @@ -921,7 +918,7 @@ RegisterServiceCtrlHandlerA( LPCSTR lpServiceName, LPHANDLER_FUNCTION lpfHandler lpServiceNameW = SERV_dup(lpServiceName); ret = RegisterServiceCtrlHandlerW( lpServiceNameW, lpfHandler ); - SERV_free(lpServiceNameW); + HeapFree(GetProcessHeap(), 0, lpServiceNameW); return ret; } @@ -1011,8 +1008,8 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, lpMachineNameW = SERV_dup(lpMachineName); lpDatabaseNameW = SERV_dup(lpDatabaseName); ret = OpenSCManagerW(lpMachineNameW, lpDatabaseNameW, dwDesiredAccess); - SERV_free(lpDatabaseNameW); - SERV_free(lpMachineNameW); + HeapFree(GetProcessHeap(), 0, lpDatabaseNameW); + HeapFree(GetProcessHeap(), 0, lpMachineNameW); return ret; } @@ -1195,7 +1192,7 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, lpServiceNameW = SERV_dup(lpServiceName); ret = OpenServiceW( hSCManager, lpServiceNameW, dwDesiredAccess); - SERV_free(lpServiceNameW); + HeapFree(GetProcessHeap(), 0, lpServiceNameW); return ret; } @@ -1494,13 +1491,13 @@ CreateServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, lpBinaryPathNameW, lpLoadOrderGroupW, lpdwTagId, lpDependenciesW, lpServiceStartNameW, lpPasswordW ); - SERV_free( lpServiceNameW ); - SERV_free( lpDisplayNameW ); - SERV_free( lpBinaryPathNameW ); - SERV_free( lpLoadOrderGroupW ); - SERV_free( lpDependenciesW ); - SERV_free( lpServiceStartNameW ); - SERV_free( lpPasswordW ); + HeapFree( GetProcessHeap(), 0, lpServiceNameW ); + HeapFree( GetProcessHeap(), 0, lpDisplayNameW ); + HeapFree( GetProcessHeap(), 0, lpBinaryPathNameW ); + HeapFree( GetProcessHeap(), 0, lpLoadOrderGroupW ); + HeapFree( GetProcessHeap(), 0, lpDependenciesW ); + HeapFree( GetProcessHeap(), 0, lpServiceStartNameW ); + HeapFree( GetProcessHeap(), 0, lpPasswordW ); return r; } @@ -1591,7 +1588,7 @@ BOOL WINAPI StartServiceA( SC_HANDLE hService, DWORD dwNumServiceArgs, if (dwNumServiceArgs) { for(i=0; i<dwNumServiceArgs; i++) - SERV_free(lpwstr[i]); + HeapFree(GetProcessHeap(), 0, lpwstr[i]); HeapFree(GetProcessHeap(), 0, lpwstr); } @@ -2270,7 +2267,7 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, *lpcchBuffer = size; HeapFree(GetProcessHeap(), 0, lpDisplayNameW); - SERV_free(lpServiceNameW); + HeapFree(GetProcessHeap(), 0, lpServiceNameW); SetLastError(GLE); return ret; @@ -2443,12 +2440,12 @@ BOOL WINAPI ChangeServiceConfigA( SC_HANDLE hService, DWORD dwServiceType, wLoadOrderGroup, lpdwTagId, wDependencies, wServiceStartName, wPassword, wDisplayName); - SERV_free( wBinaryPathName ); - SERV_free( wLoadOrderGroup ); - SERV_free( wDependencies ); - SERV_free( wServiceStartName ); - SERV_free( wPassword ); - SERV_free( wDisplayName ); + HeapFree( GetProcessHeap(), 0, wBinaryPathName ); + HeapFree( GetProcessHeap(), 0, wLoadOrderGroup ); + HeapFree( GetProcessHeap(), 0, wDependencies ); + HeapFree( GetProcessHeap(), 0, wServiceStartName ); + HeapFree( GetProcessHeap(), 0, wPassword ); + HeapFree( GetProcessHeap(), 0, wDisplayName ); return r; } @@ -2472,7 +2469,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, r = ChangeServiceConfig2W( hService, dwInfoLevel, &sdw ); - SERV_free( sdw.lpDescription ); + HeapFree( GetProcessHeap(), 0, sdw.lpDescription ); } else if (dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { @@ -2487,8 +2484,8 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, r = ChangeServiceConfig2W( hService, dwInfoLevel, &faw ); - SERV_free( faw.lpRebootMsg ); - SERV_free( faw.lpCommand ); + HeapFree( GetProcessHeap(), 0, faw.lpRebootMsg ); + HeapFree( GetProcessHeap(), 0, faw.lpCommand ); } else SetLastError( ERROR_INVALID_PARAMETER );

1 0