Adding OLE link lib. Fixing FindWindow. NPODB. WINCE ONLY.

git-svn-id: svn://10.0.0.236/trunk@182397 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%meer.net
2005-10-17 19:42:34 +00:00
parent bcb728d076
commit d673cf2c1e
5 changed files with 36 additions and 45 deletions

View File

@@ -6,6 +6,9 @@
--------------------Configuration: shunt - Win32 (WCE ARMV4) SmartPhone--------------------
</h3>
<h3>Command Lines</h3>
Signing c:\builds\minimo\mozilla\build\wince\shunt\build\ARMV4SmartPhone\shunt.dll
Warning: This file is signed, but not timestamped.
Succeeded
@@ -17,6 +20,9 @@ shunt.dll - 0 error(s), 0 warning(s)
shunt.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: shunt - Win32 (WCE ARMV4) Debug--------------------
</h3>
<h3>Command Lines</h3>
Signing c:\builds\minimo\mozilla\build\wince\shunt\build\ARMV4Dbg\shunt.dll
Warning: This file is signed, but not timestamped.
Succeeded
@@ -28,6 +34,9 @@ shunt.dll - 0 error(s), 0 warning(s)
<h3>Results</h3>
shunt.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: shunt - Win32 (WCE emulator) Release--------------------
</h3>
<h3>Command Lines</h3>
Signing c:\builds\minimo\mozilla\build\wince\shunt\build\emulatorRel\shunt.dll
Warning: This file is signed, but not timestamped.
@@ -39,6 +48,9 @@ shunt.dll - 0 error(s), 0 warning(s)
<h3>Results</h3>
shunt.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: shunt - Win32 (WCE ARMV4) Release--------------------
</h3>
<h3>Command Lines</h3>
@@ -50,6 +62,9 @@ shunt.dll - 0 error(s), 0 warning(s)
<h3>Results</h3>
shunt.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: shunt - Win32 (WCE emulator) Debug--------------------

View File

@@ -63,7 +63,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib uuid.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib uuid.lib ole32.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
# SUBTRACT LINK32 /map
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE emulator) Debug"
@@ -98,7 +98,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib uuid.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib uuid.lib ole32.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
# SUBTRACT LINK32 /map
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE ARMV4) Release"
@@ -133,7 +133,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# ADD LINK32 commctrl.lib coredll.lib uuid.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# ADD LINK32 commctrl.lib coredll.lib uuid.lib ole32.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# SUBTRACT LINK32 /map
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE ARMV4) Debug"
@@ -168,7 +168,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# ADD LINK32 commctrl.lib coredll.lib uuid.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# ADD LINK32 commctrl.lib coredll.lib uuid.lib ole32.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# SUBTRACT LINK32 /map
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE ARMV4) SmartPhone"
@@ -206,7 +206,7 @@ BSC32=bscmake.exe
LINK32=link.exe
# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x1000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# SUBTRACT BASE LINK32 /map
# ADD LINK32 commctrl.lib coredll.lib uuid.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# ADD LINK32 commctrl.lib coredll.lib uuid.lib ole32.lib /nologo /base:"0x00100000" /stack:0x5000000 /entry:"_DllMainCRTStartup" /dll /pdb:none /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
# SUBTRACT LINK32 /map
!ENDIF
@@ -566,9 +566,7 @@ SOURCE=..\process.cpp
DEP_CPP_PROCE=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_PROCE=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE emulator) Debug"
@@ -576,9 +574,7 @@ NODEP_CPP_PROCE=\
DEP_CPP_PROCE=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_PROCE=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE ARMV4) Release"
@@ -586,9 +582,7 @@ NODEP_CPP_PROCE=\
DEP_CPP_PROCE=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_PROCE=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE ARMV4) Debug"
@@ -604,9 +598,7 @@ DEP_CPP_PROCE=\
DEP_CPP_PROCE=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_PROCE=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ENDIF
@@ -925,9 +917,7 @@ SOURCE=..\win32.cpp
DEP_CPP_WIN32=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_WIN32=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE emulator) Debug"
@@ -935,9 +925,7 @@ NODEP_CPP_WIN32=\
DEP_CPP_WIN32=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_WIN32=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE ARMV4) Release"
@@ -945,9 +933,7 @@ NODEP_CPP_WIN32=\
DEP_CPP_WIN32=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_WIN32=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ELSEIF "$(CFG)" == "shunt - Win32 (WCE ARMV4) Debug"
@@ -963,9 +949,7 @@ DEP_CPP_WIN32=\
DEP_CPP_WIN32=\
"..\include\mozce_defs.h"\
"..\mozce_internal.h"\
NODEP_CPP_WIN32=\
".\funcs.h"\
{$(INCLUDE)}"kfuncs.h"\
!ENDIF

View File

@@ -967,23 +967,15 @@ MOZCE_SHUNT_API HWND mozce_FindWindowA(LPCSTR inClass, LPCSTR inWindow)
HWND retval = NULL;
LPTSTR wClass = a2w_malloc(inClass, -1, NULL);
if(NULL != wClass)
{
if(NULL == inWindow)
{
retval = FindWindow(wClass, NULL);
}
else
{
LPTSTR wWindow = a2w_malloc(inWindow, -1, NULL);
if(NULL != wWindow)
{
retval = FindWindow(wClass, wWindow);
free(wWindow);
}
}
LPTSTR wWindow = a2w_malloc(inWindow, -1, NULL);
retval = FindWindow(wClass, NULL);
if (!wWindow)
free(wWindow);
if (!wClass)
free(wClass);
}
return retval;
}