Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-14 04:58:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] sync shellole.c with wine 1.9.16

Browse source 
svn path=/trunk/; revision=72560
This commit is contained in:
Christoph von Wittich 2016-09-04 07:48:41 +00:00
parent 55a37c4abb
commit 09dc7fbe19
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/shell32/wine/shellole.c
View file

@ -57,7 +57,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc
/* this table contains all CLSIDs of shell32 objects */ /* this table contains all CLSIDs of shell32 objects */
static const struct { static const struct {
REFIID riid; REFIID clsid;
LPFNCREATEINSTANCE lpfnCI; LPFNCREATEINSTANCE lpfnCI;
} InterfaceTable[] = { } InterfaceTable[] = {
@ -205,8 +205,8 @@ end:
*/ */
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
{ {
HRESULT hres = E_OUTOFMEMORY;
IClassFactory * pcf = NULL; IClassFactory * pcf = NULL;
HRESULT hres;
int i; int i;
TRACE("CLSID:%s,IID:%s\n",shdebugstr_guid(rclsid),shdebugstr_guid(iid)); TRACE("CLSID:%s,IID:%s\n",shdebugstr_guid(rclsid),shdebugstr_guid(iid));
@ -215,10 +215,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv)
*ppv = NULL; *ppv = NULL;
/* search our internal interface table */ /* search our internal interface table */
for(i=0;InterfaceTable[i].riid;i++) { for(i=0;InterfaceTable[i].clsid;i++) {
if(IsEqualIID(InterfaceTable[i].riid, rclsid)) { if(IsEqualIID(InterfaceTable[i].clsid, rclsid)) {
TRACE("index[%u]\n", i); TRACE("index[%u]\n", i);
pcf = IDefClF_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); pcf = IDefClF_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL);
break;
} }
} }
@ -587,7 +588,7 @@ UINT WINAPI DragQueryFileA(
if(lpDropFileStruct->fWide) { if(lpDropFileStruct->fWide) {
LPWSTR lpszFileW = NULL; LPWSTR lpszFileW = NULL;
if(lpszFile) { if(lpszFile && lFile != 0xFFFFFFFF) {
lpszFileW = HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); lpszFileW = HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR));
if(lpszFileW == NULL) { if(lpszFileW == NULL) {
goto end; goto end;
@ -642,7 +643,7 @@ UINT WINAPI DragQueryFileW(
if(lpDropFileStruct->fWide == FALSE) { if(lpDropFileStruct->fWide == FALSE) {
LPSTR lpszFileA = NULL; LPSTR lpszFileA = NULL;
if(lpszwFile) { if(lpszwFile && lFile != 0xFFFFFFFF) {
lpszFileA = HeapAlloc(GetProcessHeap(), 0, lLength); lpszFileA = HeapAlloc(GetProcessHeap(), 0, lLength);
if(lpszFileA == NULL) { if(lpszFileA == NULL) {
goto end; goto end;