June 2011 - Wine-commits - list.winehq.org

Mariusz Pluciński : shell32: Add support of known folders redirection to GetPath.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 7340dcdb6d226400735d98a558485a6bb4949f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7340dcdb6d226400735d98a55… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 29 19:42:25 2011 +0200 shell32: Add support of known folders redirection to GetPath. --- dlls/shell32/shellpath.c | 60 ++++++++++++++++++++++++++++++++------- dlls/shell32/tests/shellpath.c | 16 ++++------ 2 files changed, 56 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7340dcdb6d226400735d9…

1 0

Aric Stewart : hhctrl.ocx: Improve parsing of incoming file specs to HtmlHelp.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 3414d0ea0e8fe8cbd5f4ee090e0673620ffd36ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3414d0ea0e8fe8cbd5f4ee090… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 29 10:51:05 2011 -0500 hhctrl.ocx: Improve parsing of incoming file specs to HtmlHelp. --- dlls/hhctrl.ocx/chm.c | 2 +- dlls/hhctrl.ocx/hhctrl.c | 55 +++++++++++++++++++++++++++++++++------------ dlls/hhctrl.ocx/hhctrl.h | 2 + 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index f0452fa..51d1685 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -282,7 +282,7 @@ done: return SUCCEEDED(hr); } -static LPCWSTR skip_schema(LPCWSTR url) +LPCWSTR skip_schema(LPCWSTR url) { static const WCHAR its_schema[] = {'i','t','s',':'}; static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 08dfc4e..33cc1f1 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -98,9 +98,41 @@ static const char *command_to_string(UINT command) #undef X } -static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen) +static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen, const WCHAR **index, const WCHAR **window) { + const WCHAR *extra; + WCHAR chm_file[MAX_PATH]; + static const WCHAR helpW[] = {'\\','h','e','l','p','\\',0}; + static const WCHAR delimW[] = {':',':',0}; + static const WCHAR delim2W[] = {'>',0}; + + filename = skip_schema(filename); + + /* the format is "helpFile[::/index][>window]" */ + if (index) *index = NULL; + if (window) *window = NULL; + + extra = strstrW(filename, delim2W); + if (extra) + { + memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); + chm_file[extra-filename] = 0; + filename = chm_file; + if (window) + *window = strdupW(extra+1); + } + + extra = strstrW(filename, delimW); + if (extra) + { + if (filename != chm_file); + memcpy(chm_file, filename, (extra-filename)*sizeof(WCHAR)); + chm_file[extra-filename] = 0; + filename = chm_file; + if (index) + *index = strdupW(extra+2); + } GetFullPathNameW(filename, buflen, fullname, NULL); if (GetFileAttributesW(fullname) == INVALID_FILE_ATTRIBUTES) @@ -128,27 +160,16 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: case HH_DISPLAY_SEARCH:{ - static const WCHAR delimW[] = {':',':',0}; HHInfo *info; BOOL res; - WCHAR chm_file[MAX_PATH]; - const WCHAR *index; + const WCHAR *index = NULL; FIXME("Not all HH cases handled correctly\n"); if (!filename) return NULL; - index = strstrW(filename, delimW); - if (index) - { - memcpy(chm_file, filename, (index-filename)*sizeof(WCHAR)); - chm_file[index-filename] = 0; - filename = chm_file; - index += 2; /* advance beyond "::" for calling NavigateToChm() later */ - } - - if (!resolve_filename(filename, fullname, MAX_PATH)) + if (!resolve_filename(filename, fullname, MAX_PATH, &index, NULL)) { WARN("can't find %s\n", debugstr_w(filename)); return 0; @@ -162,6 +183,10 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat index = info->WinType.pszFile; res = NavigateToChm(info, info->pCHMInfo->szFile, index); + + if (index != info->WinType.pszFile) + heap_free((WCHAR*)index); + if(!res) { ReleaseHelpViewer(info); @@ -176,7 +201,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat if (!filename) return NULL; - if (!resolve_filename(filename, fullname, MAX_PATH)) + if (!resolve_filename(filename, fullname, MAX_PATH, NULL, NULL)) { WARN("can't find %s\n", debugstr_w(filename)); return 0; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 1d45201..8e63545 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -189,6 +189,8 @@ BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN; void InitSearch(HHInfo *info, const char *needle) DECLSPEC_HIDDEN; void ReleaseSearch(HHInfo *info) DECLSPEC_HIDDEN; +LPCWSTR skip_schema(LPCWSTR url) DECLSPEC_HIDDEN; + /* memory allocation functions */ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len)

1 0

Jacek Caban : d3dx9math.h: Removed duplicated D3DXMatrixOrthoLH declaration .
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 1522b3ca14a5d93d8b810f2cb3b666c10029ab3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1522b3ca14a5d93d8b810f2cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 29 18:01:11 2011 +0200 d3dx9math.h: Removed duplicated D3DXMatrixOrthoLH declaration. --- include/d3dx9math.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/d3dx9math.h b/include/d3dx9math.h index f842e3e..f28ffd1 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -282,7 +282,6 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiplyTranspose(D3DXMATRIX *pout, CONST D3DXMATRI D3DXMATRIX* WINAPI D3DXMatrixOrthoLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterLH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixOrthoOffCenterRH(D3DXMATRIX *pout, FLOAT l, FLOAT r, FLOAT b, FLOAT t, FLOAT zn, FLOAT zf); -D3DXMATRIX* WINAPI D3DXMatrixOrthoLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixOrthoRH(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovLH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf); D3DXMATRIX* WINAPI D3DXMatrixPerspectiveFovRH(D3DXMATRIX *pout, FLOAT fovy, FLOAT aspect, FLOAT zn, FLOAT zf);

1 0

Jacek Caban : d3d10.idl: Added CD3D10_TEXTURE2D_DESC and CD3D10_BUFFER_DESC declarations.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: a285a08055b9913fda5d7a42b6f9ae5e9c09b6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a285a08055b9913fda5d7a42b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 29 18:01:21 2011 +0200 d3d10.idl: Added CD3D10_TEXTURE2D_DESC and CD3D10_BUFFER_DESC declarations. --- include/d3d10.idl | 70 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 60 insertions(+), 10 deletions(-) diff --git a/include/d3d10.idl b/include/d3d10.idl index 57e8049..e2ac0f6 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -459,6 +459,16 @@ typedef enum D3D10_USAGE { D3D10_USAGE_STAGING, } D3D10_USAGE; +typedef enum D3D10_BIND_FLAG { + D3D10_BIND_VERTEX_BUFFER = 0x1, + D3D10_BIND_INDEX_BUFFER = 0x2, + D3D10_BIND_CONSTANT_BUFFER = 0x4, + D3D10_BIND_SHADER_RESOURCE = 0x8, + D3D10_BIND_STREAM_OUTPUT = 0x10, + D3D10_BIND_RENDER_TARGET = 0x20, + D3D10_BIND_DEPTH_STENCIL = 0x40 +} D3D10_BIND_FLAG; + typedef struct D3D10_BUFFER_DESC { UINT ByteWidth; D3D10_USAGE Usage; @@ -467,6 +477,24 @@ typedef struct D3D10_BUFFER_DESC { UINT MiscFlags; } D3D10_BUFFER_DESC; +cpp_quote("#if !defined(D3D10_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("struct CD3D10_BUFFER_DESC : public D3D10_BUFFER_DESC {") +cpp_quote(" CD3D10_BUFFER_DESC() {}" ) +cpp_quote(" explicit CD3D10_BUFFER_DESC(const D3D10_BUFFER_DESC &o) : D3D10_BUFFER_DESC(o) {}") +cpp_quote(" explicit CD3D10_BUFFER_DESC(UINT byteWidth, UINT bindFlags, D3D10_USAGE usage = D3D10_USAGE_DEFAULT, UINT cpuaccessFlags = 0, UINT miscFlags = 0 ) {") +cpp_quote(" ByteWidth = byteWidth;") +cpp_quote(" Usage = usage;") +cpp_quote(" BindFlags = bindFlags;") +cpp_quote(" CPUAccessFlags = cpuaccessFlags;") +cpp_quote(" MiscFlags = miscFlags;") +cpp_quote(" }") +cpp_quote(" ~CD3D10_BUFFER_DESC() {}") +cpp_quote(" operator const D3D10_BUFFER_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + typedef enum D3D10_MAP { D3D10_MAP_READ = 1, D3D10_MAP_WRITE, @@ -499,6 +527,38 @@ typedef struct D3D10_TEXTURE2D_DESC { UINT MiscFlags; } D3D10_TEXTURE2D_DESC; +cpp_quote("#if !defined(D3D10_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("struct CD3D10_TEXTURE2D_DESC : public D3D10_TEXTURE2D_DESC {") +cpp_quote(" CD3D10_TEXTURE2D_DESC() {}" ) +cpp_quote(" explicit CD3D10_TEXTURE2D_DESC(const D3D10_TEXTURE2D_DESC &o) : D3D10_TEXTURE2D_DESC(o) {}") +cpp_quote(" explicit CD3D10_TEXTURE2D_DESC(DXGI_FORMAT format, UINT width, UINT height,") +cpp_quote(" UINT arraySize = 1,") +cpp_quote(" UINT mipLevels = 0,") +cpp_quote(" UINT bindFlags = D3D10_BIND_SHADER_RESOURCE,") +cpp_quote(" D3D10_USAGE usage = D3D10_USAGE_DEFAULT,") +cpp_quote(" UINT cpuaccessFlags = 0,") +cpp_quote(" UINT sampleCount = 1,") +cpp_quote(" UINT sampleQuality = 0,") +cpp_quote(" UINT miscFlags = 0) {") +cpp_quote(" Width = width;" ) +cpp_quote(" Height = height;" ) +cpp_quote(" MipLevels = mipLevels;" ) +cpp_quote(" ArraySize = arraySize;" ) +cpp_quote(" Format = format;" ) +cpp_quote(" SampleDesc.Count = sampleCount;" ) +cpp_quote(" SampleDesc.Quality = sampleQuality;" ) +cpp_quote(" Usage = usage;" ) +cpp_quote(" BindFlags = bindFlags;" ) +cpp_quote(" CPUAccessFlags = cpuaccessFlags;" ) +cpp_quote(" MiscFlags = miscFlags;" ) +cpp_quote(" }") +cpp_quote(" ~CD3D10_TEXTURE2D_DESC() {}") +cpp_quote(" operator const D3D10_TEXTURE2D_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D10_TEXTURE3D_DESC { UINT Width; UINT Height; @@ -777,16 +837,6 @@ typedef struct D3D10_MAPPED_TEXTURE3D { UINT DepthPitch; } D3D10_MAPPED_TEXTURE3D; -typedef enum D3D10_BIND_FLAG { - D3D10_BIND_VERTEX_BUFFER = 0x1, - D3D10_BIND_INDEX_BUFFER = 0x2, - D3D10_BIND_CONSTANT_BUFFER = 0x4, - D3D10_BIND_SHADER_RESOURCE = 0x8, - D3D10_BIND_STREAM_OUTPUT = 0x10, - D3D10_BIND_RENDER_TARGET = 0x20, - D3D10_BIND_DEPTH_STENCIL = 0x40 -} D3D10_BIND_FLAG; - typedef enum D3D10_CPU_ACCESS_FLAG { D3D10_CPU_ACCESS_WRITE = 0x10000, D3D10_CPU_ACCESS_READ = 0x20000

1 0

Jacek Caban : d3d10_1.idl: Added D3D10_1_SDK_VERSION declaration.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: a8a213dddc486b7dae666a35192190240602ae56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a213dddc486b7dae666a351… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 29 18:01:30 2011 +0200 d3d10_1.idl: Added D3D10_1_SDK_VERSION declaration. --- include/d3d10_1.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index c380c5a..5724b63 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -118,3 +118,5 @@ interface ID3D10Device1 : ID3D10Device D3D10_FEATURE_LEVEL1 GetFeatureLevel(); } + +const UINT D3D10_1_SDK_VERSION = 0x20;

1 0

Piotr Caban : comctl32: Fixed tab elements recognition.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 8c42ac319a5de2a9227b2c80e9c1947a865ccf0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c42ac319a5de2a9227b2c80e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 29 19:12:51 2011 +0200 comctl32: Fixed tab elements recognition. --- dlls/comctl32/tab.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index e4a7adc..c2f2d25 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -2118,9 +2118,10 @@ static void TAB_DrawItem(const TAB_INFO *infoPtr, HDC hdc, INT iItem) partIndex += 4; /* The part also differs on the position of a tab on a line. * "Visually" determining the position works well enough. */ + GetClientRect(infoPtr->hwnd, &r1); if(selectedRect.left == 0) partIndex += 1; - if(selectedRect.right == clRight) + if(selectedRect.right == r1.right) partIndex += 2; if (iItem == infoPtr->iSelected)

1 0

Mariusz Pluciński : shell32/tests: Modify tests of redirection to check more advanced features.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 43769da95e24758a178a0bf8c346aa1da0eb6800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43769da95e24758a178a0bf8c… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 29 19:34:24 2011 +0200 shell32/tests: Modify tests of redirection to check more advanced features. --- dlls/shell32/tests/shellpath.c | 339 ++++++++++++++++++++++++++++++++++------ 1 files changed, 293 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43769da95e24758a178a0…

1 0

Mariusz Pluciński : shell32: Add support of parent folder to RegisterFolder.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 06f706a068c8fc1a41755004ee296aab886f2eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f706a068c8fc1a41755004e… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 29 19:34:44 2011 +0200 shell32: Add support of parent folder to RegisterFolder. --- dlls/shell32/shellpath.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index aed7ceb..33c9908 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3080,6 +3080,7 @@ HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE toke static const WCHAR szCategory[] = {'C','a','t','e','g','o','r','y',0}; static const WCHAR szName[] = {'N','a','m','e',0}; static const WCHAR szRelativePath[] = {'R','e','l','a','t','i','v','e','P','a','t','h',0}; +static const WCHAR szParentFolder[] = {'P','a','r','e','n','t','F','o','l','d','e','r',0}; /* * Internal function to convert known folder identifier to path of registry key @@ -3566,6 +3567,15 @@ static HRESULT WINAPI foldermanager_RegisterFolder( if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szName, 0, REG_SZ, (LPBYTE)pKFD->pszName, (lstrlenW(pKFD->pszName)+1)*sizeof(WCHAR) )); + if(SUCCEEDED(hr) && !IsEqualGUID(&pKFD->fidParent, &GUID_NULL)) + { + WCHAR sParentGuid[39]; + StringFromGUID2(&pKFD->fidParent, sParentGuid, sizeof(sParentGuid)/sizeof(sParentGuid[0])); + + /* this known folder has parent folder */ + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szParentFolder, 0, REG_SZ, (LPBYTE)sParentGuid, sizeof(sParentGuid))); + } + if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) ));

1 0

Mariusz Pluciński : shell32: Add support of parent folder to GetPath.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: 4c0959b9d69d0f37dc77fa792d5cb5818c45b4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c0959b9d69d0f37dc77fa792… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 29 19:35:27 2011 +0200 shell32: Add support of parent folder to GetPath. --- dlls/shell32/shellpath.c | 87 +++++++++++++++++++++++++++++++--------- dlls/shell32/tests/shellpath.c | 5 -- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 33c9908..6328ec5 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3087,20 +3087,27 @@ static const WCHAR szParentFolder[] = {'P','a','r','e','n','t','F','o','l','d',' * associated with known folder. * * Parameters: - * rfid [I] pointer to known folder identifier + * rfid [I] pointer to known folder identifier (may be NULL) + * lpStringGuid [I] string with known folder identifier (used when rfid is NULL) * lpPath [O] place to store string address. String should be * later freed using HeapFree(GetProcessHeap(),0, ... ) */ -static HRESULT get_known_folder_registry_path(REFKNOWNFOLDERID rfid, LPWSTR *lpPath) +static HRESULT get_known_folder_registry_path( + REFKNOWNFOLDERID rfid, + LPWSTR lpStringGuid, + LPWSTR *lpPath) { static const WCHAR sBackslash[] = {'\\',0}; HRESULT hr = S_OK; int length; WCHAR sGuid[50]; - TRACE("(%s, %p)\n", debugstr_guid(rfid), lpPath); + TRACE("(%s, %s, %p)\n", debugstr_guid(rfid), debugstr_w(lpStringGuid), lpPath); - StringFromGUID2(rfid, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + if(rfid) + StringFromGUID2(rfid, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + else + lstrcpyW(sGuid, lpStringGuid); length = lstrlenW(szKnownFolderDescriptions)+51; *lpPath = HeapAlloc(GetProcessHeap(), 0, length*sizeof(WCHAR)); @@ -3187,7 +3194,7 @@ static HRESULT knownfolder_set_id( knownfolder->id = *kfid; /* check is it registry-registered folder */ - hr = get_known_folder_registry_path(kfid, &knownfolder->registryPath); + hr = get_known_folder_registry_path(kfid, NULL, &knownfolder->registryPath); if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, 0, 0, &hKey)); @@ -3249,13 +3256,64 @@ static HRESULT WINAPI knownfolder_GetShellItem( return E_NOTIMPL; } +static HRESULT get_known_folder_path( + LPWSTR registryPath, + LPWSTR *ppszPath) +{ + static const WCHAR sBackslash[] = {'\\',0}; + HRESULT hr; + DWORD dwSize, dwType; + WCHAR path[MAX_PATH] = {0}; + WCHAR parentGuid[39]; + LPWSTR parentRegistryPath, parentPath; + + TRACE("(%s, %p)\n", debugstr_w(registryPath), ppszPath); + + /* check if folder has parent */ + dwSize = sizeof(parentGuid); + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, szParentFolder, RRF_RT_REG_SZ, &dwType, parentGuid, &dwSize)); + if(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) hr = S_FALSE; + + if(hr == S_OK) + { + /* get parent's known folder path (recursive) */ + get_known_folder_registry_path(NULL, parentGuid, &parentRegistryPath); + + hr = get_known_folder_path(parentRegistryPath, &parentPath); + + lstrcatW(path, parentPath); + lstrcatW(path, sBackslash); + + HeapFree(GetProcessHeap(), 0, parentRegistryPath); + HeapFree(GetProcessHeap(), 0, parentPath); + } + + /* read the relative path from registry */ + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, szRelativePath, RRF_RT_REG_SZ, &dwType, NULL, &dwSize)); + + if(SUCCEEDED(hr)) + { + *ppszPath = CoTaskMemAlloc(dwSize+(lstrlenW(path)+1)*sizeof(WCHAR)); + if(!*ppszPath) hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + lstrcpyW(*ppszPath, path); + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, registryPath, szRelativePath, RRF_RT_REG_SZ, &dwType, *ppszPath + lstrlenW(path), &dwSize)); + } + + TRACE("returning path: %s\n", debugstr_w(*ppszPath)); + return hr; +} + static HRESULT WINAPI knownfolder_GetPath( IKnownFolder *iface, DWORD dwFlags, LPWSTR *ppszPath) { struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); - DWORD dwSize, dwType; HRESULT hr; TRACE("(%p, 0x%08x, %p)\n", knownfolder, dwFlags, ppszPath); @@ -3263,16 +3321,7 @@ static HRESULT WINAPI knownfolder_GetPath( /* if this is registry-registered known folder, get path from registry */ if(knownfolder->registryPath) { - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szRelativePath, RRF_RT_REG_SZ, &dwType, NULL, &dwSize)); - - if(SUCCEEDED(hr)) - { - *ppszPath = CoTaskMemAlloc(dwSize); - if(!*ppszPath) hr = E_OUTOFMEMORY; - } - - if(SUCCEEDED(hr)) - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szRelativePath, RRF_RT_REG_SZ, &dwType, *ppszPath, &dwSize)); + hr = get_known_folder_path(knownfolder->registryPath, ppszPath); } /* in other case, use older way */ else @@ -3495,7 +3544,7 @@ static BOOL is_knownfolder( struct foldermanager *fm, const KNOWNFOLDERID *id ) for (i = 0; i < fm->num_ids; i++) if (IsEqualGUID( &fm->ids[i], id )) return TRUE; - hr = get_known_folder_registry_path(id, &registryPath); + hr = get_known_folder_registry_path(id, NULL, &registryPath); if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegOpenKeyExW(HKEY_LOCAL_MACHINE, registryPath, 0, 0, &hKey)); @@ -3550,7 +3599,7 @@ static HRESULT WINAPI foldermanager_RegisterFolder( LPWSTR registryPath = NULL; TRACE("(%p, %s, %p)\n", iface, debugstr_guid(rfid), pKFD); - hr = get_known_folder_registry_path(rfid, &registryPath); + hr = get_known_folder_registry_path(rfid, NULL, &registryPath); TRACE("registry path: %s\n", debugstr_w(registryPath)); if(SUCCEEDED(hr)) @@ -3594,7 +3643,7 @@ static HRESULT WINAPI foldermanager_UnregisterFolder( LPWSTR registryPath = NULL; TRACE("(%p, %s)\n", iface, debugstr_guid(rfid)); - hr = get_known_folder_registry_path(rfid, &registryPath); + hr = get_known_folder_registry_path(rfid, NULL, &registryPath); if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath)); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ff47951..3623029 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1226,7 +1226,6 @@ static void test_knownFolders(void) /* check sub folder path */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath); @@ -1303,7 +1302,6 @@ static void test_knownFolders(void) /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath); @@ -1348,7 +1346,6 @@ static void test_knownFolders(void) /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath); @@ -1389,7 +1386,6 @@ static void test_knownFolders(void) /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath); @@ -1433,7 +1429,6 @@ static void test_knownFolders(void) /* verify sub folder */ hr = IKnownFolder_GetPath(subFolder, 0, &folderPath); ok(hr == S_OK, "failed to get known folder path: 0x%08x\n", hr); - todo_wine ok(lstrcmpiW(folderPath, sSubFolderPath)==0, "invalid known folder path retrieved: \"%s\" when \"%s\" was expected\n", wine_dbgstr_w(folderPath), wine_dbgstr_w(sSubFolderPath)); CoTaskMemFree(folderPath);

1 0

Mariusz Pluciński : shell32: Add support of known folders redirection to Redirect.
by Alexandre Julliard 29 Jun '11

29 Jun '11

Module: wine Branch: master Commit: e554ee7fb427551b14ea94a1a8d46992f2249b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e554ee7fb427551b14ea94a1a… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Jun 29 19:37:06 2011 +0200 shell32: Add support of known folders redirection to Redirect. --- dlls/shell32/shellpath.c | 87 ++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shellpath.c | 6 --- 2 files changed, 84 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 6328ec5..e107f0e 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -817,6 +817,7 @@ static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i' static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; static const WCHAR szKnownFolderDescriptions[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','F','o','l','d','e','r','D','e','s','c','r','i','p','t','i','o','n','s','\0'}; +static const WCHAR szKnownFolderRedirections[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s',0}; static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; typedef enum _CSIDL_Type { @@ -3124,6 +3125,88 @@ static HRESULT get_known_folder_registry_path( return hr; } +/* + * Internal function to get place where folder redirection information are stored. + * + * Parameters: + * rfid [I] pointer to known folder identifier (may be NULL) + * rootKey [O] root key where the redirection information are stored + * It can be HKLM for COMMON folders, and HKCU for PERUSER folders. + * However, besides root key, path is always that same, and is stored + * as "szKnownFolderRedirections" constant + */ +static HRESULT WINAPI get_known_folder_redirection_place( + REFKNOWNFOLDERID rfid, + HKEY *rootKey) +{ + HRESULT hr; + LPWSTR lpRegistryPath = NULL; + KF_CATEGORY category; + DWORD dwSize; + + /* first, get known folder's category */ + hr = get_known_folder_registry_path(rfid, NULL, &lpRegistryPath); + + if(SUCCEEDED(hr)) + { + dwSize = sizeof(category); + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, lpRegistryPath, szCategory, RRF_RT_DWORD, NULL, &category, &dwSize)); + } + + if(SUCCEEDED(hr)) + { + if(category == KF_CATEGORY_COMMON) + { + *rootKey = HKEY_LOCAL_MACHINE; + hr = S_OK; + } + else if(category == KF_CATEGORY_PERUSER) + { + *rootKey = HKEY_CURRENT_USER; + hr = S_OK; + } + else + hr = E_FAIL; + } + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + return hr; +} + +static HRESULT WINAPI redirect_known_folder( + REFKNOWNFOLDERID rfid, + HWND hwnd, + KF_REDIRECT_FLAGS flags, + LPCWSTR pszTargetPath, + UINT cFolders, + KNOWNFOLDERID const *pExclusion, + LPWSTR *ppszError) +{ + HRESULT hr; + HKEY rootKey = HKEY_LOCAL_MACHINE, hKey; + WCHAR sGuid[39]; + TRACE("(%s, %p, 0x%08x, %s, %d, %p, %p)\n", debugstr_guid(rfid), hwnd, flags, debugstr_w(pszTargetPath), cFolders, pExclusion, ppszError); + + /* get path to redirection storage */ + hr = get_known_folder_redirection_place(rfid, &rootKey); + + /* write redirection information */ + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegCreateKeyExW(rootKey, szKnownFolderRedirections, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL)); + + if(SUCCEEDED(hr)) + { + StringFromGUID2(rfid, sGuid, sizeof(sGuid)/sizeof(sGuid[0])); + + hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, sGuid, 0, REG_SZ, (LPBYTE)pszTargetPath, (lstrlenW(pszTargetPath)+1)*sizeof(WCHAR))); + + RegCloseKey(hKey); + } + + return hr; +} + + struct knownfolder { const struct IKnownFolderVtbl *vtbl; @@ -3681,9 +3764,7 @@ static HRESULT WINAPI foldermanager_Redirect( KNOWNFOLDERID const *pExclusion, LPWSTR *ppszError) { - FIXME("%p, %p, 0x%08x, %s, %u, %p, %p\n", rfid, hwnd, flags, - debugstr_w(pszTargetPath), cFolders, pExclusion, ppszError); - return E_NOTIMPL; + return redirect_known_folder(rfid, hwnd, flags, pszTargetPath, cFolders, pExclusion, ppszError); } static const struct IKnownFolderManagerVtbl foldermanager_vtbl = diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3623029..e99b554 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1232,7 +1232,6 @@ static void test_knownFolders(void) /* try to redirect Example to Temp\Example2 */ hr = IKnownFolderManager_Redirect(mgr, &newFolderId, NULL, 0, sExample2Path, 0, NULL, &errorMsg); - todo_wine ok(hr == S_OK, "failed to redirect known folder: 0x%08x, errorMsg: %s\n", hr, wine_dbgstr_w(errorMsg)); /* verify */ @@ -1268,7 +1267,6 @@ static void test_knownFolders(void) /* again perform that same redirection */ hr = IKnownFolderManager_Redirect(mgr, &newFolderId, NULL, 0, sExample2Path, 0, NULL, &errorMsg); - todo_wine ok(hr == S_OK, "failed to redirect known folder: 0x%08x, errorMsg: %s\n", hr, wine_dbgstr_w(errorMsg)); /* verify sub folder. It should succeed now, as the required sub folder exists */ @@ -1312,7 +1310,6 @@ static void test_knownFolders(void) /* do that same redirection, but try to exclude sub-folder */ hr = IKnownFolderManager_Redirect(mgr, &newFolderId, NULL, 0, sExample2Path, 1, &subFolderId, &errorMsg); - todo_wine ok(hr == S_OK, "failed to redirect known folder: 0x%08x, errorMsg: %s\n", hr, wine_dbgstr_w(errorMsg)); /* verify */ @@ -1352,7 +1349,6 @@ static void test_knownFolders(void) /* do that same redirection again, but set it to copy content. It should also copy the sub folder, so checking it would succeed now */ hr = IKnownFolderManager_Redirect(mgr, &newFolderId, NULL, KF_REDIRECT_COPY_CONTENTS, sExample2Path, 0, NULL, &errorMsg); - todo_wine ok(hr == S_OK, "failed to redirect known folder: 0x%08x, errorMsg: %s\n", hr, wine_dbgstr_w(errorMsg)); /* verify */ @@ -1392,7 +1388,6 @@ static void test_knownFolders(void) /* redirect again, set it to copy content and remove originals */ hr = IKnownFolderManager_Redirect(mgr, &newFolderId, NULL, KF_REDIRECT_COPY_CONTENTS | KF_REDIRECT_DEL_SOURCE_CONTENTS, sExample2Path, 0, NULL, &errorMsg); - todo_wine ok(hr == S_OK, "failed to redirect known folder: 0x%08x, errorMsg: %s\n", hr, wine_dbgstr_w(errorMsg)); /* verify */ @@ -1417,7 +1412,6 @@ static void test_knownFolders(void) /* redirect (with copy) to original path */ hr = IKnownFolderManager_Redirect(mgr, &newFolderId, NULL, KF_REDIRECT_COPY_CONTENTS, sExamplePath, 0, NULL, &errorMsg); - todo_wine ok(hr == S_OK, "failed to redirect known folder: 0x%08x, errorMsg: %s\n", hr, wine_dbgstr_w(errorMsg)); /* verify */

1 0