Commit fe6a1d89 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

winemenubuilder: Use static initalizer for mimeProgidTree and nativeMimeTypes.

parent ccdbc176
...@@ -262,21 +262,6 @@ static int winemenubuilder_rb_string_compare(const void *key, const struct wine_ ...@@ -262,21 +262,6 @@ static int winemenubuilder_rb_string_compare(const void *key, const struct wine_
return strcmp((char*)key, t->string); return strcmp((char*)key, t->string);
} }
static void *winemenubuilder_rb_alloc(size_t size)
{
return HeapAlloc(GetProcessHeap(), 0, size);
}
static void *winemenubuilder_rb_realloc(void *ptr, size_t size)
{
return HeapReAlloc(GetProcessHeap(), 0, ptr, size);
}
static void winemenubuilder_rb_free(void *ptr)
{
HeapFree(GetProcessHeap(), 0, ptr);
}
static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context) static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context)
{ {
struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry); struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry);
...@@ -284,14 +269,6 @@ static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *contex ...@@ -284,14 +269,6 @@ static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *contex
HeapFree(GetProcessHeap(), 0, t); HeapFree(GetProcessHeap(), 0, t);
} }
static const struct wine_rb_functions winemenubuilder_rb_functions =
{
winemenubuilder_rb_alloc,
winemenubuilder_rb_realloc,
winemenubuilder_rb_free,
winemenubuilder_rb_string_compare,
};
static void write_xml_text(FILE *file, const char *text) static void write_xml_text(FILE *file, const char *text)
{ {
int i; int i;
...@@ -2538,19 +2515,12 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c ...@@ -2538,19 +2515,12 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c
static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir)
{ {
static const WCHAR openW[] = {'o','p','e','n',0}; static const WCHAR openW[] = {'o','p','e','n',0};
struct wine_rb_tree mimeProgidTree; struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare };
struct list nativeMimeTypes; struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes);
LSTATUS ret = 0; LSTATUS ret = 0;
int i; int i;
BOOL hasChanged = FALSE; BOOL hasChanged = FALSE;
if (wine_rb_init(&mimeProgidTree, &winemenubuilder_rb_functions))
{
WINE_ERR("wine_rb_init failed\n");
return FALSE;
}
list_init(&nativeMimeTypes);
if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes))
{ {
WINE_ERR("could not build native MIME types\n"); WINE_ERR("could not build native MIME types\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment