[PATCH] kernel32: UpdateResource(lpData=NULL, cbData=0) should delete resource.
Kirill Smelkov
kirr at landau.phys.spbu.ru
Tue Dec 21 08:23:11 CST 2010
As stated on MSDN. The fix is needed for InnoSetup's iscc.exe which,
bedore updating, first removes 'MAINICON' this way.
---
dlls/kernel32/resource.c | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c
index 5091804..0123eff 100644
--- a/dlls/kernel32/resource.c
+++ b/dlls/kernel32/resource.c
@@ -705,8 +705,10 @@ static void res_free_str( LPWSTR str )
HeapFree( GetProcessHeap(), 0, str );
}
+/* resdata=NULL + overwrite_existing=TRUE means "remove resource" */
static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name,
- struct resource_data *resdata, BOOL overwrite_existing )
+ LANGID Lang, struct resource_data *resdata,
+ BOOL overwrite_existing )
{
struct resource_dir_entry *restype, *resname;
struct resource_data *existing;
@@ -736,7 +738,7 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N
* If there's an existing resource entry with matching (Type,Name,Language)
* it needs to be removed before adding the new data.
*/
- existing = find_resource_data( &resname->children, resdata->lang );
+ existing = find_resource_data( &resname->children, Lang );
if (existing)
{
if (!overwrite_existing)
@@ -745,7 +747,8 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N
HeapFree( GetProcessHeap(), 0, existing );
}
- add_resource_data_entry( &resname->children, resdata );
+ if (resdata)
+ add_resource_data_entry( &resname->children, resdata );
return TRUE;
}
@@ -1007,7 +1010,7 @@ static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates,
resdata = allocate_resource_data( Lang, data->CodePage, p, data->Size, FALSE );
if (resdata)
{
- if (!update_add_resource( updates, Type, Name, resdata, FALSE ))
+ if (!update_add_resource( updates, Type, Name, Lang, resdata, FALSE ))
HeapFree( GetProcessHeap(), 0, resdata );
}
}
@@ -1697,10 +1700,16 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName,
updates = GlobalLock(hUpdate);
if (updates)
{
- struct resource_data *data;
- data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE );
- if (data)
- ret = update_add_resource( updates, lpType, lpName, data, TRUE );
+ if (lpData==NULL && cbData==0) {
+ /* remove resource */
+ ret = update_add_resource( updates, lpType, lpName, wLanguage, NULL, TRUE );
+ }
+ else {
+ struct resource_data *data;
+ data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE );
+ if (data)
+ ret = update_add_resource( updates, lpType, lpName, wLanguage, data, TRUE );
+ }
GlobalUnlock(hUpdate);
}
return ret;
--
1.7.3.4.568.g1b974
More information about the wine-patches
mailing list