September 2009 - Wine-Commits

Alexandre Julliard : winetest: Use the registry path for COM dlls instead of GetModuleFileName.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: c75aa35ba2380829a1f442a5479f9b5ad760a34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75aa35ba2380829a1f442a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 13:06:09 2009 +0200 winetest: Use the registry path for COM dlls instead of GetModuleFileName. This allows to load them with LOAD_LIBRARY_AS_DATAFILE. --- programs/winetest/main.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 4287066..f43b7de 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -570,12 +570,13 @@ static BOOL get_main_clsid(const char *name, CLSID *clsid) return FALSE; } -static HMODULE load_com_dll(const char *name) +static HMODULE load_com_dll(const char *name, char **path, char *filename) { HMODULE dll = NULL; HKEY hkey; char keyname[100]; char dllname[MAX_PATH]; + char *p; CLSID clsid; if(!get_main_clsid(name, &clsid)) return NULL; @@ -589,7 +590,15 @@ static HMODULE load_com_dll(const char *name) { LONG size = sizeof(dllname); if(RegQueryValueA(hkey, NULL, dllname, &size) == ERROR_SUCCESS) - dll = LoadLibraryA(dllname); + { + if ((dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE))) + { + strcpy( filename, dllname ); + p = strrchr(dllname, '\\'); + if (p) *p = 0; + *path = heap_strdup( dllname ); + } + } RegCloseKey(hkey); } @@ -628,11 +637,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, strcpy(filename, dllname); dll = LoadLibraryExA(dllname, NULL, LOAD_LIBRARY_AS_DATAFILE); - if(!dll) - { - dll = load_com_dll(dllname); - if(dll) get_dll_path(dll, &wine_tests[nr_of_files].maindllpath, filename); - } + if (!dll) dll = load_com_dll(dllname, &wine_tests[nr_of_files].maindllpath, filename); if (!dll && pLoadLibraryShim) {

1 0

Juan Lang : ntdll: Don't allow setting a zero process affinity.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: c7b14235211b20fc38650100fce32618ff680daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b14235211b20fc38650100f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 28 08:24:02 2009 -0700 ntdll: Don't allow setting a zero process affinity. --- dlls/ntdll/process.c | 2 ++ dlls/ntdll/tests/info.c | 1 - 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 573ee86..d2e8db0 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -404,6 +404,8 @@ NTSTATUS WINAPI NtSetInformationProcess( if (ProcessInformationLength != sizeof(DWORD_PTR)) return STATUS_INVALID_PARAMETER; if (*(PDWORD_PTR)ProcessInformation & ~(((DWORD_PTR)1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1)) return STATUS_INVALID_PARAMETER; + if (!*(PDWORD_PTR)ProcessInformation) + return STATUS_INVALID_PARAMETER; SERVER_START_REQ( set_process_info ) { req->handle = wine_server_obj_handle( ProcessHandle ); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5c44d6d..37895ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -908,7 +908,6 @@ static void test_affinity(void) proc_affinity = 0; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); - todo_wine ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status);

1 0

Andrew Eikum : wininet: Always extract #fragments in InternetCrackUrl.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 0250eab25e220193645a065c5a45c2f0d35e14f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0250eab25e220193645a065c5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 28 15:49:16 2009 -0500 wininet: Always extract #fragments in InternetCrackUrl. --- dlls/wininet/internet.c | 5 ++++- dlls/wininet/tests/url.c | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1a77fd8..1f08c49 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1424,8 +1424,11 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; /* Parse <params> */ - if (!(lpszParam = memchrW(lpszap, ';', dwUrlLength - (lpszap - lpszUrl)))) + lpszParam = memchrW(lpszap, ';', dwUrlLength - (lpszap - lpszUrl)); + if(!lpszParam) lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl)); + if(!lpszParam) + lpszParam = memchrW(lpszap, '#', dwUrlLength - (lpszap - lpszUrl)); SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength, lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 39c0286..18df392 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -30,9 +30,10 @@ #include "wine/test.h" -#define TEST_URL "http://www.winehq.org/site/about" +#define TEST_URL "http://www.winehq.org/site/about#hi" #define TEST_URL_HOST "www.winehq.org" #define TEST_URL_PATH "/site/about" +#define TEST_URL_HASH "#hi" #define TEST_URL2 "http://www.myserver.com/myscript.php?arg=1" #define TEST_URL2_SERVER "www.myserver.com" #define TEST_URL2_PATH "/myscript.php" @@ -147,10 +148,10 @@ static void InternetCrackUrl_test(void) ok(urlComponents.nScheme == INTERNET_SCHEME_HTTP,"urlComponents->nScheme should have been INTERNET_SCHEME_HTTP instead of %d\n", urlComponents.nScheme); ok(!urlComponents.lpszUserName, ".lpszUserName should have been set to NULL\n"); ok(!urlComponents.lpszPassword, ".lpszPassword should have been set to NULL\n"); - ok(!urlComponents.lpszExtraInfo, ".lpszExtraInfo should have been set to NULL\n"); + ok(urlComponents.dwExtraInfoLength == strlen(TEST_URL_HASH),".dwExtraInfoLength should be %d, but is %d\n", lstrlenA(TEST_URL_HASH), urlComponents.dwExtraInfoLength); + ok(!strncmp(urlComponents.lpszExtraInfo,TEST_URL_HASH,strlen(TEST_URL_HASH)), ".lpszExtraInfo should be %s but is %s\n", TEST_URL_HASH, urlComponents.lpszExtraInfo); ok(!urlComponents.dwUserNameLength,".dwUserNameLength should be 0, but is %d\n", urlComponents.dwUserNameLength); ok(!urlComponents.dwPasswordLength,".dwPasswordLength should be 0, but is %d\n", urlComponents.dwPasswordLength); - ok(!urlComponents.dwExtraInfoLength,".dwExtraInfoLength should be 0, but is %d\n", urlComponents.dwExtraInfoLength); /*3. Check for %20 */ copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 2048, 1024);

1 0

Peter Oberndorfer : shlwapi: Remove pointer check in IStream::Clone, it also crashes on Windows.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: a35fd4f496fcd2898b15051fa2b96598c5581cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35fd4f496fcd2898b15051fa… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:10 2009 +0200 shlwapi: Remove pointer check in IStream::Clone, it also crashes on Windows. Add comments to functions that are not implemented. --- dlls/shlwapi/regstream.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index cd48d93..c167843 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -234,6 +234,8 @@ static HRESULT WINAPI IStream_fnCopyTo (IStream * iface, IStream* pstm, ULARGE_I pcbRead->QuadPart = 0; if (pcbWritten) pcbWritten->QuadPart = 0; + + /* TODO implement */ return E_NOTIMPL; } @@ -246,6 +248,7 @@ static HRESULT WINAPI IStream_fnCommit (IStream * iface, DWORD grfCommitFlags) TRACE("(%p)\n",This); + /* commit not supported by this stream */ return E_NOTIMPL; } @@ -258,6 +261,7 @@ static HRESULT WINAPI IStream_fnRevert (IStream * iface) TRACE("(%p)\n",This); + /* revert not supported by this stream */ return E_NOTIMPL; } @@ -270,6 +274,7 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion (IStream * iface, ULARGE_INTEGE TRACE("(%p)\n",This); + /* lock/unlock not supported by this stream */ return E_NOTIMPL; } @@ -308,8 +313,9 @@ static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm) ISHRegStream *This = (ISHRegStream *)iface; TRACE("(%p)\n",This); - if (ppstm) - *ppstm = NULL; + *ppstm = NULL; + + /* clone not supported by this stream */ return E_NOTIMPL; }

1 0

Peter Oberndorfer : shlwapi: Write back data to registry when closing reg stream.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: cb83957e3c6b445a8e1a48d35ca1cd5f50f39685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb83957e3c6b445a8e1a48d35… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:13 2009 +0200 shlwapi: Write back data to registry when closing reg stream. --- dlls/shlwapi/regstream.c | 81 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 69 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 275827d..eb906a7 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -43,6 +43,12 @@ typedef struct LPBYTE pbBuffer; DWORD dwLength; DWORD dwPos; + DWORD dwMode; + union { + LPSTR keyNameA; + LPWSTR keyNameW; + }u; + BOOL bUnicode; } ISHRegStream; /************************************************************************** @@ -98,11 +104,34 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) { TRACE(" destroying SHReg IStream (%p)\n",This); - HeapFree(GetProcessHeap(),0,This->pbBuffer); - if (This->hKey) + { + /* write back data in REG_BINARY */ + if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE) + { + if (This->dwLength) + { + if (This->bUnicode) + RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY, + (const BYTE *) This->pbBuffer, This->dwLength); + else + RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY, + (const BYTE *) This->pbBuffer, This->dwLength); + } + else + { + if (This->bUnicode) + RegDeleteValueW(This->hKey, This->u.keyNameW); + else + RegDeleteValueA(This->hKey, This->u.keyNameA); + } + } + RegCloseKey(This->hKey); + } + HeapFree(GetProcessHeap(),0,This->u.keyNameA); + HeapFree(GetProcessHeap(),0,This->pbBuffer); HeapFree(GetProcessHeap(),0,This); return 0; } @@ -296,7 +325,7 @@ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD pstatstg->ctime.dwLowDateTime = 0; pstatstg->atime.dwHighDateTime = 0; pstatstg->atime.dwLowDateTime = 0; - pstatstg->grfMode = STGM_READWRITE; + pstatstg->grfMode = This->dwMode; pstatstg->grfLocksSupported = 0; pstatstg->clsid = CLSID_NULL; pstatstg->grfStateBits = 0; @@ -395,7 +424,10 @@ static ISHRegStream rsDummyRegStream = NULL, NULL, 0, - 0 + 0, + STGM_READWRITE, + {NULL}, + FALSE }; /************************************************************************** @@ -403,7 +435,7 @@ static ISHRegStream rsDummyRegStream = * * Internal helper: Create and initialise a new registry stream object. */ -static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) +static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) { ISHRegStream* regStream; @@ -417,9 +449,12 @@ static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) regStream->pbBuffer = pbBuffer; regStream->dwLength = dwLength; regStream->dwPos = 0; + regStream->dwMode = STGM_READWRITE; + regStream->u.keyNameA = NULL; + regStream->bUnicode = FALSE; } TRACE ("Returning %p\n", regStream); - return (IStream *)regStream; + return regStream; } /************************************************************************* @@ -440,7 +475,7 @@ static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, LPCSTR pszValue,DWORD dwMode) { - IStream *tmp; + ISHRegStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; DWORD dwLength = 0; @@ -470,8 +505,19 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); tmp = IStream_Create(hStrKey, lpBuff, dwLength); + if(tmp) + { + if(pszValue) + { + int len = lstrlenA(pszValue) + 1; + tmp->u.keyNameA = HeapAlloc(GetProcessHeap(), 0, len); + memcpy(tmp->u.keyNameA, pszValue, len); + } - return tmp; + tmp->dwMode = dwMode; + tmp->bUnicode = FALSE; + return (IStream *)tmp; + } } HeapFree(GetProcessHeap(), 0, lpBuff); @@ -488,7 +534,7 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, LPCWSTR pszValue, DWORD dwMode) { - IStream *tmp; + ISHRegStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; DWORD dwLength = 0; @@ -519,8 +565,19 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); tmp = IStream_Create(hStrKey, lpBuff, dwLength); + if(tmp) + { + if(pszValue) + { + int len = lstrlenW(pszValue) + 1; + tmp->u.keyNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + memcpy(tmp->u.keyNameW, pszValue, len * sizeof(WCHAR)); + } - return tmp; + tmp->dwMode = dwMode; + tmp->bUnicode = TRUE; + return (IStream *)tmp; + } } HeapFree(GetProcessHeap(), 0, lpBuff); @@ -604,7 +661,7 @@ IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) if (lpbDup) { memcpy(lpbDup, lpbData, dwDataLen); - iStrmRet = IStream_Create(NULL, lpbDup, dwDataLen); + iStrmRet = (IStream *)IStream_Create(NULL, lpbDup, dwDataLen); if (!iStrmRet) HeapFree(GetProcessHeap(), 0, lpbDup); @@ -642,7 +699,7 @@ HRESULT WINAPI SHCreateStreamWrapper(LPBYTE lpbData, DWORD dwDataLen, if(dwReserved || !lppStream) return E_INVALIDARG; - lpStream = IStream_Create(NULL, lpbData, dwDataLen); + lpStream = (IStream *)IStream_Create(NULL, lpbData, dwDataLen); if(!lpStream) return E_OUTOFMEMORY;

1 0

Peter Oberndorfer : shlwapi: Allow SHOpenRegStream2 A/ W to work with not existing values.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 90e800cf9b3c60b41f38ee85b30570cff9e8631e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e800cf9b3c60b41f38ee85b… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:12 2009 +0200 shlwapi: Allow SHOpenRegStream2 A/W to work with not existing values. When mode is STGM_WRITE or STGM_READWRITE make sure key key exists. Only read data in STGM_READ or STGM_READWRITE mode. Do not depend on value type being REG_BINARY. Succeed when reading not existing values. --- dlls/shlwapi/regstream.c | 80 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 60 insertions(+), 20 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index c167843..275827d 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -440,21 +440,41 @@ static IStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, LPCSTR pszValue,DWORD dwMode) { + IStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; - DWORD dwLength, dwType; + DWORD dwLength = 0; + LONG ret; TRACE("(%p,%s,%s,0x%08x)\n", hKey, pszSubkey, pszValue, dwMode); - /* Open the key, read in binary data and create stream */ - if (!RegOpenKeyExA (hKey, pszSubkey, 0, KEY_READ, &hStrKey) && - !RegQueryValueExA (hStrKey, pszValue, 0, 0, 0, &dwLength) && - (lpBuff = HeapAlloc (GetProcessHeap(), 0, dwLength)) && - !RegQueryValueExA (hStrKey, pszValue, 0, &dwType, lpBuff, &dwLength) && - dwType == REG_BINARY) - return IStream_Create(hStrKey, lpBuff, dwLength); + if (dwMode == STGM_READ) + ret = RegOpenKeyExA(hKey, pszSubkey, 0, KEY_READ, &hStrKey); + else /* in write mode we make sure the subkey exits */ + ret = RegCreateKeyExA(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); - HeapFree (GetProcessHeap(), 0, lpBuff); + if (ret == ERROR_SUCCESS) + { + if (dwMode == STGM_READ || dwMode == STGM_READWRITE) + { + /* read initial data */ + ret = RegQueryValueExA(hStrKey, pszValue, 0, 0, 0, &dwLength); + if (ret == ERROR_SUCCESS && dwLength) + { + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + RegQueryValueExA(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); + } + } + + if (!dwLength) + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + + tmp = IStream_Create(hStrKey, lpBuff, dwLength); + + return tmp; + } + + HeapFree(GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL; @@ -468,22 +488,42 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, LPCWSTR pszValue, DWORD dwMode) { + IStream *tmp; HKEY hStrKey = NULL; LPBYTE lpBuff = NULL; - DWORD dwLength, dwType; + DWORD dwLength = 0; + LONG ret; TRACE("(%p,%s,%s,0x%08x)\n", hKey, debugstr_w(pszSubkey), debugstr_w(pszValue), dwMode); - /* Open the key, read in binary data and create stream */ - if (!RegOpenKeyExW (hKey, pszSubkey, 0, KEY_READ, &hStrKey) && - !RegQueryValueExW (hStrKey, pszValue, 0, 0, 0, &dwLength) && - (lpBuff = HeapAlloc (GetProcessHeap(), 0, dwLength)) && - !RegQueryValueExW (hStrKey, pszValue, 0, &dwType, lpBuff, &dwLength) && - dwType == REG_BINARY) - return IStream_Create(hStrKey, lpBuff, dwLength); + if (dwMode == STGM_READ) + ret = RegOpenKeyExW(hKey, pszSubkey, 0, KEY_READ, &hStrKey); + else /* in write mode we make sure the subkey exits */ + ret = RegCreateKeyExW(hKey, pszSubkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &hStrKey, NULL); + + if (ret == ERROR_SUCCESS) + { + if (dwMode == STGM_READ || dwMode == STGM_READWRITE) + { + /* read initial data */ + ret = RegQueryValueExW(hStrKey, pszValue, 0, 0, 0, &dwLength); + if (ret == ERROR_SUCCESS && dwLength) + { + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + RegQueryValueExW(hStrKey, pszValue, 0, 0, lpBuff, &dwLength); + } + } + + if (!dwLength) + lpBuff = HeapAlloc(GetProcessHeap(), 0, dwLength); + + tmp = IStream_Create(hStrKey, lpBuff, dwLength); + + return tmp; + } - HeapFree (GetProcessHeap(), 0, lpBuff); + HeapFree(GetProcessHeap(), 0, lpBuff); if (hStrKey) RegCloseKey(hStrKey); return NULL;

1 0

Peter Oberndorfer : shlwapi: Implement IStream::Write, Seek and SetSize.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 58669ece91161803f68ded7cb881a4b2511e45b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58669ece91161803f68ded7cb… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:08 2009 +0200 shlwapi: Implement IStream::Write, Seek and SetSize. On Write holes between file size and cursor are filled with 0 bytes. On SetSize holes caused by increasing file size are filled with 0 bytes. --- dlls/shlwapi/regstream.c | 60 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index caee2e8..cd48d93 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -144,13 +144,29 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb, ULONG* pcbWritten) { ISHRegStream *This = (ISHRegStream *)iface; + DWORD newLen = This->dwPos + cb; - TRACE("(%p)\n",This); + TRACE("(%p, %p, %d, %p)\n",This, pv, cb, pcbWritten); + + if (newLen < This->dwPos) /* overflow */ + return STG_E_INSUFFICIENTMEMORY; + + if (newLen > This->dwLength) + { + LPBYTE newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); + if (!newBuf) + return STG_E_INSUFFICIENTMEMORY; + + This->dwLength = newLen; + This->pbBuffer = newBuf; + } + memmove(This->pbBuffer + This->dwPos, pv, cb); + This->dwPos += cb; /* adjust pointer */ if (pcbWritten) - *pcbWritten = 0; + *pcbWritten = cb; - return E_NOTIMPL; + return S_OK; } /************************************************************************** @@ -159,12 +175,28 @@ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { ISHRegStream *This = (ISHRegStream *)iface; + LARGE_INTEGER tmp; + TRACE("(%p, %s, %d %p)\n", This, + wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition); + + if (dwOrigin == STREAM_SEEK_SET) + tmp = dlibMove; + else if (dwOrigin == STREAM_SEEK_CUR) + tmp.QuadPart = This->dwPos + dlibMove.QuadPart; + else if (dwOrigin == STREAM_SEEK_END) + tmp.QuadPart = This->dwLength + dlibMove.QuadPart; + else + return STG_E_INVALIDPARAMETER; - TRACE("(%p)\n",This); + if (tmp.QuadPart < 0) + return STG_E_INVALIDFUNCTION; + + /* we cut off the high part here */ + This->dwPos = tmp.LowPart; if (plibNewPosition) - plibNewPosition->QuadPart = 0; - return E_NOTIMPL; + plibNewPosition->QuadPart = This->dwPos; + return S_OK; } /************************************************************************** @@ -173,9 +205,21 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D static HRESULT WINAPI IStream_fnSetSize (IStream * iface, ULARGE_INTEGER libNewSize) { ISHRegStream *This = (ISHRegStream *)iface; + DWORD newLen; + LPBYTE newBuf; - TRACE("(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p, %s)\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); + + /* we cut off the high part here */ + newLen = libNewSize.LowPart; + newBuf = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->pbBuffer, newLen); + if (!newBuf) + return STG_E_INSUFFICIENTMEMORY; + + This->pbBuffer = newBuf; + This->dwLength = newLen; + + return S_OK; } /**************************************************************************

1 0

Allan Tong : d3d9: Don' t release the parent device before destroying its children.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 5d56eddb7c17db867817def582e8f8316d7a6c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d56eddb7c17db867817def58… Author: Allan Tong <actong88(a)gmail.com> Date: Sat Sep 26 09:56:16 2009 -0400 d3d9: Don't release the parent device before destroying its children. Releasing the device earlier may cause the underlying wineD3D device to be freed before the child object has had a chance to clean up. --- dlls/d3d9/cubetexture.c | 6 +++++- dlls/d3d9/indexbuffer.c | 6 +++++- dlls/d3d9/pixelshader.c | 6 +++++- dlls/d3d9/surface.c | 6 +++++- dlls/d3d9/swapchain.c | 6 +++++- dlls/d3d9/texture.c | 6 +++++- dlls/d3d9/vertexbuffer.c | 6 +++++- dlls/d3d9/vertexdeclaration.c | 6 +++++- dlls/d3d9/vertexshader.c | 6 +++++- dlls/d3d9/volumetexture.c | 6 +++++- 10 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 4bab9df..10336b5 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -67,12 +67,16 @@ static ULONG WINAPI IDirect3DCubeTexture9Impl_Release(LPDIRECT3DCUBETEXTURE9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + TRACE("Releasing child %p\n", This->wineD3DCubeTexture); - IDirect3DDevice9Ex_Release(This->parentDevice); wined3d_mutex_lock(); IWineD3DCubeTexture_Release(This->wineD3DCubeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index e089bea..2748abb 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -65,10 +65,14 @@ static ULONG WINAPI IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DIndexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 547dc74..1c42142 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -64,10 +64,14 @@ static ULONG WINAPI IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DPixelShader_Release(This->wineD3DPixelShader); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index f9b2794..0c277b9 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -82,10 +82,14 @@ static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (This->parentDevice) IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DSurface_Release(This->wineD3DSurface); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + if (parentDevice) IDirect3DDevice9Ex_Release(parentDevice); } return ref; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index e63e343..461db37 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -60,7 +60,8 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - if (This->parentDevice) IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + if (!This->isImplicit) { wined3d_mutex_lock(); IWineD3DSwapChain_Destroy(This->wineD3DSwapChain); @@ -68,6 +69,9 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) HeapFree(GetProcessHeap(), 0, This); } + + /* Release the device last, as it may cause the device to be destroyed. */ + if (parentDevice) IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 9818c26..c63bb25 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -67,10 +67,14 @@ static ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) { TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DTexture_Release(This->wineD3DTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index c46f8b3..d1d7b54 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -66,10 +66,14 @@ static ULONG WINAPI IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DBuffer_Release(This->wineD3DVertexBuffer); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 1234bff..63b257c 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -248,10 +248,14 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECL TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + if(!This->convFVF) { IDirect3DVertexDeclaration9Impl_Destroy(iface); } + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 8b775de..9293c20 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -64,10 +64,14 @@ static ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 i TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DVertexShader_Release(This->wineD3DVertexShader); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 3adab63..7a47e4a 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -66,10 +66,14 @@ static ULONG WINAPI IDirect3DVolumeTexture9Impl_Release(LPDIRECT3DVOLUMETEXTURE9 TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DVolumeTexture_Release(This->wineD3DVolumeTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; }

1 0

Peter Oberndorfer : shlwapi: Fix prototype of SHCreateMemStream.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 2d41762553b7e6def412912a95af6b1e4c1447ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d41762553b7e6def412912a9… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:23:58 2009 +0200 shlwapi: Fix prototype of SHCreateMemStream. --- dlls/shlwapi/regstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 6aca8f9..5c0e572 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -487,7 +487,7 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, * A copy of the memory pointed to by lpbData is made, and is freed * when the stream is released. */ -IStream * WINAPI SHCreateMemStream(LPBYTE lpbData, DWORD dwDataLen) +IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) { IStream *iStrmRet = NULL;

1 0

Peter Oberndorfer : shlwapi: Implement IStream::Stat for registry/ memory streams.
by Alexandre Julliard Sept. 29, 2009

Sept. 29, 2009

Module: wine Branch: master Commit: 60b8750d3b15191304a6f4a41ed8210dc160f2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60b8750d3b15191304a6f4a41… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Sep 28 22:24:00 2009 +0200 shlwapi: Implement IStream::Stat for registry/memory streams. --- dlls/shlwapi/regstream.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 5c0e572..439c4d9 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -235,13 +235,28 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion (IStream * iface, ULARGE_INTEGE /************************************************************************* * IStream_fnStat */ -static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) +static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag) { ISHRegStream *This = (ISHRegStream *)iface; - TRACE("(%p)\n",This); + TRACE("(%p, %p, %d)\n",This,pstatstg,grfStatFlag); + + pstatstg->pwcsName = NULL; + pstatstg->type = STGTY_STREAM; + pstatstg->cbSize.QuadPart = This->dwLength; + pstatstg->mtime.dwHighDateTime = 0; + pstatstg->mtime.dwLowDateTime = 0; + pstatstg->ctime.dwHighDateTime = 0; + pstatstg->ctime.dwLowDateTime = 0; + pstatstg->atime.dwHighDateTime = 0; + pstatstg->atime.dwLowDateTime = 0; + pstatstg->grfMode = STGM_READWRITE; + pstatstg->grfLocksSupported = 0; + pstatstg->clsid = CLSID_NULL; + pstatstg->grfStateBits = 0; + pstatstg->reserved = 0; - return E_NOTIMPL; + return S_OK; } /*************************************************************************

1 0