From: Gé van Geldorp Date: Sat, 28 May 2005 15:14:29 +0000 (+0000) Subject: Sync to Wine-20050524: X-Git-Tag: backups/new_headers@23355^2~27 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=f9ef57f5f188017a8d30c8aae6a61cd78adc0feb Sync to Wine-20050524: Alexandre Julliard - 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 - Stub implementation for SetupCopyOEMInfW. Ivan Leo Puoti - Minor fix in SetupQueueCopySectionW. svn path=/trunk/; revision=15582 --- diff --git a/reactos/lib/setupapi/Makefile.in b/reactos/lib/setupapi/Makefile.in index 6321589d71f..f0065152429 100644 --- a/reactos/lib/setupapi/Makefile.in +++ b/reactos/lib/setupapi/Makefile.in @@ -4,6 +4,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = setupapi.dll +IMPORTLIB = libsetupapi.$(IMPLIBEXT) IMPORTS = user32 version advapi32 rpcrt4 kernel32 ntdll DELAYIMPORTS = shell32 EXTRALIBS = $(LIBUNICODE) diff --git a/reactos/lib/setupapi/queue.c b/reactos/lib/setupapi/queue.c index 66da7b7e688..3144707132c 100644 --- a/reactos/lib/setupapi/queue.c +++ b/reactos/lib/setupapi/queue.c @@ -767,6 +767,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, params.SecurityDescriptor = NULL; if (!hlist) hlist = hinf; + if (!hinf) hinf = hlist; if (!SetupFindFirstLineW( hlist, section, NULL, &context )) return FALSE; if (!(params.TargetDirectory = get_destination_dir( hinf, section ))) return FALSE; do diff --git a/reactos/lib/setupapi/setupapi.spec b/reactos/lib/setupapi/setupapi.spec index 7b172479d72..8283933af13 100644 --- a/reactos/lib/setupapi/setupapi.spec +++ b/reactos/lib/setupapi/setupapi.spec @@ -253,7 +253,7 @@ @ stub SetupCopyErrorA @ stub SetupCopyErrorW @ 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 SetupCreateDiskSpaceListW(ptr long long) @ stub SetupDecompressOrCopyFileA diff --git a/reactos/lib/setupapi/setupx.spec b/reactos/lib/setupapi/setupx.spec index 2c40e0e4031..07966296bd0 100644 --- a/reactos/lib/setupapi/setupx.spec +++ b/reactos/lib/setupapi/setupx.spec @@ -1,4 +1,4 @@ -1 stub WEP +#1 stub WEP 2 pascal -ret16 IpOpen(str ptr) IpOpen16 3 stub IpOpenAppend #(str word) 4 pascal -ret16 IpClose(word) IpClose16 diff --git a/reactos/lib/setupapi/stubs.c b/reactos/lib/setupapi/stubs.c index f392481a362..3790ebc8e62 100644 --- a/reactos/lib/setupapi/stubs.c +++ b/reactos/lib/setupapi/stubs.c @@ -99,7 +99,21 @@ BOOL WINAPI SetupCopyOEMInfA(PCSTR sourceinffile, PCSTR sourcemedialoc, DWORD destnamesize, PDWORD required, 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; } diff --git a/reactos/lib/setupapi/virtcopy.c b/reactos/lib/setupapi/virtcopy.c index b21692eb091..2771fcbe1e8 100644 --- a/reactos/lib/setupapi/virtcopy.c +++ b/reactos/lib/setupapi/virtcopy.c @@ -305,7 +305,7 @@ RETERR16 WINAPI VcpOpen16(VIFPROC vifproc, LPARAM lparamMsgRef) VCP_MsgRef = lparamMsgRef; /* load SETUPAPI needed for dialog resources etc. */ - SETUPAPI_hInstance = LoadLibraryA("setupapi.dll"); + SETUPAPI_hInstance = GetModuleHandleA("setupapi.dll"); if (!SETUPAPI_hInstance) { 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); TRACE("#6\n"); VCP_Proc = NULL; - FreeLibrary(SETUPAPI_hInstance); VCP_opened = FALSE; return OK; }