1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
diff -urN wine-1.9.7-orig/dlls/krnl386.exe16/int21.c wine-1.9.7/dlls/krnl386.exe16/int21.c
--- wine-1.9.7-orig/dlls/krnl386.exe16/int21.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/krnl386.exe16/int21.c 2016-04-10 02:33:20 +0900
@@ -35,6 +35,7 @@
# include <unistd.h>
#endif
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
@@ -842,11 +843,13 @@
*/
static HANDLE INT21_CreateMagicDeviceHandle( LPCWSTR name )
{
+ HANDLE ret;
+ NTSTATUS status;
+
+#if 0
static const WCHAR prefixW[] = {'\\','?','?','\\','u','n','i','x'};
const char *dir = wine_get_server_dir();
int len;
- HANDLE ret;
- NTSTATUS status;
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
IO_STATUS_BLOCK io;
@@ -875,12 +878,16 @@
status = NtCreateFile( &ret, GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF,
FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 );
+ RtlFreeUnicodeString( &nameW );
+#else
+ status = STATUS_NOT_IMPLEMENTED;
+#endif
+
if (status)
{
ret = 0;
SetLastError( RtlNtStatusToDosError(status) );
}
- RtlFreeUnicodeString( &nameW );
return ret;
}
diff -urN wine-1.9.7-orig/dlls/krnl386.exe16/vxd.c wine-1.9.7/dlls/krnl386.exe16/vxd.c
--- wine-1.9.7-orig/dlls/krnl386.exe16/vxd.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/krnl386.exe16/vxd.c 2016-04-10 02:33:20 +0900
@@ -113,11 +113,13 @@
/* create a file handle to represent a VxD, by opening a dummy file in the wineserver directory */
static HANDLE open_vxd_handle( LPCWSTR name )
{
+ HANDLE ret;
+ NTSTATUS status;
+
+#if 0
static const WCHAR prefixW[] = {'\\','?','?','\\','u','n','i','x'};
const char *dir = wine_get_server_dir();
int len;
- HANDLE ret;
- NTSTATUS status;
OBJECT_ATTRIBUTES attr;
UNICODE_STRING nameW;
IO_STATUS_BLOCK io;
@@ -146,12 +148,16 @@
status = NtCreateFile( &ret, SYNCHRONIZE, &attr, &io, NULL, 0,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF,
FILE_SYNCHRONOUS_IO_ALERT, NULL, 0 );
+ RtlFreeUnicodeString( &nameW );
+#else
+ status = STATUS_NOT_IMPLEMENTED;
+#endif
+
if (status)
{
ret = 0;
SetLastError( RtlNtStatusToDosError(status) );
}
- RtlFreeUnicodeString( &nameW );
return ret;
}
diff -urN wine-1.9.7-orig/dlls/ntdll/directory.c wine-1.9.7/dlls/ntdll/directory.c
--- wine-1.9.7-orig/dlls/ntdll/directory.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/ntdll/directory.c 2016-04-10 02:33:20 +0900
@@ -3098,8 +3098,10 @@
NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret,
UINT disposition, BOOLEAN check_case )
{
+#if 0
static const WCHAR unixW[] = {'u','n','i','x'};
static const WCHAR pipeW[] = {'p','i','p','e'};
+#endif
static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 };
NTSTATUS status = STATUS_SUCCESS;
@@ -3143,11 +3145,13 @@
name_len -= prefix_len;
/* check for invalid characters (all chars except 0 are valid for unix and pipes) */
+#if 0
if (prefix_len == 4)
{
is_unix = !memcmp( prefix, unixW, sizeof(unixW) );
is_pipe = !memcmp( prefix, pipeW, sizeof(pipeW) );
}
+#endif
if (is_unix || is_pipe)
{
for (p = name; p < name + name_len; p++)
diff -urN wine-1.9.7-orig/dlls/ntdll/path.c wine-1.9.7/dlls/ntdll/path.c
--- wine-1.9.7-orig/dlls/ntdll/path.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/ntdll/path.c 2016-04-10 02:33:20 +0900
@@ -1025,7 +1025,9 @@
NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt )
{
static const WCHAR prefixW[] = {'\\','?','?','\\','A',':','\\'};
+#if 0
static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x'};
+#endif
unsigned int lenW, lenA = name->Length;
const char *path = name->Buffer;
char *cwd;
@@ -1065,6 +1067,7 @@
if (status != STATUS_SUCCESS)
{
+#if 0
if (status == STATUS_OBJECT_PATH_NOT_FOUND)
{
lenW = ntdll_umbstowcs( 0, path, lenA, NULL, 0 );
@@ -1084,6 +1087,7 @@
for (p = nt->Buffer + sizeof(unix_prefixW)/sizeof(WCHAR); *p; p++) if (*p == '/') *p = '\\';
status = STATUS_SUCCESS;
}
+#endif
goto done;
}
while (lenA && path[0] == '/') { lenA--; path++; }
diff -urN wine-1.9.7-orig/dlls/shell32/folders.c wine-1.9.7/dlls/shell32/folders.c
--- wine-1.9.7-orig/dlls/shell32/folders.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/shell32/folders.c 2016-04-10 02:33:20 +0900
@@ -236,9 +236,11 @@
*piIndex = -IDI_SHELL_MY_DOCUMENTS;
else if(IsEqualGUID(riid, &CLSID_NetworkPlaces))
*piIndex = -IDI_SHELL_MY_NETWORK_PLACES;
+#if 0
else if(IsEqualGUID(riid, &CLSID_UnixFolder) ||
IsEqualGUID(riid, &CLSID_UnixDosFolder))
*piIndex = -IDI_SHELL_DRIVE;
+#endif
else
*piIndex = -IDI_SHELL_FOLDER;
}
diff -urN wine-1.9.7-orig/dlls/shell32/shellole.c wine-1.9.7/dlls/shell32/shellole.c
--- wine-1.9.7-orig/dlls/shell32/shellole.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/shell32/shellole.c 2016-04-10 02:33:20 +0900
@@ -78,8 +78,10 @@
{&CLSID_ShellFSFolder, IFSFolder_Constructor},
{&CLSID_ShellItem, IShellItem_Constructor},
{&CLSID_ShellLink, IShellLink_Constructor},
+#if 0
{&CLSID_UnixDosFolder, UnixDosFolder_Constructor},
{&CLSID_UnixFolder, UnixFolder_Constructor},
+#endif
{&CLSID_ExplorerBrowser,ExplorerBrowser_Constructor},
{&CLSID_KnownFolderManager, KnownFolderManager_Constructor},
{&CLSID_Shell, IShellDispatch_Constructor},
diff -urN wine-1.9.7-orig/dlls/shell32/shellpath.c wine-1.9.7/dlls/shell32/shellpath.c
--- wine-1.9.7-orig/dlls/shell32/shellpath.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/shell32/shellpath.c 2016-04-10 02:33:20 +0900
@@ -4481,9 +4481,11 @@
DWORD call_for_attr;
} folders[] =
{
+#if 0
{ &CLSID_UnixFolder, TRUE, FALSE, FALSE },
{ &CLSID_UnixDosFolder, TRUE, FALSE, FALSE,
SFGAO_FILESYSANCESTOR|SFGAO_FOLDER|SFGAO_HASSUBFOLDER, SFGAO_FILESYSTEM },
+#endif
{ &CLSID_FolderShortcut, FALSE, FALSE, FALSE,
SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_LINK,
SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR },
@@ -4613,9 +4615,11 @@
*ppidl = _ILCreateDesktop();
break;
+#if 0
case CSIDL_PERSONAL:
*ppidl = _ILCreateMyDocuments();
break;
+#endif
case CSIDL_INTERNET:
*ppidl = _ILCreateIExplore();
diff -urN wine-1.9.7-orig/dlls/shell32/shfldr.h wine-1.9.7/dlls/shell32/shfldr.h
--- wine-1.9.7-orig/dlls/shell32/shfldr.h 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/shell32/shfldr.h 2016-04-10 02:33:20 +0900
@@ -75,5 +75,7 @@
void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags) DECLSPEC_HIDDEN;
BOOL SHELL_FS_HideExtension(LPCWSTR pwszPath) DECLSPEC_HIDDEN;
+#if 0
DEFINE_GUID( CLSID_UnixFolder, 0xcc702eb2, 0x7dc5, 0x11d9, 0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd );
DEFINE_GUID( CLSID_UnixDosFolder, 0x9d20aae8, 0x0625, 0x44b0, 0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9 );
+#endif
diff -urN wine-1.9.7-orig/dlls/shell32/shfldr_desktop.c wine-1.9.7/dlls/shell32/shfldr_desktop.c
--- wine-1.9.7-orig/dlls/shell32/shfldr_desktop.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/shell32/shfldr_desktop.c 2016-04-10 02:33:20 +0900
@@ -186,26 +186,30 @@
}
else if (PathGetDriveNumberW (lpszDisplayName) >= 0)
{
+#if 0
/*
* UNIXFS can't handle drives without a mount point yet. We fall back
* to use the MyComputer interface if we can't get the file attributes
* on the device.
*/
char drivePath[] = "A:\\";
drivePath[0] = 'A' + PathGetDriveNumberW(lpszDisplayName);
/* it's a filesystem path with a drive. Let MyComputer/UnixDosFolder parse it */
if (UNIXFS_is_rooted_at_desktop() &&
GetFileAttributesA(drivePath) != INVALID_FILE_ATTRIBUTES)
{
pidlTemp = _ILCreateGuid(PT_GUID, &CLSID_UnixDosFolder);
TRACE("Using unixfs for %s\n", debugstr_w(lpszDisplayName));
}
else
{
+#endif
pidlTemp = _ILCreateMyComputer ();
TRACE("Using MyComputer for %s\n", debugstr_w(lpszDisplayName));
+#if 0
}
+#endif
szNext = lpszDisplayName;
}
else if (PathIsUNCW(lpszDisplayName))
diff -urN wine-1.9.7-orig/dlls/shell32/shfldr_unixfs.c wine-1.9.7/dlls/shell32/shfldr_unixfs.c
--- wine-1.9.7-orig/dlls/shell32/shfldr_unixfs.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/dlls/shell32/shfldr_unixfs.c 2016-04-10 02:33:20 +0900
@@ -167,7 +167,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell);
-#if !defined(__MINGW32__) && !defined(_MSC_VER)
+#if 0
#define LEN_SHITEMID_FIXED_PART ((USHORT) \
( sizeof(USHORT) /* SHITEMID's cb field. */ \
@@ -2569,6 +2569,7 @@
* FALSE, if not.
*/
BOOL UNIXFS_is_rooted_at_desktop(void) {
+#if 0
HKEY hKey;
WCHAR wszRootedAtDesktop[69 + CHARS_IN_GUID] = {
'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
@@ -2582,5 +2583,6 @@
RegCloseKey(hKey);
return TRUE;
}
+#endif
return FALSE;
}
diff -urN wine-1.9.7-orig/include/config.h.in wine-1.9.7/include/config.h.in
--- wine-1.9.7-orig/include/config.h.in 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/include/config.h.in 2016-04-10 02:33:20 +0900
@@ -7,6 +7,9 @@
/* Define to a function attribute for Microsoft hotpatch assembly prefix. */
#undef DECLSPEC_HOTPATCH
+/* Define to enable unixfs */
+#undef ENABLE_UNIXFS
+
/* Define to the file extension for executables. */
#undef EXEEXT
diff -urN wine-1.9.7-orig/programs/wineboot/wineboot.c wine-1.9.7/programs/wineboot/wineboot.c
--- wine-1.9.7-orig/programs/wineboot/wineboot.c 2016-04-02 00:02:39 +0900
+++ wine-1.9.7/programs/wineboot/wineboot.c 2016-04-10 02:33:20 +0900
@@ -946,7 +946,7 @@
'I','n','s','t','a','l','l','H','i','n','f','S','e','c','t','i','o','n',0};
static const WCHAR definstall[] = {' ','D','e','f','a','u','l','t','I','n','s','t','a','l','l',0};
static const WCHAR wowinstall[] = {' ','W','o','w','6','4','I','n','s','t','a','l','l',0};
- static const WCHAR inf[] = {' ','1','2','8',' ','\\','\\','?','\\','u','n','i','x',0 };
+ static const WCHAR inf[] = {' ','1','2','8',' ','z',':',0 };
WCHAR app[MAX_PATH + sizeof(rundll)/sizeof(WCHAR)];
STARTUPINFOW si;
|
