September 2012 - Wine-Commits

Christian Costa : dmsynth: Implement IKsControl_KsProperty for Synth and SynthSink objects.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: b3b7616f79c30b846e4ce7a30ceba88543eb6683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b7616f79c30b846e4ce7a30… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 21 15:44:37 2012 +0200 dmsynth: Implement IKsControl_KsProperty for Synth and SynthSink objects. --- dlls/dmsynth/synth.c | 48 ++++++++++++++++++++++++++++++++++++++++- dlls/dmsynth/synthsink.c | 28 ++++++++++++++++++++++- dlls/dmsynth/tests/dmsynth.c | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 4 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 29761d7..f34594d 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -2,6 +2,7 @@ * IDirectMusicSynth8 Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -415,9 +416,52 @@ static ULONG WINAPI DMSynthImpl_IKsControl_Release(IKsControl* iface) static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - return E_NOTIMPL; + TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); + + if (Property->Flags != KSPROPERTY_TYPE_GET) + { + FIXME("Property flags %u not yet supported\n", Property->Flags); + return S_FALSE; + } + + if (DataLength < sizeof(DWORD)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_INSTRUMENT2)) + { + *(DWORD*)PropertyData = TRUE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_DLS2)) + { + *(DWORD*)PropertyData = TRUE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GM_Hardware)) + { + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GS_Hardware)) + { + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_XG_Hardware)) + { + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + else + { + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + + return S_OK; } static HRESULT WINAPI DMSynthImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index a63f36c..4d2001c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -2,6 +2,7 @@ * IDirectMusicSynthSink Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -209,9 +210,32 @@ static ULONG WINAPI DMSynthSinkImpl_IKsControl_Release(IKsControl* iface) static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, ULONG DataLength, ULONG* BytesReturned) { - FIXME("(%p)->(%p, %u, %p, %u, %p): stub\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); + TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned); - return E_NOTIMPL; + TRACE("Property = %s - %u - %u\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags); + + if (Property->Flags != KSPROPERTY_TYPE_GET) + { + FIXME("Property flags %u not yet supported\n", Property->Flags); + return S_FALSE; + } + + if (DataLength < sizeof(DWORD)) + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_SinkUsesDSound)) + { + *(DWORD*)PropertyData = TRUE; + *BytesReturned = sizeof(DWORD); + } + else + { + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); + *(DWORD*)PropertyData = FALSE; + *BytesReturned = sizeof(DWORD); + } + + return S_OK; } static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsMethod(IKsControl* iface, PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 4ffc90c..83a0bca 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -39,6 +39,9 @@ static void test_dmsynth(void) IKsControl* control_synth = NULL; IKsControl* control_sink = NULL; HRESULT hr; + KSPROPERTY property; + ULONG value; + ULONG bytes; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); if (hr != S_OK) @@ -52,9 +55,45 @@ static void test_dmsynth(void) hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); ok(hr == S_OK, "IDirectMusicSynth_QueryInterface returned: %x\n", hr); + + property.Id = 0; + property.Flags = KSPROPERTY_TYPE_GET; + + property.Set = GUID_DMUS_PROP_INSTRUMENT2; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == TRUE, "Return value: %u, should be 1\n", value); + property.Set = GUID_DMUS_PROP_DLS2; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == TRUE, "Return value: %u, should be 1\n", value); + property.Set = GUID_DMUS_PROP_GM_Hardware; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == FALSE, "Return value: %u, should be 0\n", value); + property.Set = GUID_DMUS_PROP_GS_Hardware; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == FALSE, "Return value: %u, should be 0\n", value); + property.Set = GUID_DMUS_PROP_XG_Hardware; + hr = IKsControl_KsProperty(control_synth, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == FALSE, "Return value: %u, should be 0\n", value); + hr = IDirectMusicSynthSink_QueryInterface(dmsynth_sink, &IID_IKsControl, (LPVOID*)&control_sink); ok(hr == S_OK, "IDirectMusicSynthSink_QueryInterface returned: %x\n", hr); + property.Set = GUID_DMUS_PROP_SinkUsesDSound; + hr = IKsControl_KsProperty(control_sink, &property, sizeof(property), &value, sizeof(value), &bytes); + ok(hr == S_OK, "IKsControl_KsProperty returned: %x\n", hr); + ok(bytes == sizeof(DWORD), "Returned bytes: %u, should be 4\n", bytes); + ok(value == TRUE, "Return value: %u, should be 1\n", value); + /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_GetLatencyClock returned: %x\n", hr);

1 0

Christian Costa : dmime: Rename params in IDirectMusicPerformance8Impl_AssignPChannel & IDirectMusicPerformance8Impl_PChannelInfo .
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 1acf5a0401e48012104a6888d643668b8ded195d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acf5a0401e48012104a6888d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Sep 21 16:02:10 2012 +0200 dmime: Rename params in IDirectMusicPerformance8Impl_AssignPChannel & IDirectMusicPerformance8Impl_PChannelInfo. --- dlls/dmime/performance.c | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 0f76e36..dfa1b77 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -684,34 +684,37 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMu } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPerformance8 *iface, - DWORD dwPChannel, IDirectMusicPort *pPort, DWORD dwGroup, DWORD dwMChannel) + DWORD PChannel, IDirectMusicPort *port, DWORD group, DWORD MChannel) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - TRACE("(%p, %d, %p, %d, %d)\n", This, dwPChannel, pPort, dwGroup, dwMChannel); - if (NULL == pPort) return E_POINTER; - This->PChannel[dwPChannel].port = pPort; - This->PChannel[dwPChannel].group = dwGroup; - This->PChannel[dwPChannel].channel = dwMChannel; + TRACE("(%p)->(%d, %p, %d, %d)\n", This, PChannel, port, group, MChannel); - return S_OK; + if (!port) + return E_POINTER; + + This->PChannel[PChannel].port = port; + This->PChannel[PChannel].group = group; + This->PChannel[PChannel].channel = MChannel; + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerformance8 *iface, - DWORD dwPChannel, IDirectMusicPort **ppPort, DWORD *pdwGroup, DWORD *pdwMChannel) + DWORD PChannel, IDirectMusicPort **port, DWORD *group, DWORD *MChannel) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PORTPARAMS8 dmusportparams; - GUID def; + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + DMUS_PORTPARAMS8 port_params; + GUID default_port; - FIXME("(%p, %d, %p, %p, %p): stub\n", This, dwPChannel, ppPort, pdwGroup, pdwMChannel); + FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, PChannel, port, group, MChannel); - dmusportparams.dwSize = sizeof(DMUS_PORTPARAMS8); - dmusportparams.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->pDirectMusic, &def); - IDirectMusic8_CreatePort(This->pDirectMusic, &def, &dmusportparams, ppPort, NULL); + port_params.dwSize = sizeof(DMUS_PORTPARAMS8); + port_params.dwValidParams = 0; + IDirectMusic8_GetDefaultPort(This->pDirectMusic, &default_port); + IDirectMusic8_CreatePort(This->pDirectMusic, &default_port, &port_params, port, NULL); - return S_OK; + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_DownloadInstrument(IDirectMusicPerformance8 *iface,

1 0

Matteo Bruni : d3dcompiler: Allow casts to arrays.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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 "for" loops without variable declarations .
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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 Sept. 21, 2012

Sept. 21, 2012

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

Piotr Caban : wininet: Update used blocks count when block is allocated or freed.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

Module: wine Branch: master Commit: 8bb1af84f465cbe5b802a7b0c98a712c3a1042d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb1af84f465cbe5b802a7b0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 21 14:54:15 2012 +0200 wininet: Update used blocks count when block is allocated or freed. --- dlls/wininet/urlcache.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 8a221a8..87789fe 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -781,6 +781,9 @@ static inline BYTE URLCache_Allocation_BlockIsFree(BYTE * AllocationTable, DWORD * * Marks the specified block as free * + * CAUTION + * this function is not updating used blocks count + * * RETURNS * nothing * @@ -796,6 +799,9 @@ static inline void URLCache_Allocation_BlockFree(BYTE * AllocationTable, DWORD d * * Marks the specified block as allocated * + * CAUTION + * this function is not updating used blocks count + * * RETURNS * nothing * @@ -840,6 +846,7 @@ static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBloc for (index = 0; index < dwBlocksNeeded * BLOCKSIZE / sizeof(DWORD); index++) ((DWORD*)*ppEntry)[index] = 0xdeadbeef; (*ppEntry)->dwBlocksUsed = dwBlocksNeeded; + pHeader->dwBlocksInUse += dwBlocksNeeded; return ERROR_SUCCESS; } } @@ -867,6 +874,7 @@ static BOOL URLCache_DeleteEntry(LPURLCACHE_HEADER pHeader, CACHEFILE_ENTRY * pE for (dwBlock = dwStartBlock; dwBlock < dwStartBlock + pEntry->dwBlocksUsed; dwBlock++) URLCache_Allocation_BlockFree(pHeader->allocation_table, dwBlock); + pHeader->dwBlocksInUse -= pEntry->dwBlocksUsed; return TRUE; }

1 0

Piotr Caban : wininet: Stop urlcache clearing when dll is being unloaded.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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

Matteo Bruni : d3dcompiler: Parse "do-while" loop.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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

Piotr Caban : wininet: Improved FreeUrlCacheSpaceW implementation.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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: Call FreeUrlCacheSpaceW when cache is full.
by Alexandre Julliard Sept. 21, 2012

Sept. 21, 2012

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