Tera TermRevision: 9426
https://osdn.net/projects/ttssh2/scm/svn/commits/9426
Author: zmatsuo
Date: 2021-09-19 00:47:37 +0900 (Sun, 19 Sep 2021)
Log Message:
-----------
_SHGetKnownFolderPath() の対応引数を追加
- Tera Term で使っている分は追加
Modified Paths:
--------------
trunk/teraterm/common/compat_win.cpp
trunk/teraterm/common/ttknownfolders.h
-------------- next part --------------
Modified: trunk/teraterm/common/compat_win.cpp
===================================================================
--- trunk/teraterm/common/compat_win.cpp 2021-09-18 15:47:27 UTC (rev 9425)
+++ trunk/teraterm/common/compat_win.cpp 2021-09-18 15:47:37 UTC (rev 9426)
@@ -505,13 +505,26 @@
static BOOL GetCSIDLFromFKNOWNFOLDERID(REFKNOWNFOLDERID rfid, int *csidl)
{
- // TODO GetSpecialFolder() ttmlib.c \x82\xF0\x83J\x83o\x81[\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB7\x82\xE9
static const struct {
REFKNOWNFOLDERID rfid;
int csidl;
} list[] = {
+ { FOLDERID_PublicDesktop, CSIDL_COMMON_DESKTOPDIRECTORY },
+ { FOLDERID_CommonStartMenu, CSIDL_COMMON_STARTMENU },
+ { FOLDERID_CommonPrograms, CSIDL_COMMON_PROGRAMS },
+ { FOLDERID_CommonStartup, CSIDL_COMMON_STARTUP },
{ FOLDERID_Desktop, CSIDL_DESKTOPDIRECTORY },
+ { FOLDERID_Favorites, CSIDL_FAVORITES },
+ { FOLDERID_Fonts, CSIDL_FONTS },
{ FOLDERID_Documents, CSIDL_MYDOCUMENTS }, // %USERPROFILE%\My Documents
+ { FOLDERID_NetHood, CSIDL_NETHOOD },
+ { FOLDERID_PrintHood, CSIDL_PRINTHOOD },
+ { FOLDERID_Programs, CSIDL_PROGRAMS },
+ { FOLDERID_Recent, CSIDL_RECENT },
+ { FOLDERID_SendTo, CSIDL_SENDTO },
+ { FOLDERID_StartMenu, CSIDL_STARTMENU },
+ { FOLDERID_Startup, CSIDL_STARTUP },
+ { FOLDERID_Templates, CSIDL_TEMPLATES },
{ FOLDERID_LocalAppData, CSIDL_LOCAL_APPDATA },
{ FOLDERID_Downloads, CSIDL_MYDOCUMENTS }, // %USERPROFILE%\Downloads, My Documents
};
Modified: trunk/teraterm/common/ttknownfolders.h
===================================================================
--- trunk/teraterm/common/ttknownfolders.h 2021-09-18 15:47:27 UTC (rev 9425)
+++ trunk/teraterm/common/ttknownfolders.h 2021-09-18 15:47:37 UTC (rev 9426)
@@ -44,7 +44,21 @@
#define DEFINE_KNOWN_FOLDER(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) EXTERN_C const GUID name
#endif
-DEFINE_KNOWN_FOLDER(FOLDERID_Desktop, 0xB4BFCC3A, 0xDB2C, 0x424C, 0xB0, 0x29, 0x7F, 0xE9, 0x9A, 0x87, 0xC6, 0x41);
-DEFINE_KNOWN_FOLDER(FOLDERID_Documents, 0xFDD39AD0, 0x238F, 0x46AF, 0xAD, 0xB4, 0x6C, 0x85, 0x48, 0x03, 0x69, 0xC7);
-DEFINE_KNOWN_FOLDER(FOLDERID_LocalAppData, 0xF1B32785, 0x6FBA, 0x4FCF, 0x9D, 0x55, 0x7B, 0x8E, 0x7F, 0x15, 0x70, 0x91);
-DEFINE_KNOWN_FOLDER(FOLDERID_Downloads, 0x374de290, 0x123f, 0x4565, 0x91, 0x64, 0x39, 0xc4, 0x92, 0x5e, 0x46, 0x7b);
+DEFINE_KNOWN_FOLDER (FOLDERID_PublicDesktop, 0xc4aa340d, 0xf20f, 0x4863, 0xaf, 0xef, 0xf8, 0x7e, 0xf2, 0xe6, 0xba, 0x25);
+DEFINE_KNOWN_FOLDER (FOLDERID_CommonStartMenu, 0xa4115719, 0xd62e, 0x491d, 0xaa, 0x7c, 0xe7, 0x4b, 0x8b, 0xe3, 0xb0, 0x67);
+DEFINE_KNOWN_FOLDER (FOLDERID_CommonPrograms, 0x0139d44e, 0x6afe, 0x49f2, 0x86, 0x90, 0x3d, 0xaf, 0xca, 0xe6, 0xff, 0xb8);
+DEFINE_KNOWN_FOLDER (FOLDERID_CommonStartup, 0x82a5ea35, 0xd9cd, 0x47c5, 0x96, 0x29, 0xe1, 0x5d, 0x2f, 0x71, 0x4e, 0x6e);
+DEFINE_KNOWN_FOLDER (FOLDERID_Desktop, 0xB4BFCC3A, 0xDB2C, 0x424C, 0xB0, 0x29, 0x7F, 0xE9, 0x9A, 0x87, 0xC6, 0x41);
+DEFINE_KNOWN_FOLDER (FOLDERID_Favorites, 0x1777f761, 0x68ad, 0x4d8a, 0x87, 0xbd, 0x30, 0xb7, 0x59, 0xfa, 0x33, 0xdd);
+DEFINE_KNOWN_FOLDER (FOLDERID_Fonts, 0xfd228cb7, 0xae11, 0x4ae3, 0x86, 0x4c, 0x16, 0xf3, 0x91, 0x0a, 0xb8, 0xfe);
+DEFINE_KNOWN_FOLDER (FOLDERID_Documents, 0xFDD39AD0, 0x238F, 0x46AF, 0xAD, 0xB4, 0x6C, 0x85, 0x48, 0x03, 0x69, 0xC7);
+DEFINE_KNOWN_FOLDER (FOLDERID_NetHood, 0xc5abbf53, 0xe17f, 0x4121, 0x89, 0x00, 0x86, 0x62, 0x6f, 0xc2, 0xc9, 0x73);
+DEFINE_KNOWN_FOLDER (FOLDERID_PrintHood, 0x9274bd8d, 0xcfd1, 0x41c3, 0xb3, 0x5e, 0xb1, 0x3f, 0x55, 0xa7, 0x58, 0xf4);
+DEFINE_KNOWN_FOLDER (FOLDERID_Programs, 0xa77f5d77, 0x2e2b, 0x44c3, 0xa6, 0xa2, 0xab, 0xa6, 0x01, 0x05, 0x4a, 0x51);
+DEFINE_KNOWN_FOLDER (FOLDERID_Recent, 0xae50c081, 0xebd2, 0x438a, 0x86, 0x55, 0x8a, 0x09, 0x2e, 0x34, 0x98, 0x7a);
+DEFINE_KNOWN_FOLDER (FOLDERID_SendTo, 0x8983036c, 0x27c0, 0x404b, 0x8f, 0x08, 0x10, 0x2d, 0x10, 0xdc, 0xfd, 0x74);
+DEFINE_KNOWN_FOLDER (FOLDERID_StartMenu, 0x625b53c3, 0xab48, 0x4ec1, 0xba, 0x1f, 0xa1, 0xef, 0x41, 0x46, 0xfc, 0x19);
+DEFINE_KNOWN_FOLDER (FOLDERID_Startup, 0xb97d20bb, 0xf46a, 0x4c97, 0xba, 0x10, 0x5e, 0x36, 0x08, 0x43, 0x08, 0x54);
+DEFINE_KNOWN_FOLDER (FOLDERID_Templates, 0xa63293e8, 0x664e, 0x48db, 0xa0, 0x79, 0xdf, 0x75, 0x9e, 0x05, 0x09, 0xf7);
+DEFINE_KNOWN_FOLDER (FOLDERID_LocalAppData, 0xF1B32785, 0x6FBA, 0x4FCF, 0x9D, 0x55, 0x7B, 0x8E, 0x7F, 0x15, 0x70, 0x91);
+DEFINE_KNOWN_FOLDER (FOLDERID_Downloads, 0x374de290, 0x123f, 0x4565, 0x91, 0x64, 0x39, 0xc4, 0x92, 0x5e, 0x46, 0x7b);