* implement retrieving column names for nethood & font shell folder

* make column names mui aware

svn path=/trunk/; revision=35157
This commit is contained in:
Johannes Anderwald 2008-08-07 08:55:34 +00:00
parent 7fa9c85299
commit 4ec67d948c
31 changed files with 210 additions and 9 deletions

View file

@ -595,8 +595,13 @@ BEGIN
IDS_SHV_COLUMN9 "Çàáåëåæêè"
IDS_SHV_COLUMN10 "Ñîáñòâåíèê"
IDS_SHV_COLUMN11 "Ãðóïà"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Ïúðâîíà÷àëíî ìÿñòî"
IDS_SHV_COLUMN_DELDATE "Äàòà íà èçòðèâàíå"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
// special folders
IDS_DESKTOP "Ðàáîòíà ïëîù"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -594,8 +594,13 @@ BEGIN
IDS_SHV_COLUMN9 "Komentáø"
IDS_SHV_COLUMN10 "Vlastník"
IDS_SHV_COLUMN11 "Skupina"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Pùvodní umístìní"
IDS_SHV_COLUMN_DELDATE "Odstranìno"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Plocha"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -594,8 +594,13 @@ BEGIN
IDS_SHV_COLUMN9 "Kommentar"
IDS_SHV_COLUMN10 "Besitzer"
IDS_SHV_COLUMN11 "Gruppe"
IDS_SHV_COLUMN12 "Dateinamen"
IDS_SHV_COLUMN13 "Kategorie"
IDS_SHV_COLUMN_DELFROM "Ursprung"
IDS_SHV_COLUMN_DELDATE "Gelöscht am"
IDS_SHV_COLUMN_FONTTYPE "Schriftartentyp"
IDS_SHV_COLUMN_WORKGROUP "Arbeitsgruppe"
IDS_SHV_NETWORKLOCATION "Netzwerkstandort"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Ó÷üëéá"
IDS_SHV_COLUMN10 "ÊÜôï÷ïò"
IDS_SHV_COLUMN11 "ÏìÜäá"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Áñ÷éêÞ èÝóç"
IDS_SHV_COLUMN_DELDATE "Çìåñïìçíßá äéáãñáöÞò"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "ÅðéöÜíåéá åñãáóßáò"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -593,8 +593,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -594,8 +594,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comentarios"
IDS_SHV_COLUMN10 "Propietario"
IDS_SHV_COLUMN11 "Grupo"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Ubicación original"
IDS_SHV_COLUMN_DELDATE "Fecha de eliminación"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Escritorio"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Kommentit"
IDS_SHV_COLUMN10 "Omistaja"
IDS_SHV_COLUMN11 "Ryhmä"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Työpöytä"

View file

@ -596,8 +596,13 @@ BEGIN
IDS_SHV_COLUMN9 "Commentaires"
IDS_SHV_COLUMN10 "Propriétaire"
IDS_SHV_COLUMN11 "Groupe"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Localisation d'origine"
IDS_SHV_COLUMN_DELDATE "Date de suppression"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Bureau"

View file

@ -595,8 +595,13 @@ BEGIN
IDS_SHV_COLUMN9 "Megjegyzések"
IDS_SHV_COLUMN10 "Tulajdonos"
IDS_SHV_COLUMN11 "Csoport"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Asztal"

View file

@ -593,8 +593,13 @@ BEGIN
IDS_SHV_COLUMN9 "Commenti"
IDS_SHV_COLUMN10 "Proprietario"
IDS_SHV_COLUMN11 "Gruppo"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Posizione originale"
IDS_SHV_COLUMN_DELDATE "Data di cancellazione"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "コメント"
IDS_SHV_COLUMN10 "所有者"
IDS_SHV_COLUMN11 "グループ"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "デスクトップ"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -571,8 +571,13 @@ BEGIN
IDS_SHV_COLUMN9 "Kommentarer"
IDS_SHV_COLUMN10 "Eier"
IDS_SHV_COLUMN11 "Gruppe"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Opprinnelig plassering"
IDS_SHV_COLUMN_DELDATE "Dato slettet"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Skrivebord"

View file

@ -598,8 +598,13 @@ BEGIN
IDS_SHV_COLUMN9 "Komentarz"
IDS_SHV_COLUMN10 "W³aœciciel"
IDS_SHV_COLUMN11 "Grupa"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Lokacja oryginalna"
IDS_SHV_COLUMN_DELDATE "Data usuniêcia"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Pulpit"

View file

@ -594,8 +594,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comentários"
IDS_SHV_COLUMN10 "Dono"
IDS_SHV_COLUMN11 "Grupo"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Área de trabalho"

View file

@ -594,8 +594,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comentários"
IDS_SHV_COLUMN10 "Dono"
IDS_SHV_COLUMN11 "Grupo"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Ambiente de trabalho"

View file

@ -591,8 +591,13 @@ BEGIN
IDS_SHV_COLUMN9 "Êîììåíòàðèé"
IDS_SHV_COLUMN10 "Âëàäåëåö"
IDS_SHV_COLUMN11 "Ãðóïïà"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Èçíà÷àëüíîå ðàñïîëîæåíèå"
IDS_SHV_COLUMN_DELDATE "Äàòà óäàëåíèÿ"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Ðàáî÷èé ñòîë"

View file

@ -598,8 +598,13 @@ BEGIN
IDS_SHV_COLUMN9 "Poznámky" //Comments
IDS_SHV_COLUMN10 "Vlastník"
IDS_SHV_COLUMN11 "Skupina"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Pôvod" //Pôvodné umiestnenie
IDS_SHV_COLUMN_DELDATE "Odstránený" //Dátum zmazania
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Pracovná plocha"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -592,8 +592,13 @@ BEGIN
IDS_SHV_COLUMN9 "Açýklamalar"
IDS_SHV_COLUMN10 "Sahip"
IDS_SHV_COLUMN11 "Grup"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Özgün konum"
IDS_SHV_COLUMN_DELDATE "Silinme tarihi"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Masaüstü"

View file

@ -593,8 +593,13 @@ BEGIN
IDS_SHV_COLUMN9 "Ïðèì³òêà"
IDS_SHV_COLUMN10 "Âëàñíèê"
IDS_SHV_COLUMN11 "Ãðóïà"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Âèõ³äíå ðîçòàøóâàííÿ"
IDS_SHV_COLUMN_DELDATE "Äàòà âèäàëåííÿ"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Ðîáî÷èé ñò³ë"

View file

@ -581,8 +581,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "×ÀÃæ"

View file

@ -593,8 +593,13 @@ BEGIN
IDS_SHV_COLUMN9 "Comments"
IDS_SHV_COLUMN10 "Owner"
IDS_SHV_COLUMN11 "Group"
IDS_SHV_COLUMN12 "Filename"
IDS_SHV_COLUMN13 "Category"
IDS_SHV_COLUMN_DELFROM "Original location"
IDS_SHV_COLUMN_DELDATE "Date deleted"
IDS_SHV_COLUMN_FONTTYPE "Fonttype"
IDS_SHV_COLUMN_WORKGROUP "Workgroup"
IDS_SHV_NETWORKLOCATION "Network Location"
/* special folders */
IDS_DESKTOP "Desktop"

View file

@ -72,11 +72,19 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2)
static shvheader FontsSFHeader[] = {
{IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
{IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}
{IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
{IDS_SHV_COLUMN_FONTTYPE , SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
{IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
{IDS_SHV_COLUMN12, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}
};
#define FontsSHELLVIEWCOLUMNS 2
#define COLUMN_NAME 0
#define COLUMN_TYPE 1
#define COLUMN_SIZE 2
#define COLUMN_FILENAME 3
#define FontsSHELLVIEWCOLUMNS (4)
/**************************************************************************
* ISF_Fonts_Constructor
@ -516,6 +524,27 @@ static HRESULT WINAPI ISF_Fonts_fnGetDetailsOf (IShellFolder2 * iface,
LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
{
IGenericSFImpl *This = (IGenericSFImpl *)iface;
WCHAR buffer[MAX_PATH] = {0};
HRESULT hr = E_FAIL;
TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, psd);
if (iColumn >= FontsSHELLVIEWCOLUMNS)
return E_FAIL;
psd->fmt = FontsSFHeader[iColumn].fmt;
psd->cxChar = FontsSFHeader[iColumn].cxChar;
if (pidl == NULL)
{
psd->str.uType = STRRET_WSTR;
if (LoadStringW(shell32_hInstance, FontsSFHeader[iColumn].colnameid, buffer, MAX_PATH))
hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
return hr;
}
if (iColumn == COLUMN_NAME)
return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str);
FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);

View file

@ -45,6 +45,7 @@
#include "wine/debug.h"
#include "debughlp.h"
#include "shfldr.h"
#include "shlwapi.h"
WINE_DEFAULT_DEBUG_CHANNEL (shell);
@ -73,11 +74,18 @@ static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2)
static shvheader NetworkPlacesSFHeader[] = {
{IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
{IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}
{IDS_SHV_COLUMN8, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
{IDS_SHV_COLUMN13, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10},
{IDS_SHV_COLUMN_WORKGROUP, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15},
{IDS_SHV_NETWORKLOCATION, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}
};
#define NETWORKPLACESSHELLVIEWCOLUMNS 2
#define COLUMN_NAME 0
#define COLUMN_CATEGORY 1
#define COLUMN_WORKGROUP 2
#define COLUMN_NETLOCATION 3
#define NETWORKPLACESSHELLVIEWCOLUMNS 4
/**************************************************************************
* ISF_NetworkPlaces_Constructor
@ -209,11 +217,11 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnEnumObjects (IShellFolder2 * iface,
TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This,
hwndOwner, dwFlags, ppEnumIDList);
*ppEnumIDList = IEnumIDList_Constructor();
*ppEnumIDList = NULL; //IEnumIDList_Constructor();
TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList);
return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY;
return S_FALSE;
// return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY;
}
/**************************************************************************
@ -517,6 +525,25 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetDetailsOf (IShellFolder2 * iface,
LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd)
{
IGenericSFImpl *This = (IGenericSFImpl *)iface;
WCHAR buffer[MAX_PATH] = {0};
HRESULT hr = E_FAIL;
if (iColumn >= NETWORKPLACESSHELLVIEWCOLUMNS)
return E_FAIL;
psd->fmt = NetworkPlacesSFHeader[iColumn].fmt;
psd->cxChar = NetworkPlacesSFHeader[iColumn].cxChar;
if (pidl == NULL)
{
psd->str.uType = STRRET_WSTR;
if (LoadStringW(shell32_hInstance, NetworkPlacesSFHeader[iColumn].colnameid, buffer, MAX_PATH))
hr = SHStrDupW(buffer, &psd->str.u.pOleStr);
return hr;
}
if (iColumn == COLUMN_NAME)
return IShellFolder2_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &psd->str);
FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd);

View file

@ -145,6 +145,11 @@
#define IDS_FILE_FOLDER 307
#define IDS_CREATELINK 308
#define IDS_INSTALLNEWFONT 309
#define IDS_SHV_COLUMN_FONTTYPE 310
#define IDS_SHV_COLUMN12 311
#define IDS_SHV_COLUMN13 312
#define IDS_SHV_COLUMN_WORKGROUP 313
#define IDS_SHV_NETWORKLOCATION 314
/* Note: this string is referenced from the registry */
#define IDS_RECYCLEBIN_FOLDER_NAME 8964