Commit 08303391 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

ole32: Simplify storage root entry name initialization.

parent 7b373edb
...@@ -65,8 +65,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); ...@@ -65,8 +65,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage);
static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1};
static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}; static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d};
static const char rootEntryName[] = "Root Entry";
/**************************************************************************** /****************************************************************************
* Storage32InternalImpl definitions. * Storage32InternalImpl definitions.
* *
...@@ -2874,14 +2872,14 @@ static HRESULT StorageImpl_Construct( ...@@ -2874,14 +2872,14 @@ static HRESULT StorageImpl_Construct(
*/ */
if (create) if (create)
{ {
static const WCHAR rootentryW[] = {'R','o','o','t',' ','E','n','t','r','y',0};
DirEntry rootEntry; DirEntry rootEntry;
/* /*
* Initialize the directory table * Initialize the directory table
*/ */
memset(&rootEntry, 0, sizeof(rootEntry)); memset(&rootEntry, 0, sizeof(rootEntry));
MultiByteToWideChar( CP_ACP, 0, rootEntryName, -1, rootEntry.name, strcpyW(rootEntry.name, rootentryW);
sizeof(rootEntry.name)/sizeof(WCHAR) ); rootEntry.sizeOfNameString = sizeof(rootentryW);
rootEntry.sizeOfNameString = (strlenW(rootEntry.name)+1) * sizeof(WCHAR);
rootEntry.stgType = STGTY_ROOT; rootEntry.stgType = STGTY_ROOT;
rootEntry.leftChild = DIRENTRY_NULL; rootEntry.leftChild = DIRENTRY_NULL;
rootEntry.rightChild = DIRENTRY_NULL; rootEntry.rightChild = DIRENTRY_NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment