Page MenuHome
Files F2147

bug_SHGetFolderPath_win98.patch
Public
Actions

bug_SHGetFolderPath_win98.patch
View Options

? source/creator/winbuildinfo.h
? tools/Blender.pyc
? tools/__init__.pyc
? tools/bcolors.pyc
? tools/btools.pyc
Index: extern/qhull/Qhull-go.pif
===================================================================
RCS file: /cvsroot/bf-blender/blender/extern/qhull/Qhull-go.pif,v
retrieving revision 1.1
diff -u -r1.1 Qhull-go.pif
Binary files /tmp/cvsx6yki9 and Qhull-go.pif differ
Index: source/blender/src/usiblender.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/usiblender.c,v
retrieving revision 1.103
diff -u -r1.103 usiblender.c
--- source/blender/src/usiblender.c 20 Mar 2006 17:25:42 -0000 1.103
+++ source/blender/src/usiblender.c 23 Apr 2006 12:30:19 -0000
@@ -38,7 +38,7 @@
#include <string.h>
#ifdef WIN32
-#include <shlobj.h> /* SHGetSpecialFolderPath, has to be done before BLI_winstuff for some reasons... */
+#define WIN32_SKIP_HKEY_PROTECTION
#include "BLI_winstuff.h"
#include <process.h> /* getpid */
#else
@@ -446,7 +446,6 @@
}
/***/
-
static void readBlog(void)
{
char name[FILE_MAXDIR+FILE_MAXFILE], filename[FILE_MAXFILE];
@@ -470,6 +469,9 @@
char folder[MAX_PATH];
char tmps[4];
int i;
+ HKEY hkey;
+ DWORD dwType, dwSize;
+
tmp= GetLogicalDrives();
@@ -485,13 +487,20 @@
}
/* Adding Desktop and My Documents */
- fsmenu_append_seperator();
- SHGetFolderPath(0, CSIDL_PERSONAL,NULL, 0, folder);
- fsmenu_insert_entry(folder, 0);
- SHGetFolderPath(0, CSIDL_DESKTOPDIRECTORY,NULL, 0, folder);
- fsmenu_insert_entry(folder, 0);
- fsmenu_append_seperator();
+ if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders",0,KEY_READ,&hkey)==ERROR_SUCCESS){
+ dwType = REG_EXPAND_SZ;
+ dwSize = MAX_PATH;
+ if(RegQueryValueEx(hkey, TEXT("Personal"),NULL, NULL,(LPBYTE)folder, &dwSize)== NO_ERROR){
+ fsmenu_append_seperator();
+ fsmenu_insert_entry(folder, 0);
+ }
+ if(RegQueryValueEx(hkey, TEXT("Desktop"),NULL, NULL,(LPBYTE)folder, &dwSize)== NO_ERROR){
+ fsmenu_insert_entry(folder, 0);
+ fsmenu_append_seperator();
+ }
+ }
+ RegCloseKey(hkey);
}
#endif

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
a3/38/cb65e8edc626671389f26aa78367

Event Timeline