September 2012 - Wine-commits

Matteo Bruni : d3dcompiler: Allow casts to arrays.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 76525af7f1ecdb8f295fc9a7f3b1afebbd68ed49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76525af7f1ecdb8f295fc9a7f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 21 16:25:55 2012 +0200 d3dcompiler: Allow casts to arrays. --- dlls/d3dcompiler_43/hlsl.y | 5 ++++- dlls/d3dcompiler_43/utils.c | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index eea49be..7bce054 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1488,7 +1488,10 @@ unary_expr: postfix_expr return 1; } - dst_type = $3; + if ($4) + dst_type = new_array_type($3, $4); + else + dst_type = $3; if (!compatible_data_types(src_type, dst_type)) { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 84443ae..cc35ce9 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -854,8 +854,15 @@ struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_clas struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) { - FIXME("stub.\n"); - return NULL; + struct hlsl_type *type = new_hlsl_type(NULL, HLSL_CLASS_ARRAY, HLSL_TYPE_FLOAT, 1, 1); + + if (!type) + return NULL; + + type->modifiers = basic_type->modifiers; + type->e.array.elements_count = array_size; + type->e.array.type = basic_type; + return type; } struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) @@ -1791,6 +1798,12 @@ const char *debug_hlsl_type(const struct hlsl_type *type) if (type->type == HLSL_CLASS_STRUCT) return "<anonymous struct>"; + if (type->type == HLSL_CLASS_ARRAY) + { + name = debug_base_type(type->e.array.type); + return wine_dbg_sprintf("%s[%u]", name, type->e.array.elements_count); + } + name = debug_base_type(type); if (type->type == HLSL_CLASS_SCALAR)

1 0

Matteo Bruni : d3dcompiler: Parse "while" loops.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 5fc67931b809330d609236f102179d9e1a237127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc67931b809330d609236f10… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 21 16:25:56 2012 +0200 d3dcompiler: Parse "while" loops. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 +++ dlls/d3dcompiler_43/hlsl.y | 142 +++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 22207c9..03fe66c 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -707,6 +707,7 @@ enum hlsl_ir_node_type HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, HLSL_IR_IF, + HLSL_IR_LOOP, HLSL_IR_JUMP, HLSL_IR_SWIZZLE, }; @@ -768,6 +769,13 @@ struct hlsl_ir_if struct list *else_instrs; }; +struct hlsl_ir_loop +{ + struct hlsl_ir_node node; + /* loop condition is stored in the body (as "if (!condition) break;") */ + struct list *body; +}; + struct hlsl_ir_assignment { struct hlsl_ir_node node; @@ -1068,6 +1076,12 @@ static inline struct hlsl_ir_if *if_from_node(const struct hlsl_ir_node *node) return CONTAINING_RECORD(node, struct hlsl_ir_if, node); } +static inline struct hlsl_ir_loop *loop_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_LOOP); + return CONTAINING_RECORD(node, struct hlsl_ir_loop, node); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 7bce054..491a826 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -256,6 +256,130 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } +static struct hlsl_ir_if *loop_condition(struct list *cond_list) +{ + struct hlsl_ir_if *out_cond; + struct hlsl_ir_expr *not_cond; + struct hlsl_ir_node *cond, *operands[3]; + struct hlsl_ir_jump *jump; + unsigned int count = list_count(cond_list); + + if (!count) + return NULL; + if (count != 1) + ERR("Got multiple expressions in a for condition.\n"); + + cond = LIST_ENTRY(list_head(cond_list), struct hlsl_ir_node, entry); + out_cond = d3dcompiler_alloc(sizeof(*out_cond)); + if (!out_cond) + { + ERR("Out of memory.\n"); + return NULL; + } + out_cond->node.type = HLSL_IR_IF; + operands[0] = cond; + operands[1] = operands[2] = NULL; + not_cond = new_expr(HLSL_IR_UNOP_LOGIC_NOT, operands, &cond->loc); + if (!not_cond) + { + ERR("Out of memory.\n"); + d3dcompiler_free(out_cond); + return NULL; + } + out_cond->condition = &not_cond->node; + jump = d3dcompiler_alloc(sizeof(*jump)); + if (!jump) + { + ERR("Out of memory.\n"); + d3dcompiler_free(out_cond); + d3dcompiler_free(not_cond); + return NULL; + } + jump->node.type = HLSL_IR_JUMP; + jump->type = HLSL_IR_JUMP_BREAK; + out_cond->then_instrs = d3dcompiler_alloc(sizeof(*out_cond->then_instrs)); + if (!out_cond->then_instrs) + { + ERR("Out of memory.\n"); + d3dcompiler_free(out_cond); + d3dcompiler_free(not_cond); + d3dcompiler_free(jump); + return NULL; + } + list_init(out_cond->then_instrs); + list_add_head(out_cond->then_instrs, &jump->node.entry); + + return out_cond; +} + +enum loop_type +{ + LOOP_FOR, + LOOP_WHILE, + LOOP_DO_WHILE +}; + +static struct list *create_loop(enum loop_type type, struct list *init, struct list *cond, + struct list *iter, struct list *body, struct source_location *loc) +{ + struct list *list = NULL; + struct hlsl_ir_loop *loop = NULL; + struct hlsl_ir_if *cond_jump = NULL; + + list = d3dcompiler_alloc(sizeof(*list)); + if (!list) + goto oom; + list_init(list); + + if (init) + list_move_head(list, init); + + loop = d3dcompiler_alloc(sizeof(*loop)); + if (!loop) + goto oom; + loop->node.type = HLSL_IR_LOOP; + loop->node.loc = *loc; + list_add_tail(list, &loop->node.entry); + loop->body = d3dcompiler_alloc(sizeof(*loop->body)); + if (!loop->body) + goto oom; + list_init(loop->body); + + cond_jump = loop_condition(cond); + if (!cond_jump) + goto oom; + + if (type != LOOP_DO_WHILE) + list_add_tail(loop->body, &cond_jump->node.entry); + + list_move_tail(loop->body, body); + + if (iter) + list_move_tail(loop->body, iter); + + if (type == LOOP_DO_WHILE) + list_add_tail(loop->body, &cond_jump->node.entry); + + d3dcompiler_free(init); + d3dcompiler_free(cond); + d3dcompiler_free(iter); + d3dcompiler_free(body); + return list; + +oom: + ERR("Out of memory.\n"); + if (loop) + d3dcompiler_free(loop->body); + d3dcompiler_free(loop); + d3dcompiler_free(cond_jump); + d3dcompiler_free(list); + free_instr_list(init); + free_instr_list(cond); + free_instr_list(iter); + free_instr_list(body); + return NULL; +} + static unsigned int initializer_size(struct list *initializer) { unsigned int count = 0; @@ -573,6 +697,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis %type <list> compound_statement %type <list> jump_statement %type <list> selection_statement +%type <list> loop_statement %type <function> func_declaration %type <function> func_prototype %type <parameter> parameter @@ -1167,6 +1292,7 @@ statement: declaration_statement | compound_statement | jump_statement | selection_statement + | loop_statement /* FIXME: add rule for return with no value */ jump_statement: KW_RETURN expr ';' @@ -1227,6 +1353,22 @@ if_body: statement $$.else_instrs = $3; } +loop_statement: KW_WHILE '(' expr ')' statement + { + struct source_location loc; + struct list *cond = d3dcompiler_alloc(sizeof(*cond)); + + if (!cond) + { + ERR("Out of memory.\n"); + return -1; + } + list_init(cond); + list_add_head(cond, &$3->entry); + set_location(&loc, &@1); + $$ = create_loop(LOOP_WHILE, NULL, cond, NULL, $5, &loc); + } + expr_statement: ';' { $$ = d3dcompiler_alloc(sizeof(*$$));

1 0

Matteo Bruni : d3dcompiler: Parse "do-while" loop.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 2b7ad731a4a44a38ae8bac97a7682fee2fee4ec8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b7ad731a4a44a38ae8bac97a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 21 16:25:57 2012 +0200 d3dcompiler: Parse "do-while" loop. --- dlls/d3dcompiler_43/hlsl.y | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 491a826..9bc9145 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1368,6 +1368,21 @@ loop_statement: KW_WHILE '(' expr ')' statement set_location(&loc, &@1); $$ = create_loop(LOOP_WHILE, NULL, cond, NULL, $5, &loc); } + | KW_DO statement KW_WHILE '(' expr ')' ';' + { + struct source_location loc; + struct list *cond = d3dcompiler_alloc(sizeof(*cond)); + + if (!cond) + { + ERR("Out of memory.\n"); + return -1; + } + list_init(cond); + list_add_head(cond, &$5->entry); + set_location(&loc, &@1); + $$ = create_loop(LOOP_DO_WHILE, NULL, cond, NULL, $2, &loc); + } expr_statement: ';' {

1 0

Matteo Bruni : d3dcompiler: Parse "for" loops without variable declarations .
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 6e4617c14a7f6e4ebee90c3e4b811b727ad06bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4617c14a7f6e4ebee90c3e4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 21 16:25:58 2012 +0200 d3dcompiler: Parse "for" loops without variable declarations. --- dlls/d3dcompiler_43/hlsl.y | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 9bc9145..11764e5 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1383,6 +1383,14 @@ loop_statement: KW_WHILE '(' expr ')' statement set_location(&loc, &@1); $$ = create_loop(LOOP_DO_WHILE, NULL, cond, NULL, $2, &loc); } + | KW_FOR '(' scope_start expr_statement expr_statement expr_statement ')' statement + { + struct source_location loc; + + set_location(&loc, &@1); + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); + pop_scope(&hlsl_ctx); + } expr_statement: ';' {

1 0

Matteo Bruni : d3dcompiler: Parse "for" loops with declarations.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 778e98c19e53fcc6409798c3d46f45e9784617b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=778e98c19e53fcc6409798c3d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 21 16:25:59 2012 +0200 d3dcompiler: Parse "for" loops with declarations. --- dlls/d3dcompiler_43/hlsl.y | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 11764e5..88689f7 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1391,6 +1391,17 @@ loop_statement: KW_WHILE '(' expr ')' statement $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); pop_scope(&hlsl_ctx); } + | KW_FOR '(' scope_start declaration expr_statement expr_statement ')' statement + { + struct source_location loc; + + set_location(&loc, &@1); + if (!$4) + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_WARNING, + "no expressions in for loop initializer"); + $$ = create_loop(LOOP_FOR, $4, $5, $6, $8, &loc); + pop_scope(&hlsl_ctx); + } expr_statement: ';' {

1 0

Michael Stefaniuc : shell32/tests: Use the explicit type for a function pointer.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 5c02bc11e102a41236a8477f42ff583e09fc269f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c02bc11e102a41236a8477f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 21 17:52:51 2012 +0200 shell32/tests: Use the explicit type for a function pointer. --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ec96ed3..5130240 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1802,7 +1802,7 @@ static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) * by changing the entry for WaitForInputIdle() in the shell32 import address * table. */ -static void hook_WaitForInputIdle(void *new_func) +static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD)) { char *base; PIMAGE_NT_HEADERS nt_headers; @@ -1867,7 +1867,7 @@ static void test_dde(void) HANDLE map; char *shared_block; - hook_WaitForInputIdle((void *) hooked_WaitForInputIdle); + hook_WaitForInputIdle(hooked_WaitForInputIdle); sprintf(filename, "%s\\test file.sde", tmpdir);

1 0

Jacek Caban : jscript: Fixed conversion in place in IVariantChangeType:: ChangeType.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: c0d2029560372974001f75acbbaebda54473a51a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d2029560372974001f75acb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 21 18:00:33 2012 +0200 jscript: Fixed conversion in place in IVariantChangeType::ChangeType. --- dlls/jscript/jscript.c | 14 +++++++++++--- dlls/jscript/tests/caller.c | 10 ++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9704e4e..e38987c 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -1007,20 +1007,28 @@ static ULONG WINAPI VariantChangeType_Release(IVariantChangeType *iface) static HRESULT WINAPI VariantChangeType_ChangeType(IVariantChangeType *iface, VARIANT *dst, VARIANT *src, LCID lcid, VARTYPE vt) { JScript *This = impl_from_IVariantChangeType(iface); + VARIANT res; HRESULT hres; - TRACE("(%p)->(%p %s %x %d)\n", This, dst, debugstr_variant(src), lcid, vt); + TRACE("(%p)->(%p %p%s %x %d)\n", This, dst, src, debugstr_variant(src), lcid, vt); if(!This->ctx) { FIXME("Object uninitialized\n"); return E_UNEXPECTED; } - hres = VariantClear(dst); + hres = variant_change_type(This->ctx, &res, src, vt); if(FAILED(hres)) return hres; - return variant_change_type(This->ctx, dst, src, vt); + hres = VariantClear(dst); + if(FAILED(hres)) { + VariantClear(&res); + return hres; + } + + *dst = res; + return S_OK; } static const IVariantChangeTypeVtbl VariantChangeTypeVtbl = { diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 6fef7f1..f09ad90 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -168,6 +168,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_disp) { VARIANT v, dst; + BSTR str; HRESULT hres; static const conv_results_t bool_results[] = { @@ -214,6 +215,15 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di hres = IVariantChangeType_ChangeType(change_type, &dst, &v, 0, VT_I4); ok(hres == DISP_E_BADVARTYPE, "ChangeType failed: %08x, expected DISP_E_BADVARTYPE\n", hres); ok(V_VT(&dst) == 0xdead, "V_VT(dst) = %d\n", V_VT(&dst)); + + /* Test conversion in place */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = str = a2bstr("test"); + hres = IVariantChangeType_ChangeType(change_type, &v, &v, 0, VT_BSTR); + ok(hres == S_OK, "ChangeType failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BSTR(&v) != str, "V_BSTR(v) == str\n"); + ok(!strcmp_wa(V_BSTR(&v), "test"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); } static void test_caller(IServiceProvider *caller, IDispatch *arg_obj)

1 0

Piotr Caban : wininet: Call FreeUrlCacheSpaceW when cache is full.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: ed71ed596fcd2a613d982462c6b435b7eb808a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed71ed596fcd2a613d982462c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 21 14:53:33 2012 +0200 wininet: Call FreeUrlCacheSpaceW when cache is full. --- dlls/wininet/internet.c | 8 ++++++-- dlls/wininet/internet.h | 4 ++-- dlls/wininet/urlcache.c | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9091ce8..a6dbaa1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -292,7 +292,11 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) return FALSE; - URLCacheContainers_CreateDefaults(); + if(!init_urlcache()) + { + TlsFree(g_dwTlsErrIndex); + return FALSE; + } WININET_hModule = hinstDLL; break; @@ -310,7 +314,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_DETACH: collect_connections(COLLECT_CLEANUP); NETCON_unload(); - URLCacheContainers_DeleteAll(); + free_urlcache(); if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e3fb530..a4fcdaa 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -551,8 +551,8 @@ int sock_get_error(int) DECLSPEC_HIDDEN; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL); -extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; -extern void URLCacheContainers_DeleteAll(void) DECLSPEC_HIDDEN; +BOOL init_urlcache(void) DECLSPEC_HIDDEN; +void free_urlcache(void) DECLSPEC_HIDDEN; #define MAX_REPLY_LEN 0x5B4 diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 379288a..81ef5b6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2326,6 +2326,22 @@ static BOOL DeleteUrlCacheEntryInternal(const URLCACHECONTAINER * pContainer, return TRUE; } +static HANDLE free_cache_running; +static DWORD WINAPI handle_full_cache_worker(void *param) +{ + FreeUrlCacheSpaceW(NULL, 20, 0); + ReleaseSemaphore(free_cache_running, 1, NULL); + return 0; +} + +static void handle_full_cache(void) +{ + if(WaitForSingleObject(free_cache_running, 0) == WAIT_OBJECT_0) { + if(!QueueUserWorkItem(handle_full_cache_worker, NULL, 0)) + ReleaseSemaphore(free_cache_running, 1, NULL); + } +} + /*********************************************************************** * UnlockUrlCacheEntryFileA (WININET.@) * @@ -2712,7 +2728,6 @@ BOOL WINAPI CreateUrlCacheEntryW( return FALSE; } - /*********************************************************************** * CommitUrlCacheEntryInternal (Compensates for an MS bug) * @@ -2969,7 +2984,7 @@ static BOOL CommitUrlCacheEntryInternal( pHeader->CacheUsage.QuadPart += file_size.QuadPart; if (pHeader->CacheUsage.QuadPart + pHeader->ExemptUsage.QuadPart > pHeader->CacheLimit.QuadPart) - FIXME("file of size %s bytes fills cache\n", wine_dbgstr_longlong(file_size.QuadPart)); + handle_full_cache(); } cleanup: @@ -4114,3 +4129,22 @@ DWORD WINAPI RunOnceUrlCache(HWND hwnd, HINSTANCE hinst, LPSTR cmd, int cmdshow) FIXME("(%p, %p, %s, %d): stub\n", hwnd, hinst, debugstr_a(cmd), cmdshow); return 0; } + +BOOL init_urlcache(void) +{ + free_cache_running = CreateSemaphoreW(NULL, 1, 1, NULL); + if(!free_cache_running) + return FALSE; + + URLCacheContainers_CreateDefaults(); + return TRUE; +} + +void free_urlcache(void) +{ + WaitForSingleObject(free_cache_running, INFINITE); + ReleaseSemaphore(free_cache_running, 1, NULL); + CloseHandle(free_cache_running); + + URLCacheContainers_DeleteAll(); +}

1 0

Piotr Caban : wininet: Improved FreeUrlCacheSpaceW implementation.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 66931e4d9fefa959d109807f71fec4967a0c4828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66931e4d9fefa959d109807f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 21 14:53:47 2012 +0200 wininet: Improved FreeUrlCacheSpaceW implementation. --- dlls/wininet/urlcache.c | 374 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 292 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66931e4d9fefa959d1098…

1 0

Piotr Caban : wininet: Stop urlcache clearing when dll is being unloaded.
by Alexandre Julliard 21 Sep '12

21 Sep '12

Module: wine Branch: master Commit: 34dc7964068a67d65cb71a15ec59c5b272069ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34dc7964068a67d65cb71a15e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 21 14:53:57 2012 +0200 wininet: Stop urlcache clearing when dll is being unloaded. --- dlls/wininet/urlcache.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 48a88a2..8a221a8 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2270,6 +2270,7 @@ static BOOL DeleteUrlCacheEntryInternal(const URLCACHECONTAINER * pContainer, } static HANDLE free_cache_running; +static HANDLE dll_unload_event; static DWORD WINAPI handle_full_cache_worker(void *param) { FreeUrlCacheSpaceW(NULL, 20, 0); @@ -2523,6 +2524,10 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR cache_path, DWORD size, DWORD filter) /* Allow other threads to use cache while cleaning */ URLCacheContainer_UnlockIndex(container, header); + if(WaitForSingleObject(dll_unload_event, 0) == WAIT_OBJECT_0) { + TRACE("got dll_unload_event - finishing\n"); + return TRUE; + } Sleep(0); header = URLCacheContainer_LockIndex(container); } @@ -4342,9 +4347,15 @@ DWORD WINAPI RunOnceUrlCache(HWND hwnd, HINSTANCE hinst, LPSTR cmd, int cmdshow) BOOL init_urlcache(void) { + dll_unload_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if(!dll_unload_event) + return FALSE; + free_cache_running = CreateSemaphoreW(NULL, 1, 1, NULL); - if(!free_cache_running) + if(!free_cache_running) { + CloseHandle(dll_unload_event); return FALSE; + } URLCacheContainers_CreateDefaults(); return TRUE; @@ -4352,9 +4363,11 @@ BOOL init_urlcache(void) void free_urlcache(void) { + SetEvent(dll_unload_event); WaitForSingleObject(free_cache_running, INFINITE); ReleaseSemaphore(free_cache_running, 1, NULL); CloseHandle(free_cache_running); + CloseHandle(dll_unload_event); URLCacheContainers_DeleteAll(); }

1 0