July 2006 - Wine-Commits - list.winehq.org

Jacek Caban : shlwapi: Change file path to URL in UrlCanonicalize.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 5d1b0d89b402e80d8ffc6cbb8dcdd2df76b834be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d1b0d89b402e80d8ffc6cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 29 16:11:31 2006 +0200 shlwapi: Change file path to URL in UrlCanonicalize. --- dlls/shlwapi/tests/path.c | 7 ++++++- dlls/shlwapi/url.c | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index abb13ce..d55d19d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -77,6 +77,11 @@ const TEST_URL_CANONICALIZE TEST_CANONIC {"file:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "file:///c:/tests/foo bar"}, {"http://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/site/about"}, {"file_://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "file_://www.winehq.org/site/about"}, + {"c:\\dir\\file", 0, S_OK, "file:///c:/dir/file"}, + {"file:///c:\\dir\\file", 0, S_OK, "file:///c:/dir/file"}, + {"c:dir\\file", 0, S_OK, "file:///c:dir/file"}, + {"A", 0, S_OK, "A"}, + {"", 0, S_OK, ""} }; typedef struct _TEST_URL_ESCAPE { @@ -429,7 +434,7 @@ static void test_url_canonicalize(const dwSize = INTERNET_MAX_URL_LENGTH; ok(UrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags) != dwExpectReturn, "Unexpected return for NULL buffer\n"); ok(UrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags) == dwExpectReturn, "UrlCanonicalizeA didn't return 0x%08lx\n", dwExpectReturn); - ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08lx Expected %s, but got %s\n", dwFlags, szExpectUrl, szReturnUrl); + ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08lx Expected \"%s\", but got \"%s\"\n", dwFlags, szExpectUrl, szReturnUrl); dwSize = INTERNET_MAX_URL_LENGTH; ok(UrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags) != dwExpectReturn, "Unexpected return for NULL buffer\n"); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 47334f6..3c4f28b 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -340,8 +340,13 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR if(!pszUrl || !pszCanonicalized || !pcchCanonicalized) return E_INVALIDARG; + if(!*pszUrl) { + *pszCanonicalized = 0; + return S_OK; + } + nByteLen = (lstrlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ - lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, nByteLen); + lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, INTERNET_MAX_URL_LENGTH); if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) && !memcmp(wszFile, pszUrl, sizeof(wszFile))) @@ -361,6 +366,15 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR wk1 = (LPWSTR)pszUrl; wk2 = lpszUrlCpy; state = 0; + + if(pszUrl[1] == ':') { /* Assume path */ + static const WCHAR wszFilePrefix[] = {'f','i','l','e',':','/','/','/'}; + + memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); + wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); + state = 5; + } + while (*wk1) { switch (state) { case 0:

1 0

Andrew Talbot : comctl32/tests: Write-strings warnings fix.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 1a40c4c552baabe09138d3f3a478902146ef467f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a40c4c552baabe09138d3f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 29 17:17:20 2006 +0100 comctl32/tests: Write-strings warnings fix. --- dlls/comctl32/tests/comboex.c | 44 +++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 1d10b39..106a80e 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -72,12 +72,14 @@ static void test_comboboxex(void) { HWND myHwnd = 0; LONG res = -1; COMBOBOXEXITEM cbexItem; - -#define FIRST_ITEM "First Item" -#define SECOND_ITEM "Second Item" -#define THIRD_ITEM "Third Item" -#define MIDDLE_ITEM "Between First and Second Items" -#define REPLACEMENT_ITEM "Between First and Second Items" + static TCHAR first_item[] = {'F','i','r','s','t',' ','I','t','e','m',0}, + second_item[] = {'S','e','c','o','n','d',' ','I','t','e','m',0}, + third_item[] = {'T','h','i','r','d',' ','I','t','e','m',0}, + middle_item[] = {'B','e','t','w','e','e','n',' ','F','i','r','s','t',' ','a','n','d',' ', + 'S','e','c','o','n','d',' ','I','t','e','m','s',0}, + replacement_item[] = {'B','e','t','w','e','e','n',' ','F','i','r','s','t',' ','a','n','d',' ', + 'S','e','c','o','n','d',' ','I','t','e','m','s',0}, + out_of_range_item[] = {'O','u','t',' ','o','f',' ','R','a','n','g','e',' ','I','t','e','m',0}; /* Allocate space for result */ textBuffer = malloc(MAX_CHARS); @@ -86,19 +88,19 @@ #define REPLACEMENT_ITEM "Between First myHwnd = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); /* Add items onto the end of the combobox */ - res = addItem(myHwnd, -1, FIRST_ITEM); + res = addItem(myHwnd, -1, first_item); ok(res == 0, "Adding simple item failed (%ld)\n", res); - res = addItem(myHwnd, -1, SECOND_ITEM); + res = addItem(myHwnd, -1, second_item); ok(res == 1, "Adding simple item failed (%ld)\n", res); - res = addItem(myHwnd, 2, THIRD_ITEM); + res = addItem(myHwnd, 2, third_item); ok(res == 2, "Adding simple item failed (%ld)\n", res); - res = addItem(myHwnd, 1, MIDDLE_ITEM); + res = addItem(myHwnd, 1, middle_item); ok(res == 1, "Inserting simple item failed (%ld)\n", res); /* Add an item completely out of range */ - res = addItem(myHwnd, 99, "Out Of Range Item"); + res = addItem(myHwnd, 99, out_of_range_item); ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); - res = addItem(myHwnd, 5, "Out Of Range Item"); + res = addItem(myHwnd, 5, out_of_range_item); ok(res == -1, "Adding using out of range index worked unexpectedly (%ld)\n", res); /* Removed: Causes traps on Windows XP res = addItem(myHwnd, -2, "Out Of Range Item"); @@ -116,32 +118,32 @@ #define REPLACEMENT_ITEM "Between First /* Get an item in range */ res = getItem(myHwnd, 0, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(FIRST_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(first_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 1, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(MIDDLE_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(middle_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 2, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(SECOND_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(second_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); res = getItem(myHwnd, 3, &cbexItem); ok(res != 0, "Getting item using valid index failed unexpectedly (%ld)\n", res); - ok(strcmp(THIRD_ITEM, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); + ok(strcmp(third_item, cbexItem.pszText) == 0, "Getting item returned wrong string (%s)\n", cbexItem.pszText); /* Set an item completely out of range */ - res = setItem(myHwnd, 99, REPLACEMENT_ITEM); + res = setItem(myHwnd, 99, replacement_item); ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); - res = setItem(myHwnd, 4, REPLACEMENT_ITEM); + res = setItem(myHwnd, 4, replacement_item); ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); - res = setItem(myHwnd, -2, REPLACEMENT_ITEM); + res = setItem(myHwnd, -2, replacement_item); ok(res == 0, "Setting item using out of range index worked unexpectedly (%ld)\n", res); /* Set an item in range */ - res = setItem(myHwnd, 0, REPLACEMENT_ITEM); + res = setItem(myHwnd, 0, replacement_item); ok(res != 0, "Setting first item failed (%ld)\n", res); - res = setItem(myHwnd, 3, REPLACEMENT_ITEM); + res = setItem(myHwnd, 3, replacement_item); ok(res != 0, "Setting last item failed (%ld)\n", res); /* Remove items completely out of range (4 items in control at this point) */

1 0

Jacek Caban : urlmon: Use CoInternetParseUrl in URLMonikerImpl_Construct.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 5674260b6dd64c1dc6e58697a682757e3902a66e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5674260b6dd64c1dc6e5869… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 29 14:53:22 2006 +0200 urlmon: Use CoInternetParseUrl in URLMonikerImpl_Construct. --- dlls/urlmon/umon.c | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index c81b3a3..715db8d 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1060,43 +1060,34 @@ static const IMonikerVtbl VT_URLMonikerI static HRESULT URLMonikerImpl_Construct(URLMonikerImpl* This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) { HRESULT hres; - DWORD sizeStr = INTERNET_MAX_URL_LENGTH; + DWORD sizeStr = 0; TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURLName)); This->lpvtbl = &VT_URLMonikerImpl; This->ref = 0; - sizeStr = lstrlenW(lpszURLName)+1; - if(lpszLeftURLName) - sizeStr += strlenW(lpszLeftURLName)+32; - - This->URLName = HeapAlloc(GetProcessHeap(), 0, sizeStr*sizeof(WCHAR)); + This->URLName = HeapAlloc(GetProcessHeap(), 0, INTERNET_MAX_URL_LENGTH*sizeof(WCHAR)); - if(lpszLeftURLName) { + if(lpszLeftURLName) hres = CoInternetCombineUrl(lpszLeftURLName, lpszURLName, URL_FILE_USE_PATHURL, - This->URLName, sizeStr, &sizeStr, 0); - if(FAILED(hres)) { - HeapFree(GetProcessHeap(), 0, This->URLName); - return hres; - } - }else { - /* FIXME: - * We probably should use CoInternetParseUrl or something similar here. - */ - - static const WCHAR wszFile[] = {'f','i','l','e',':','/','/',}; + This->URLName, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); + else + hres = CoInternetParseUrl(lpszURLName, PARSE_CANONICALIZE, URL_FILE_USE_PATHURL, + This->URLName, INTERNET_MAX_URL_LENGTH, &sizeStr, 0); - /* file protocol is a special case */ - if(sizeStr > sizeof(wszFile)/sizeof(WCHAR) - && !memcmp(lpszURLName, wszFile, sizeof(wszFile))) - UrlCanonicalizeW(lpszURLName, This->URLName, &sizeStr, URL_FILE_USE_PATHURL); - else - strcpyW(This->URLName,lpszURLName); + if(FAILED(hres)) { + HeapFree(GetProcessHeap(), 0, This->URLName); + return hres; } URLMON_LockModule(); + if(sizeStr != INTERNET_MAX_URL_LENGTH) + This->URLName = HeapReAlloc(GetProcessHeap(), 0, This->URLName, (sizeStr+1)*sizeof(WCHAR)); + + TRACE("URLName = %s\n", debugstr_w(This->URLName)); + return S_OK; }

1 0

Andrew Talbot : advpack/tests: Write-strings warnings fix.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: c6befb33580e6f464b6f00ca4dc3e263d01fd5f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c6befb33580e6f464b6f00c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 29 14:29:25 2006 +0100 advpack/tests: Write-strings warnings fix. --- dlls/advpack/tests/install.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 10e42fb..919f809 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -60,7 +60,7 @@ static void append_str(char **str, const *str += strlen(*str); } -static void create_inf_file(LPSTR filename) +static void create_inf_file(LPCSTR filename) { char data[1024]; char *ptr = data; @@ -201,6 +201,7 @@ static void test_LaunchINFSection() { HRESULT hr; char cmdline[MAX_PATH]; + static char file[] = "test.inf,DefaultInstall,4,0"; /* try an invalid cmdline */ hr = pLaunchINFSection(NULL, NULL, NULL, 0); @@ -222,7 +223,7 @@ static void test_LaunchINFSection() create_inf_file("test.inf"); /* try just the INF filename */ - hr = pLaunchINFSection(NULL, NULL, "test.inf,DefaultInstall,4,0", 0); + hr = pLaunchINFSection(NULL, NULL, file, 0); todo_wine { ok(hr == 0, "Expected 0, got %ld\n", hr);

1 0

Andrew Talbot : cabinet: Write-strings warning fix.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: 0fca0e00aaadbd9eb959d1b7b7f9e5df0de77108 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fca0e00aaadbd9eb959d1b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Jul 29 14:49:13 2006 +0100 cabinet: Write-strings warning fix. --- dlls/cabinet/cabinet_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index fe2739d..fa8f1b4 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -303,6 +303,7 @@ HRESULT WINAPI Extract(EXTRACTdest *dest HRESULT res = S_OK; HFDI hfdi; ERF erf; + static CHAR empty[] = ""; TRACE("(%p, %s)\n", dest, szCabName); @@ -322,7 +323,7 @@ HRESULT WINAPI Extract(EXTRACTdest *dest if (GetFileAttributesA(dest->directory) == INVALID_FILE_ATTRIBUTES) return S_OK; - if (!FDICopy(hfdi, (LPSTR)szCabName, "", 0, + if (!FDICopy(hfdi, (LPSTR)szCabName, empty, 0, fdi_notify_extract, NULL, dest)) res = E_FAIL;

1 0

Alexandre Julliard : ntdll: Use the right section size when setting protections.
by Alexandre Julliard July 31, 2006

July 31, 2006

Module: wine Branch: refs/heads/master Commit: f114ba119cd495af76319dd76220f8f0f862d985 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f114ba119cd495af76319dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 30 09:59:46 2006 +0200 ntdll: Use the right section size when setting protections. Use the same size computation when setting section protections than when mapping it in the first place (reported by Nicholas Miell). --- dlls/ntdll/virtual.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 65b929d..f7b829f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1150,8 +1150,14 @@ static NTSTATUS map_image( HANDLE hmappi sec = (IMAGE_SECTION_HEADER*)((char *)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) { - SIZE_T size = ROUND_SIZE( sec->VirtualAddress, sec->Misc.VirtualSize ); + SIZE_T size; BYTE vprot = VPROT_COMMITTED; + + if (sec->Misc.VirtualSize) + size = ROUND_SIZE( sec->VirtualAddress, sec->Misc.VirtualSize ); + else + size = ROUND_SIZE( sec->VirtualAddress, sec->SizeOfRawData ); + if (sec->Characteristics & IMAGE_SCN_MEM_READ) vprot |= VPROT_READ; if (sec->Characteristics & IMAGE_SCN_MEM_WRITE) vprot |= VPROT_READ|VPROT_WRITECOPY; if (sec->Characteristics & IMAGE_SCN_MEM_EXECUTE) vprot |= VPROT_EXEC;

1 0

appdb/tables create_tables
by WineHQ July 29, 2006

July 29, 2006

ChangeSet ID: 26950 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/29 21:53:35 Modified files: tables : create_tables Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Create distributions table in create_tables script Patch: http://cvs.winehq.org/patch.py?id=26950 Old revision New revision Changes Path 1.8 1.9 +3 -0 appdb/tables/create_tables Index: appdb/tables/create_tables diff -u -p appdb/tables/create_tables:1.8 appdb/tables/create_tables:1.9 --- appdb/tables/create_tables:1.8 30 Jul 2006 2:53:35 -0000 +++ appdb/tables/create_tables 30 Jul 2006 2:53:35 -0000 @@ -32,3 +32,6 @@ mysql -p -u root < monitors.sql echo Creating error logging tables mysql -p -u root < error_log.sql + +echo Adding distributions +mysql -p -u root < distributions.sql

1 0

appdb/tables maintainers.sql
by WineHQ July 29, 2006

July 29, 2006

ChangeSet ID: 26949 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/29 21:52:46 Modified files: tables : maintainers.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Create table statement has a semi-colon where it should have a comma Patch: http://cvs.winehq.org/patch.py?id=26949 Old revision New revision Changes Path 1.3 1.4 +1 -1 appdb/tables/maintainers.sql Index: appdb/tables/maintainers.sql diff -u -p appdb/tables/maintainers.sql:1.3 appdb/tables/maintainers.sql:1.4 --- appdb/tables/maintainers.sql:1.3 30 Jul 2006 2:52:46 -0000 +++ appdb/tables/maintainers.sql 30 Jul 2006 2:52:46 -0000 @@ -19,6 +19,6 @@ create table appMaintainers ( maintainReason text, superMaintainer bool, submitTime datetime, - queued enum('true','false','rejected') NOT NULL default 'false'; + queued enum('true','false','rejected') NOT NULL default 'false', key(maintainerId) );

1 0

Mike McCormack : ole32: Add some missing traces.
by Alexandre Julliard July 29, 2006

July 29, 2006

Module: wine Branch: refs/heads/master Commit: fd61c3f24bd6a6b589df6e1bb528cf5b7221dc98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd61c3f24bd6a6b589df6e1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Jul 29 17:13:53 2006 +0900 ole32: Add some missing traces. --- dlls/ole32/stg_stream.c | 6 +++++- dlls/ole32/storage32.c | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 493d588..f866491 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -273,7 +273,7 @@ static HRESULT WINAPI StgStreamImpl_Read WARN("storage reverted\n"); return STG_E_REVERTED; } - + /* * If the caller is not interested in the number of bytes read, * we use another buffer to avoid "if" statements in the code. @@ -805,6 +805,8 @@ static HRESULT WINAPI StgStreamImpl_Stat StgProperty curProperty; BOOL readSucessful; + TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag); + /* * if stream has no parent, return STG_E_REVERTED */ @@ -854,6 +856,8 @@ static HRESULT WINAPI StgStreamImpl_Clon StgStreamImpl* new_stream; LARGE_INTEGER seek_pos; + TRACE("%p %p\n", This, ppstm); + /* * Sanity check */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8c7fc61..520689b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1813,7 +1813,7 @@ static HRESULT WINAPI StorageImpl_Stat( } /****************************************************************************** - * Internal stream list handlers + * Internal stream list handlers */ void StorageBaseImpl_AddStream(StorageBaseImpl * stg, StgStreamImpl * strm) @@ -1836,7 +1836,7 @@ void StorageBaseImpl_DeleteAll(StorageBa LIST_FOR_EACH_SAFE(cur, cur2, &stg->strmHead) { strm = LIST_ENTRY(cur,StgStreamImpl,StrmListEntry); TRACE("Streams deleted (stg=%p strm=%p next=%p prev=%p)\n", stg,strm,cur->next,cur->prev); - strm->parentStorage = NULL; + strm->parentStorage = NULL; list_remove(cur); } } @@ -7620,6 +7620,8 @@ HRESULT WINAPI OleConvertOLESTREAMToISto HRESULT hRes=S_OK; OLECONVERT_OLESTREAM_DATA pOleStreamData[2]; + TRACE("%p %p %p\n", pOleStream, pstg, ptd); + memset(pOleStreamData, 0, sizeof(pOleStreamData)); if(ptd != NULL) @@ -7710,6 +7712,7 @@ HRESULT WINAPI OleConvertIStorageToOLEST OLECONVERT_OLESTREAM_DATA pOleStreamData[2]; static const WCHAR wstrStreamName[] = {1, 'O', 'l', 'e', '1', '0', 'N', 'a', 't', 'i', 'v', 'e', 0}; + TRACE("%p %p\n", pstg, pOleStream); memset(pOleStreamData, 0, sizeof(pOleStreamData)); @@ -7783,7 +7786,7 @@ StgIsStorageFile(LPCOLESTR fn) BYTE magic[8]; DWORD bytes_read; - TRACE("(\'%s\')\n", debugstr_w(fn)); + TRACE("%s\n", debugstr_w(fn)); hf = CreateFileW(fn, GENERIC_READ, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);

1 0

Mike McCormack : ole32: Add a test for IEnumSTATSTG.
by Alexandre Julliard July 29, 2006

July 29, 2006

Module: wine Branch: refs/heads/master Commit: d9bfbe9197c67ef10dabd59cec7790b1a52a079a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9bfbe9197c67ef10dabd59… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Jul 29 17:13:30 2006 +0900 ole32: Add a test for IEnumSTATSTG. --- dlls/ole32/tests/storage32.c | 79 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d4ed369..0ba82f2 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -757,6 +757,84 @@ static void test_storage_refcount(void) DeleteFileW(filename); } +static void test_streamenum(void) +{ + static const WCHAR szPrefix[] = { 's','t','g',0 }; + static const WCHAR szDot[] = { '.',0 }; + WCHAR filename[MAX_PATH]; + IStorage *stg = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + STATSTG stat; + IEnumSTATSTG *ee = NULL; + ULONG count; + + if(!GetTempFileNameW(szDot, szPrefix, 0, filename)) + return; + + DeleteFileW(filename); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + r = WriteClassStg( stg, &test_stg_cls ); + ok( r == S_OK, "WriteClassStg failed\n"); + + r = IStorage_Commit( stg, STGC_DEFAULT ); + ok( r == S_OK, "IStorage_Commit failed\n"); + + /* now create a stream */ + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Release(stm); + + /* first enum ... should be 1 stream */ + r = IStorage_EnumElements(stg, 0, NULL, 0, &ee); + ok(r==S_OK, "IStorage->EnumElements failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_OK, "IEnumSTATSTG->Next failed\n"); + ok(count == 1, "count wrong\n"); + + r = IEnumSTATSTG_Release(ee); + + /* second enum... destroy the stream before reading */ + r = IStorage_EnumElements(stg, 0, NULL, 0, &ee); + ok(r==S_OK, "IStorage->EnumElements failed\n"); + + r = IStorage_DestroyElement(stg, stmname); + ok(r==S_OK, "IStorage->EnumElements failed\n"); + + todo_wine { + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_FALSE, "IEnumSTATSTG->Next failed\n"); + ok(count == 0, "count wrong\n"); + } + + /* reset and try again */ + r = IEnumSTATSTG_Reset(ee); + ok(r==S_OK, "IEnumSTATSTG->Reset failed\n"); + + count = 0xf00; + r = IEnumSTATSTG_Next(ee, 1, &stat, &count); + ok(r==S_FALSE, "IEnumSTATSTG->Next failed\n"); + ok(count == 0, "count wrong\n"); + + r = IEnumSTATSTG_Release(ee); + ok (r == 0, "enum not released\n"); + + r = IStorage_Release( stg ); + ok (r == 0, "storage not released\n"); + + DeleteFileW(filename); +} + START_TEST(storage32) { test_hglobal_storage_stat(); @@ -765,4 +843,5 @@ START_TEST(storage32) test_open_storage(); test_storage_suminfo(); test_storage_refcount(); + test_streamenum(); }

1 0