Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VERSION] Sync with Wine Staging 2.2. CORE-12823

Browse source 
8e1335b version: Ignore flag values in Ex functions.

svn path=/trunk/; revision=74203
This commit is contained in:
Amine Khaldi 2017-03-19 17:16:33 +00:00
parent bf9276fb38
commit fea16f685a
2 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/dll/win32/version/version.c
View file

@ -628,14 +628,7 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h
HMODULE hModule; HMODULE hModule;
OFSTRUCT ofs; OFSTRUCT ofs;
if (flags) TRACE("(0x%x,%s,%p)\n", flags, debugstr_w(filename), handle );
{
FIXME("stub: %x %s %p\n", flags, wine_dbgstr_w(filename), handle);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
TRACE("(%s,%p)\n", debugstr_w(filename), handle );
if (handle) *handle = 0; if (handle) *handle = 0;
@ -649,6 +642,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h
SetLastError(ERROR_BAD_PATHNAME); SetLastError(ERROR_BAD_PATHNAME);
return 0; return 0;
} }
if (flags)
FIXME("flags 0x%x ignored\n", flags);
if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR)
{ {
@ -712,14 +707,14 @@ DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD ha
UNICODE_STRING filenameW; UNICODE_STRING filenameW;
DWORD retval; DWORD retval;
TRACE("(%s,%p)\n", debugstr_a(filename), handle ); TRACE("(0x%x,%s,%p)\n", flags, debugstr_a(filename), handle );
if(filename) if(filename)
RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);
else else
filenameW.Buffer = NULL; filenameW.Buffer = NULL;
retval = GetFileVersionInfoSizeExW(0, filenameW.Buffer, handle); retval = GetFileVersionInfoSizeExW(flags, filenameW.Buffer, handle);
RtlFreeUnicodeString(&filenameW); RtlFreeUnicodeString(&filenameW);
@ -738,21 +733,16 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle,
HMODULE hModule; HMODULE hModule;
VS_VERSION_INFO_STRUCT32* vvis = data; VS_VERSION_INFO_STRUCT32* vvis = data;
if (flags) TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
{ flags, debugstr_w(filename), handle, datasize, data );
FIXME("stub: %x %s %u %u %p\n", flags, wine_dbgstr_w(filename), handle, datasize, data);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
TRACE("(%s,%d,size=%d,data=%p)\n",
debugstr_w(filename), handle, datasize, data );
if (!data) if (!data)
{ {
SetLastError(ERROR_INVALID_DATA); SetLastError(ERROR_INVALID_DATA);
return FALSE; return FALSE;
} }
if (flags)
FIXME("flags 0x%x ignored\n", flags);
if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR)
{ {
@ -815,8 +805,8 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D
UNICODE_STRING filenameW; UNICODE_STRING filenameW;
BOOL retval; BOOL retval;
TRACE("(%s,%d,size=%d,data=%p)\n", TRACE("(0x%x,%s,%d,size=%d,data=%p)\n",
debugstr_a(filename), handle, datasize, data ); flags, debugstr_a(filename), handle, datasize, data );
if(filename) if(filename)
RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); RtlCreateUnicodeStringFromAsciiz(&filenameW, filename);

2
reactos/media/doc/README.WINE
View file

@ -192,7 +192,7 @@ reactos/dll/win32/urlmon # Synced to WineStaging-2.2
reactos/dll/win32/usp10 # Synced to WineStaging-2.2 reactos/dll/win32/usp10 # Synced to WineStaging-2.2
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23 reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23
reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/version # Synced to WineStaging-2.2
reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11
reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2 reactos/dll/win32/wbemdisp # Synced to WineStaging-2.2
reactos/dll/win32/wbemprox # Synced to WineStaging-2.2 reactos/dll/win32/wbemprox # Synced to WineStaging-2.2