ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Split update_add_resource() into two functions.

This commit is contained in:
Mike McCormack 2007-01-11 17:43:23 +09:00 committed by Alexandre Julliard
parent 8f8fecd00e
commit 38e27fa9f8
1 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
dlls/kernel32/resource.c
View File

@ -646,7 +646,7 @@ struct resource_data {
LANGID lang; LANGID lang;
DWORD codepage; DWORD codepage;
DWORD cbData; DWORD cbData;
BYTE data[1]; void *lpData;
}; };
static int resource_strcmp( LPCWSTR a, LPCWSTR b ) static int resource_strcmp( LPCWSTR a, LPCWSTR b )
@ -737,15 +737,13 @@ static void res_free_str( LPWSTR str )
} }
static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name, static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name,
WORD Language, DWORD codepage, LPCVOID lpData, DWORD cbData ) struct resource_data *resdata, BOOL overwrite_existing )
{ {
struct resource_dir_entry *restype, *resname; struct resource_dir_entry *restype, *resname;
struct resource_data *resdata; struct resource_data *existing;
TRACE("%p %s %s %04x %04x %p %d bytes\n", updates, debugstr_w(Type), debugstr_w(Name), Language, codepage, lpData, cbData); TRACE("%p %s %s %p %d\n", updates,
debugstr_w(Type), debugstr_w(Name), resdata, overwrite_existing );
if (!lpData || !cbData)
return FALSE;
restype = find_resource_dir_entry( &updates->root, Type ); restype = find_resource_dir_entry( &updates->root, Type );
if (!restype) if (!restype)
@ -769,24 +767,46 @@ static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR N
* If there's an existing resource entry with matching (Type,Name,Language) * If there's an existing resource entry with matching (Type,Name,Language)
* it needs to be removed before adding the new data. * it needs to be removed before adding the new data.
*/ */
resdata = find_resource_data( &resname->children, Language ); existing = find_resource_data( &resname->children, resdata->lang );
if (resdata) if (existing)
{ {
list_remove( &resdata->entry ); if (!overwrite_existing)
HeapFree( GetProcessHeap(), 0, resdata ); return TRUE;
list_remove( &existing->entry );
HeapFree( GetProcessHeap(), 0, existing );
} }
resdata = HeapAlloc( GetProcessHeap(), 0, sizeof *resdata + cbData );
resdata->lang = Language;
resdata->codepage = codepage;
resdata->cbData = cbData;
memcpy( resdata->data, lpData, cbData );
add_resource_data_entry( &resname->children, resdata ); add_resource_data_entry( &resname->children, resdata );
return TRUE; return TRUE;
} }
static struct resource_data *allocate_resource_data( WORD Language, DWORD codepage,
LPVOID lpData, DWORD cbData, BOOL copy_data )
{
struct resource_data *resdata;
if (!lpData || !cbData)
return NULL;
resdata = HeapAlloc( GetProcessHeap(), 0, sizeof *resdata + (copy_data ? cbData : 0) );
if (resdata)
{
resdata->lang = Language;
resdata->codepage = codepage;
resdata->cbData = cbData;
if (copy_data)
{
resdata->lpData = &resdata[1];
memcpy( resdata->lpData, lpData, cbData );
}
else
resdata->lpData = lpData;
}
return resdata;
}
static void free_resource_directory( struct list *head, int level ) static void free_resource_directory( struct list *head, int level )
{ {
struct list *ptr = NULL; struct list *ptr = NULL;
@ -1184,7 +1204,7 @@ static BOOL write_resources( QUEUEDUPDATES *updates, LPBYTE base, struct resourc
si->data_entry_ofs += sizeof (IMAGE_RESOURCE_DATA_ENTRY); si->data_entry_ofs += sizeof (IMAGE_RESOURCE_DATA_ENTRY);
/* write out the resource data */ /* write out the resource data */
memcpy( &base[si->data_ofs], data->data, data->cbData ); memcpy( &base[si->data_ofs], data->lpData, data->cbData );
si->data_ofs += data->cbData; si->data_ofs += data->cbData;
pad_size = (-si->data_ofs)&3; pad_size = (-si->data_ofs)&3;
@ -1492,8 +1512,10 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpdate, LPCWSTR lpType, LPCWSTR lpName,
updates = GlobalLock(hUpdate); updates = GlobalLock(hUpdate);
if (updates) if (updates)
{ {
ret = update_add_resource( updates, lpType, lpName, struct resource_data *data;
wLanguage, GetACP(), lpData, cbData ); data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE );
if (data)
ret = update_add_resource( updates, lpType, lpName, data, TRUE );
GlobalUnlock(hUpdate); GlobalUnlock(hUpdate);
} }
return ret; return ret;