November 2009 - Wine-commits

Juan Lang : crypt32: Set CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS when a certificate' s name constraints are met.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: c4b997bab3d530339c89370cda337f8b3e415129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b997bab3d530339c89370cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 12 17:05:07 2009 -0800 crypt32: Set CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS when a certificate's name constraints are met. --- dlls/crypt32/chain.c | 8 ++++++-- dlls/crypt32/tests/chain.c | 10 ++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index eb6d757..17471d5 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -815,8 +815,12 @@ static void CRYPT_CheckChainNameConstraints(PCERT_SIMPLE_CHAIN chain) CRYPT_CheckNameConstraints(nameConstraints, chain->rgpElement[j]->pCertContext->pCertInfo, &errorStatus); - chain->rgpElement[i]->TrustStatus.dwErrorStatus |= - errorStatus; + if (errorStatus) + chain->rgpElement[i]->TrustStatus.dwErrorStatus |= + errorStatus; + else + chain->rgpElement[i]->TrustStatus.dwInfoStatus |= + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS; } } } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index be3a0bd..e48dba3 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2927,7 +2927,8 @@ static CONST_DATA_BLOB chain19[] = { static const CERT_TRUST_STATUS elementStatus19[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus19[] = { { sizeof(elementStatus19) / sizeof(elementStatus19[0]), elementStatus19 }, @@ -2951,7 +2952,8 @@ static CONST_DATA_BLOB chain21[] = { static const CERT_TRUST_STATUS elementStatus21[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | + CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, }; static const SimpleChainStatusCheck simpleStatus21[] = { { sizeof(elementStatus21) / sizeof(elementStatus21[0]), elementStatus21 }, @@ -3257,7 +3259,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus19 }, 0 }, /* Older versions of crypt32 do not set @@ -3278,7 +3280,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, 1, simpleStatus21 }, 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 },

1 0

Juan Lang : crypt32: Update a comment.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: f6c482467593ed936996706ddc18a6d4f0737312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c482467593ed936996706dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 08:33:34 2009 -0800 crypt32: Update a comment. --- dlls/crypt32/chain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 17471d5..c508c25 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2382,8 +2382,8 @@ static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, * in section 4.2.1.6: * "Multiple name forms, and multiple instances of each name form, * MAY be included." - * It doesn't specify the behavior in such cases, but common usage is - * to accept a certificate if any name matches. + * It doesn't specify the behavior in such cases, but both RFC 2818 + * and RFC 2595 explicitly accept a certificate if any name matches. */ for (i = 0; !matches && i < subjectName->cAltEntry; i++) {

1 0

Detlef Riekenberg : commdlg: Fix a copy&paste typo.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: c49606e8a04a6bda2f0822ef7d57b785516ddf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49606e8a04a6bda2f0822ef7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 13 18:08:56 2009 +0100 commdlg: Fix a copy&paste typo. --- dlls/commdlg.dll16/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/commdlg.dll16/printdlg.c b/dlls/commdlg.dll16/printdlg.c index a01411f..64bb395 100644 --- a/dlls/commdlg.dll16/printdlg.c +++ b/dlls/commdlg.dll16/printdlg.c @@ -126,7 +126,7 @@ BOOL16 WINAPI PrintDlg16( LPPRINTDLG16 lppd ) if (lppd->Flags & PD_ENABLEPRINTHOOK) FIXME( "custom print hook %p no longer supported\n", lppd->lpfnPrintHook ); if (lppd->Flags & PD_ENABLESETUPHOOK) - FIXME( "custom print hook %p no longer supported\n", lppd->lpfnSetupHook ); + FIXME( "custom setup hook %p no longer supported\n", lppd->lpfnSetupHook ); if ((ret = PrintDlgA( &pd32 ))) {

1 0

Juan Lang : crypt32: Fix more test failures.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 8adc75b3ec630219f609913f1ae943f09626c421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adc75b3ec630219f609913f1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 13 10:58:50 2009 -0800 crypt32: Fix more test failures. --- dlls/crypt32/tests/chain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e48dba3..bfdf203 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3034,8 +3034,7 @@ static const SimpleChainStatusCheck simpleStatus27[] = { static const CERT_TRUST_STATUS elementStatus27Broken[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, - CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER | - CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus27Broken[] = { { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), @@ -3408,7 +3407,8 @@ static ChainCheck chainCheckEmbeddedNullBroken = { { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + 0 }, 1, simpleStatus27Broken }, 0 };

1 0

Aurimas Fišeras : mshtml: Update Lithuanain translation.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: fdd99387544e1341649aec7cb09ddae707ab80b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd99387544e1341649aec7cb… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Nov 13 22:03:56 2009 +0200 mshtml: Update Lithuanain translation. --- dlls/mshtml/Lt.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/Lt.rc b/dlls/mshtml/Lt.rc index 9883bb4..8f7e772 100644 --- a/dlls/mshtml/Lt.rc +++ b/dlls/mshtml/Lt.rc @@ -31,18 +31,18 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "Įdiegiama..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 105 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wine Gecko diegimo programa" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine nepavyko rasti Gecko paketo reikalingo programoms įterpiančioms HTML " \ + "teisingai veikti. Wine gali automatiškai atsiųsti ir įdiegti šį paketą.\n\n" \ + "Pastaba: rekomenduojama naudoti distribucijos paketus. Daugiau informacijos http://wiki.winehq.org/Gecko.", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT - CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP + CONTROL "Eiga", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 60, 240, 12 + DEFPUSHBUTTON "&Įdiegti", ID_DWL_INSTALL, 200, 80, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Atsisakyti", IDCANCEL, 140, 80, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65

1 0

André Hentschel : mshtml: Update German Gecko installer dialog.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 79307e596ee0c0e1cf9cbd9e0b1f11f80ad39f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79307e596ee0c0e1cf9cbd9e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 13 22:27:23 2009 +0100 mshtml: Update German Gecko installer dialog. --- dlls/mshtml/De.rc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 2b58b41..50d519d 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -37,9 +37,11 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Wine-Gecko-Installation" FONT 8, "MS Shell Dlg" { - LTEXT "Wine could not find a Gecko package which is needed for applications embedding HTML " \ - "to work correctly. Wine can automatically download and install it for you.\n\n" \ - "Note: it's recommended to use distro packages instead. See http://wiki.winehq.org/Gecko for details.", + LTEXT "Wine kann das Gecko-Paket nicht finden. Es wird von Programmen mit eingebettetem HTML benötigt, " \ + "damit diese richtig funktionieren.\n" \ + "Wine kann das Paket für Sie herunterladen und installieren.\n\n" \ + "Hinweis: Es wird empfohlen das Paket ihrer Distribution zu verwenden. " \ + "Weitere Hinweise finden Sie unter http://wiki.winehq.org/Gecko", ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT CONTROL "Fortschritt", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP

1 0

Vincent Povirk : ole32: Rename propertyType to stgType.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 2203264bfa40ea3ad532090fdd40b0196fb2e303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2203264bfa40ea3ad532090fd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 12:34:05 2009 -0600 ole32: Rename propertyType to stgType. --- dlls/ole32/storage32.c | 22 +++++++++++----------- dlls/ole32/storage32.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 898695c..f6f2163 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -451,7 +451,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( * If it was found, construct the stream object and return a pointer to it. */ if ( (foundPropertyIndex!=DIRENTRY_NULL) && - (currentProperty.propertyType==STGTY_STREAM) ) + (currentProperty.stgType==STGTY_STREAM) ) { newStream = StgStreamImpl_Construct(This, grfMode, foundPropertyIndex); @@ -556,7 +556,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( &currentProperty); if ( (foundPropertyIndex!=DIRENTRY_NULL) && - (currentProperty.propertyType==STGTY_STORAGE) ) + (currentProperty.stgType==STGTY_STORAGE) ) { newStorage = StorageInternalImpl_Construct( This->ancestorStorage, @@ -858,7 +858,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( strcpyW(newStreamProperty.name, pwcsName); - newStreamProperty.propertyType = STGTY_STREAM; + newStreamProperty.stgType = STGTY_STREAM; newStreamProperty.startingBlock = BLOCK_END_OF_CHAIN; newStreamProperty.size.u.LowPart = 0; newStreamProperty.size.u.HighPart = 0; @@ -1041,7 +1041,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( strcpyW(newProperty.name, pwcsName); - newProperty.propertyType = STGTY_STORAGE; + newProperty.stgType = STGTY_STORAGE; newProperty.startingBlock = BLOCK_END_OF_CHAIN; newProperty.size.u.LowPart = 0; newProperty.size.u.HighPart = 0; @@ -1744,14 +1744,14 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( return STG_E_FILENOTFOUND; } - if ( propertyToDelete.propertyType == STGTY_STORAGE ) + if ( propertyToDelete.stgType == STGTY_STORAGE ) { hr = deleteStorageProperty( This, foundPropertyIndexToDelete, propertyToDelete); } - else if ( propertyToDelete.propertyType == STGTY_STREAM ) + else if ( propertyToDelete.stgType == STGTY_STREAM ) { hr = deleteStreamProperty( This, @@ -2269,7 +2269,7 @@ static HRESULT StorageImpl_Construct( MultiByteToWideChar( CP_ACP, 0, rootPropertyName, -1, rootProp.name, sizeof(rootProp.name)/sizeof(WCHAR) ); rootProp.sizeOfNameString = (strlenW(rootProp.name)+1) * sizeof(WCHAR); - rootProp.propertyType = STGTY_ROOT; + rootProp.stgType = STGTY_ROOT; rootProp.leftChild = DIRENTRY_NULL; rootProp.rightChild = DIRENTRY_NULL; rootProp.dirRootEntry = DIRENTRY_NULL; @@ -2295,7 +2295,7 @@ static HRESULT StorageImpl_Construct( if (readSuccessful) { if ( (currentProperty.sizeOfNameString != 0 ) && - (currentProperty.propertyType == STGTY_ROOT) ) + (currentProperty.stgType == STGTY_ROOT) ) { This->base.rootPropertySetIndex = currentPropertyIndex; } @@ -3054,7 +3054,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) newData->name, DIRENTRY_NAME_BUFFER_LEN ); - memcpy(buffer + OFFSET_PS_STGTYPE, &newData->propertyType, 1); + memcpy(buffer + OFFSET_PS_STGTYPE, &newData->stgType, 1); StorageUtl_WriteWord( buffer, @@ -3140,7 +3140,7 @@ BOOL StorageImpl_ReadDirEntry( DIRENTRY_NAME_BUFFER_LEN ); TRACE("storage name: %s\n", debugstr_w(buffer->name)); - memcpy(&buffer->propertyType, currentProperty + OFFSET_PS_STGTYPE, 1); + memcpy(&buffer->stgType, currentProperty + OFFSET_PS_STGTYPE, 1); StorageUtl_ReadWord( currentProperty, @@ -4072,7 +4072,7 @@ void StorageUtl_CopyDirEntryToSTATSTG( strcpyW(destination->pwcsName, source->name); } - switch (source->propertyType) + switch (source->stgType) { case STGTY_STORAGE: case STGTY_ROOT: diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index c740747..d23714e 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -129,7 +129,7 @@ struct DirEntry { WCHAR name[DIRENTRY_NAME_MAX_LEN]; WORD sizeOfNameString; - BYTE propertyType; + BYTE stgType; ULONG leftChild; ULONG rightChild; ULONG dirRootEntry;

1 0

Vincent Povirk : ole32: Rename propertyUniqueID to clsid.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: cf1242e03b24c152cc122279649edf369845011c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1242e03b24c152cc1222796… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:10:17 2009 -0600 ole32: Rename propertyUniqueID to clsid. --- dlls/ole32/storage32.c | 8 ++++---- dlls/ole32/storage32.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f6f2163..a834a46 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -930,7 +930,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( &curProperty); if (success) { - curProperty.propertyUniqueID = *clsid; + curProperty.clsid = *clsid; success = StorageImpl_WriteDirEntry(This->ancestorStorage, This->rootPropertySetIndex, @@ -3079,7 +3079,7 @@ void UpdateRawDirEntry(BYTE *buffer, const DirEntry *newData) StorageUtl_WriteGUID( buffer, OFFSET_PS_GUID, - &newData->propertyUniqueID); + &newData->clsid); StorageUtl_WriteDWord( buffer, @@ -3165,7 +3165,7 @@ BOOL StorageImpl_ReadDirEntry( StorageUtl_ReadGUID( currentProperty, OFFSET_PS_GUID, - &buffer->propertyUniqueID); + &buffer->clsid); StorageUtl_ReadDWord( currentProperty, @@ -4094,7 +4094,7 @@ void StorageUtl_CopyDirEntryToSTATSTG( */ destination->grfMode = 0; destination->grfLocksSupported = 0; - destination->clsid = source->propertyUniqueID; + destination->clsid = source->clsid; destination->grfStateBits = 0; destination->reserved = 0; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index d23714e..2a9dd1f 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -133,7 +133,7 @@ struct DirEntry ULONG leftChild; ULONG rightChild; ULONG dirRootEntry; - GUID propertyUniqueID; + GUID clsid; FILETIME ctime; FILETIME mtime; ULONG startingBlock;

1 0

Vincent Povirk : ole32: Rename rootPropertySetIndex to storageDirEntry.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: 4ba13cb9a725422a7cfd1ce93810b22551f91375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba13cb9a725422a7cfd1ce93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:19:37 2009 -0600 ole32: Rename rootPropertySetIndex to storageDirEntry. Not only is it not related to property set storages, it's also not the root of the tree that's used to search for elements. --- dlls/ole32/storage32.c | 50 ++++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 5 +-- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a834a46..f2d856b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -443,7 +443,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( */ foundPropertyIndex = findElement( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -551,7 +551,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( foundPropertyIndex = findElement( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -610,7 +610,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( newEnum = IEnumSTATSTGImpl_Construct( This->ancestorStorage, - This->rootPropertySetIndex); + This->storageDirEntry); if (newEnum!=0) { @@ -652,7 +652,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( readSuccessful = StorageImpl_ReadDirEntry( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, &curProperty); if (readSuccessful) @@ -700,7 +700,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( iface, debugstr_w(pwcsOldName), debugstr_w(pwcsNewName)); foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsNewName, &currentProperty); @@ -716,14 +716,14 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( * Search for the old element name */ foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsOldName, &currentProperty); if (foundPropertyIndex != DIRENTRY_NULL) { /* Remove the element from its current position in the tree */ - removeFromTree(This->ancestorStorage, This->rootPropertySetIndex, + removeFromTree(This->ancestorStorage, This->storageDirEntry, foundPropertyIndex); /* Change the name of the element */ @@ -733,7 +733,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( &currentProperty); /* Insert the element in a new position in the tree */ - insertIntoTree(This->ancestorStorage, This->rootPropertySetIndex, + insertIntoTree(This->ancestorStorage, This->storageDirEntry, foundPropertyIndex); } else @@ -812,7 +812,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( *ppstm = 0; foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -884,7 +884,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( */ insertIntoTree( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, newPropertyIndex); /* @@ -926,14 +926,14 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( TRACE("(%p, %p)\n", iface, clsid); success = StorageImpl_ReadDirEntry(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, &curProperty); if (success) { curProperty.clsid = *clsid; success = StorageImpl_WriteDirEntry(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, &curProperty); if (success) hRes = S_OK; @@ -998,7 +998,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( } foundPropertyIndex = findElement(This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &currentProperty); @@ -1067,7 +1067,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( */ insertIntoTree( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, newPropertyIndex); /* @@ -1735,7 +1735,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( foundPropertyIndexToDelete = findElement( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, pwcsName, &propertyToDelete); @@ -1767,7 +1767,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( */ hr = removeFromTree( This->ancestorStorage, - This->rootPropertySetIndex, + This->storageDirEntry, foundPropertyIndexToDelete); /* @@ -2297,13 +2297,13 @@ static HRESULT StorageImpl_Construct( if ( (currentProperty.sizeOfNameString != 0 ) && (currentProperty.stgType == STGTY_ROOT) ) { - This->base.rootPropertySetIndex = currentPropertyIndex; + This->base.storageDirEntry = currentPropertyIndex; } } currentPropertyIndex++; - } while (readSuccessful && (This->base.rootPropertySetIndex == DIRENTRY_NULL) ); + } while (readSuccessful && (This->base.storageDirEntry == DIRENTRY_NULL) ); if (!readSuccessful) { @@ -2315,7 +2315,7 @@ static HRESULT StorageImpl_Construct( * Create the block chain abstraction for the small block root chain. */ if(!(This->smallBlockRootChain = - BlockChainStream_Construct(This, NULL, This->base.rootPropertySetIndex))) + BlockChainStream_Construct(This, NULL, This->base.storageDirEntry))) return STG_E_READFAULT; return hr; @@ -3130,7 +3130,7 @@ BOOL StorageImpl_ReadDirEntry( if (SUCCEEDED(readRes)) { /* replace the name of root entry (often "Root Entry") by the file name */ - WCHAR *propName = (index == This->base.rootPropertySetIndex) ? + WCHAR *propName = (index == This->base.storageDirEntry) ? This->filename : (WCHAR *)currentProperty+OFFSET_PS_NAME; memset(buffer->name, 0, sizeof(buffer->name)); @@ -3964,7 +3964,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct( /* * Keep the index of the root property set for this storage, */ - newStorage->base.rootPropertySetIndex = rootPropertyIndex; + newStorage->base.storageDirEntry = rootPropertyIndex; return newStorage; } @@ -4900,7 +4900,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_ReadDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); rootProp.startingBlock = sbStartIndex; @@ -4909,7 +4909,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_WriteDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); } else @@ -4930,7 +4930,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_ReadDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); if (rootProp.size.u.LowPart < @@ -4944,7 +4944,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( StorageImpl_WriteDirEntry( This->parentStorage, - This->parentStorage->base.rootPropertySetIndex, + This->parentStorage->base.storageDirEntry, &rootProp); } } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 2a9dd1f..cc5d267 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -207,10 +207,9 @@ struct StorageBaseImpl StorageImpl* ancestorStorage; /* - * Index of the property for the root of - * this storage + * Index of the directory entry of this storage */ - ULONG rootPropertySetIndex; + ULONG storageDirEntry; /* * virtual Destructor method.

1 0

Vincent Povirk : ole32: Rename stream.ownerProperty to dirEntry.
by Alexandre Julliard 16 Nov '09

16 Nov '09

Module: wine Branch: master Commit: df960e27c40875911c42532270d09393f7836afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=df960e27c40875911c4253227… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 13:25:10 2009 -0600 ole32: Rename stream.ownerProperty to dirEntry. --- dlls/ole32/stg_stream.c | 24 ++++++++++++------------ dlls/ole32/storage32.c | 2 +- dlls/ole32/storage32.h | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 4cc114a..e3ca9a1 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -209,7 +209,7 @@ static void StgStreamImpl_OpenBlockChain( * Read the information from the property. */ readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); if (readSuccessful) @@ -233,14 +233,14 @@ static void StgStreamImpl_OpenBlockChain( This->smallBlockChain = SmallBlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } else { This->bigBlockChain = BlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } } } @@ -591,14 +591,14 @@ static HRESULT WINAPI StgStreamImpl_SetSize( This->smallBlockChain = SmallBlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } else { This->bigBlockChain = BlockChainStream_Construct( This->parentStorage->ancestorStorage, NULL, - This->ownerProperty); + This->dirEntry); } } @@ -606,7 +606,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( * Read this stream's property to see if it's small blocks or big blocks */ Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); /* * Determine if we have to switch from small to big blocks or vice versa @@ -651,7 +651,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( * Write the new information about this stream to the property */ Success = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); curProperty.size.u.HighPart = libNewSize.u.HighPart; @@ -660,7 +660,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( if (Success) { StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); } @@ -853,7 +853,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( * Read the information from the property. */ readSuccessful = StorageImpl_ReadDirEntry(This->parentStorage->ancestorStorage, - This->ownerProperty, + This->dirEntry, &curProperty); if (readSuccessful) @@ -910,7 +910,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( if ( ppstm == 0 ) return STG_E_INVALIDPOINTER; - new_stream = StgStreamImpl_Construct (This->parentStorage, This->grfMode, This->ownerProperty); + new_stream = StgStreamImpl_Construct (This->parentStorage, This->grfMode, This->dirEntry); if (!new_stream) return STG_E_INSUFFICIENTMEMORY; /* Currently the only reason for new_stream=0 */ @@ -962,7 +962,7 @@ static const IStreamVtbl StgStreamImpl_Vtbl = StgStreamImpl* StgStreamImpl_Construct( StorageBaseImpl* parentStorage, DWORD grfMode, - ULONG ownerProperty) + ULONG dirEntry) { StgStreamImpl* newStream; @@ -991,7 +991,7 @@ StgStreamImpl* StgStreamImpl_Construct( */ newStream->grfMode = grfMode; - newStream->ownerProperty = ownerProperty; + newStream->dirEntry = dirEntry; /* * Start the stream at the beginning. diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f2d856b..0bff0f4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -827,7 +827,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry) { - if (strm->ownerProperty == foundPropertyIndex) + if (strm->dirEntry == foundPropertyIndex) { TRACE("Stream deleted %p\n", strm); strm->parentStorage = NULL; diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index cc5d267..566e541 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -352,9 +352,9 @@ struct StgStreamImpl DWORD grfMode; /* - * Index of the property that owns (points to) this stream. + * Index of the directory entry that owns (points to) this stream. */ - ULONG ownerProperty; + ULONG dirEntry; /* * Helper variable that contains the size of the stream @@ -381,7 +381,7 @@ struct StgStreamImpl StgStreamImpl* StgStreamImpl_Construct( StorageBaseImpl* parentStorage, DWORD grfMode, - ULONG ownerProperty); + ULONG dirEntry); /******************************************************************************

1 0