mirror of
https://github.com/reactos/reactos.git
synced 2025-08-03 19:55:41 +00:00
Autosyncing with Wine HEAD
svn path=/trunk/; revision=32834
This commit is contained in:
parent
9ee5ab63d4
commit
6d3c4cb3e8
3 changed files with 7 additions and 9 deletions
|
@ -8,6 +8,11 @@
|
||||||
<define name="__WINESRC__" />
|
<define name="__WINESRC__" />
|
||||||
<define name="WINVER">0x600</define>
|
<define name="WINVER">0x600</define>
|
||||||
<define name="_WIN32_WINNT">0x600</define>
|
<define name="_WIN32_WINNT">0x600</define>
|
||||||
|
<file>advpack.c</file>
|
||||||
|
<file>files.c</file>
|
||||||
|
<file>install.c</file>
|
||||||
|
<file>reg.c</file>
|
||||||
|
<file>advpack.spec</file>
|
||||||
<library>wine</library>
|
<library>wine</library>
|
||||||
<library>ole32</library>
|
<library>ole32</library>
|
||||||
<library>setupapi</library>
|
<library>setupapi</library>
|
||||||
|
@ -15,10 +20,5 @@
|
||||||
<library>advapi32</library>
|
<library>advapi32</library>
|
||||||
<library>kernel32</library>
|
<library>kernel32</library>
|
||||||
<library>ntdll</library>
|
<library>ntdll</library>
|
||||||
<file>advpack.c</file>
|
|
||||||
<file>files.c</file>
|
|
||||||
<file>install.c</file>
|
|
||||||
<file>reg.c</file>
|
|
||||||
<file>advpack.spec</file>
|
|
||||||
</module>
|
</module>
|
||||||
</group>
|
</group>
|
||||||
|
|
|
@ -514,7 +514,7 @@ HRESULT WINAPI DelNodeRunDLL32W(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The following defintions were copied from dlls/cabinet/cabinet.h */
|
/* The following definitions were copied from dlls/cabinet/cabinet.h */
|
||||||
|
|
||||||
/* SESSION Operation */
|
/* SESSION Operation */
|
||||||
#define EXTRACT_FILLFILELIST 0x00000001
|
#define EXTRACT_FILLFILELIST 0x00000001
|
||||||
|
@ -564,9 +564,7 @@ static LPSTR convert_file_list(LPCSTR FileList, DWORD *dwNumFiles)
|
||||||
dwLen = last - first + 3; /* room for double-null termination */
|
dwLen = last - first + 3; /* room for double-null termination */
|
||||||
szConvertedList = HeapAlloc(GetProcessHeap(), 0, dwLen);
|
szConvertedList = HeapAlloc(GetProcessHeap(), 0, dwLen);
|
||||||
lstrcpynA(szConvertedList, first, dwLen - 1);
|
lstrcpynA(szConvertedList, first, dwLen - 1);
|
||||||
|
|
||||||
szConvertedList[dwLen - 1] = '\0';
|
szConvertedList[dwLen - 1] = '\0';
|
||||||
szConvertedList[dwLen] = '\0';
|
|
||||||
|
|
||||||
/* empty list */
|
/* empty list */
|
||||||
if (!lstrlenA(szConvertedList))
|
if (!lstrlenA(szConvertedList))
|
||||||
|
|
|
@ -210,7 +210,7 @@ static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path)
|
||||||
* substitution table, and executes the INF.
|
* substitution table, and executes the INF.
|
||||||
*
|
*
|
||||||
* PARAMS
|
* PARAMS
|
||||||
* hm [I] Module that contains the REGINST resouce.
|
* hm [I] Module that contains the REGINST resource.
|
||||||
* pszSection [I] The INF section to execute.
|
* pszSection [I] The INF section to execute.
|
||||||
* pstTable [I] Table of string substitutions.
|
* pstTable [I] Table of string substitutions.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue