Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to Wine-20050524:

Browse source 
Alexandre Julliard <julliard@winehq.org>
- Added rules for building import libraries in the individual dll
  makefiles, and added support for building a .def.a static import
  library too.
- Comment out stub WEP entry points so that we can call WEP for builtin
  dlls too.
- Removed unnecessary code in the 16-bit DllEntryPoint function of some
  dlls, and also fixed its ordinal in a few places.
Hans Leidekker <hans@it.vu.nl>
- Stub implementation for SetupCopyOEMInfW.
Ivan Leo Puoti <ivanleo@gmail.com>
- Minor fix in SetupQueueCopySectionW.

svn path=/trunk/; revision=15582
This commit is contained in:
Gé van Geldorp 2005-05-28 15:14:29 +00:00
parent 020f1fc22b
commit f9ef57f5f1
6 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/lib/setupapi/Makefile.in
View file

@ -4,6 +4,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = setupapi.dll MODULE = setupapi.dll
IMPORTLIB = libsetupapi.$(IMPLIBEXT)
IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll
DELAYIMPORTS = shell32 DELAYIMPORTS = shell32
EXTRALIBS = $(LIBUNICODE) EXTRALIBS = $(LIBUNICODE)

1
reactos/lib/setupapi/queue.c
View file

@ -767,6 +767,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf,
params.SecurityDescriptor = NULL; params.SecurityDescriptor = NULL;
if (!hlist) hlist = hinf; if (!hlist) hlist = hinf;
if (!hinf) hinf = hlist;
if (!SetupFindFirstLineW( hlist, section, NULL, &context )) return FALSE; if (!SetupFindFirstLineW( hlist, section, NULL, &context )) return FALSE;
if (!(params.TargetDirectory = get_destination_dir( hinf, section ))) return FALSE; if (!(params.TargetDirectory = get_destination_dir( hinf, section ))) return FALSE;
do do

2
reactos/lib/setupapi/setupapi.spec
View file

@ -253,7 +253,7 @@
@ stub SetupCopyErrorA @ stub SetupCopyErrorA
@ stub SetupCopyErrorW @ stub SetupCopyErrorW
@ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr) @ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr)
@ stub SetupCopyOEMInfW @ stdcall SetupCopyOEMInfW(wstr wstr long long ptr long ptr ptr)
@ stdcall SetupCreateDiskSpaceListA(ptr long long) @ stdcall SetupCreateDiskSpaceListA(ptr long long)
@ stdcall SetupCreateDiskSpaceListW(ptr long long) @ stdcall SetupCreateDiskSpaceListW(ptr long long)
@ stub SetupDecompressOrCopyFileA @ stub SetupDecompressOrCopyFileA

2
reactos/lib/setupapi/setupx.spec
View file

@ -1,4 +1,4 @@
1 stub WEP #1 stub WEP
2 pascal -ret16 IpOpen(str ptr) IpOpen16 2 pascal -ret16 IpOpen(str ptr) IpOpen16
3 stub IpOpenAppend #(str word) 3 stub IpOpenAppend #(str word)
4 pascal -ret16 IpClose(word) IpClose16 4 pascal -ret16 IpClose(word) IpClose16

16
reactos/lib/setupapi/stubs.c
View file

@ -99,7 +99,21 @@ BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc,
DWORD destnamesize, PDWORD required, DWORD destnamesize, PDWORD required,
PSTR *destinfnamecomponent) PSTR *destinfnamecomponent)
{ {
FIXME("stub: source %s location %s ...\n",sourceinffile, sourcemedialoc); FIXME("stub: source %s location %s ...\n", debugstr_a(sourceinffile),
debugstr_a(sourcemedialoc));
return FALSE;
}
/***********************************************************************
* SetupCopyOEMInfW (SETUPAPI.@)
*/
BOOL WINAPI SetupCopyOEMInfW(PCWSTR sourceinffile, PCWSTR sourcemedialoc,
DWORD mediatype, DWORD copystyle, PWSTR destinfname,
DWORD destnamesize, PDWORD required,
PWSTR *destinfnamecomponent)
{
FIXME("stub: source %s location %s ...\n", debugstr_w(sourceinffile),
debugstr_w(sourcemedialoc));
return FALSE; return FALSE;
} }

3
reactos/lib/setupapi/virtcopy.c
View file

@ -305,7 +305,7 @@ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef)
VCP_MsgRef = lparamMsgRef; VCP_MsgRef = lparamMsgRef;
/* load SETUPAPI needed for dialog resources etc. */ /* load SETUPAPI needed for dialog resources etc. */
SETUPAPI_hInstance = LoadLibraryA("setupapi.dll"); SETUPAPI_hInstance = GetModuleHandleA("setupapi.dll");
if (!SETUPAPI_hInstance) if (!SETUPAPI_hInstance)
{ {
ERR("Could not load sibling setupapi.dll\n"); ERR("Could not load sibling setupapi.dll\n");
@ -555,7 +555,6 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest)
cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef); cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef);
TRACE("#6\n"); TRACE("#6\n");
VCP_Proc = NULL; VCP_Proc = NULL;
FreeLibrary(SETUPAPI_hInstance);
VCP_opened = FALSE; VCP_opened = FALSE;
return OK; return OK;
} }