May 2012 - Wine-commits - list.winehq.org

Francois Gouget : vbscript: Add support for integer values in conditional jumps.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: d090c39470b57fa931299c7c0b0b8027a8f181fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d090c39470b57fa931299c7c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 23 15:36:04 2012 +0200 vbscript: Add support for integer values in conditional jumps. --- dlls/vbscript/interp.c | 52 +++++++++++++++++++++++++++-------------- dlls/vbscript/tests/lang.vbs | 8 ++++++ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 67e1070..3f3e9c8 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -350,6 +350,34 @@ static inline void release_val(variant_val_t *v) VariantClear(v->v); } +static int stack_pop_bool(exec_ctx_t *ctx, BOOL *b) +{ + variant_val_t val; + HRESULT hres; + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + switch (V_VT(val.v)) + { + case VT_BOOL: + *b = V_BOOL(val.v); + break; + case VT_I2: + *b = V_I2(val.v); + break; + case VT_I4: + *b = V_I4(val.v); + break; + default: + FIXME("unsupported for %s\n", debugstr_variant(val.v)); + release_val(&val); + return E_NOTIMPL; + } + return S_OK; +} + static HRESULT stack_pop_disp(exec_ctx_t *ctx, IDispatch **ret) { VARIANT *v = stack_pop(ctx); @@ -886,22 +914,16 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) static HRESULT interp_jmp_false(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; - variant_val_t val; HRESULT hres; + BOOL b; TRACE("%u\n", arg); - hres = stack_pop_val(ctx, &val); + hres = stack_pop_bool(ctx, &b); if(FAILED(hres)) return hres; - if(V_VT(val.v) != VT_BOOL) { - FIXME("unsupported for %s\n", debugstr_variant(val.v)); - release_val(&val); - return E_NOTIMPL; - } - - if(V_BOOL(val.v)) + if(b) ctx->instr++; else instr_jmp(ctx, ctx->instr->arg1.uint); @@ -911,22 +933,16 @@ static HRESULT interp_jmp_false(exec_ctx_t *ctx) static HRESULT interp_jmp_true(exec_ctx_t *ctx) { const unsigned arg = ctx->instr->arg1.uint; - variant_val_t val; HRESULT hres; + BOOL b; TRACE("%u\n", arg); - hres = stack_pop_val(ctx, &val); + hres = stack_pop_bool(ctx, &b); if(FAILED(hres)) return hres; - if(V_VT(val.v) != VT_BOOL) { - FIXME("unsupported for %s\n", debugstr_variant(val.v)); - release_val(&val); - return E_NOTIMPL; - } - - if(V_BOOL(val.v)) + if(b) instr_jmp(ctx, ctx->instr->arg1.uint); else ctx->instr++; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 1015e34..4900a52 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -260,6 +260,14 @@ End If Call ok(x, "elseif not called?") x = false +if 1 then x = true +Call ok(x, "if 1 not run?") + +x = false +if &h10000& then x = true +Call ok(x, "if &h10000& not run?") + +x = false y = false while not (x and y) if x then

1 0

Francois Gouget : d3d8: Add a trailing '\n' to an ERR() message.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: e06ed82e94871b93322b7aa478753698f3dea739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06ed82e94871b93322b7aa47… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 23 15:41:14 2012 +0200 d3d8: Add a trailing '\n' to an ERR() message. --- dlls/d3d8/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1ec011b..48e4d65 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2372,7 +2372,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, else { if (FAILED(hr)) - ERR("Failed to get wined3d index buffer, hr %#x.", hr); + ERR("Failed to get wined3d index buffer, hr %#x.\n", hr); *buffer = NULL; } wined3d_mutex_unlock();

1 0

Vincent Povirk : propsys: Add tests for CLSID_InMemoryPropertyStore.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 0e8b9b12114a7e89c778655db414e0cbbb8b4998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8b9b12114a7e89c778655db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 10:46:57 2012 -0500 propsys: Add tests for CLSID_InMemoryPropertyStore. --- dlls/propsys/tests/Makefile.in | 1 + dlls/propsys/tests/propstore.c | 206 ++++++++++++++++++++++++++++++++++++++++ dlls/propsys/tests/propsys.c | 2 +- 3 files changed, 208 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/tests/Makefile.in b/dlls/propsys/tests/Makefile.in index 312a3a9..cb502fd 100644 --- a/dlls/propsys/tests/Makefile.in +++ b/dlls/propsys/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = propsys.dll IMPORTS = propsys ole32 oleaut32 C_SRCS = \ + propstore.c \ propsys.c @MAKE_TEST_RULES@ diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c new file mode 100644 index 0000000..e8bedc6 --- /dev/null +++ b/dlls/propsys/tests/propstore.c @@ -0,0 +1,206 @@ +/* + * Unit tests for IPropertyStore and related interfaces + * + * Copyright 2012 Vincent Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <stdio.h> + +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "propsys.h" +#include "wine/test.h" + +#include "initguid.h" + +DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); + +static void test_inmemorystore(void) +{ + IPropertyStoreCache *propcache; + HRESULT hr; + PROPERTYKEY pkey; + PROPVARIANT propvar; + DWORD count; + PSC_STATE state; + + hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER, + &IID_IPropertyStoreCache, (void**)&propcache); + todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + + if (FAILED(hr)) + { + skip("CLSID_InMemoryPropertyStore not supported\n"); + return; + } + + hr = IPropertyStoreCache_GetCount(propcache, NULL); + ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetCount(propcache, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 0, "GetCount returned %i, expected 0\n", count); + + hr = IPropertyStoreCache_Commit(propcache); + ok(hr == S_OK, "Commit failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_Commit(propcache); + ok(hr == S_OK, "Commit failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); + ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr); + + pkey.fmtid = PKEY_WineTest; + pkey.pid = 4; + + memset(&propvar, 0, sizeof(propvar)); + propvar.vt = VT_I4; + propvar.u.lVal = 12345; + + if (0) + { + /* Crashes on Windows 7 */ + hr = IPropertyStoreCache_SetValue(propcache, NULL, &propvar); + ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_SetValue(propcache, &pkey, NULL); + ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr); + } + + hr = IPropertyStoreCache_SetValue(propcache, &pkey, &propvar); + ok(hr == S_OK, "SetValue failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetCount(propcache, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "GetCount returned %i, expected 0\n", count); + + memset(&pkey, 0, sizeof(pkey)); + + hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey); + ok(hr == S_OK, "GetAt failed, hr=%x\n", hr); + ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n"); + ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid); + + pkey.fmtid = PKEY_WineTest; + pkey.pid = 4; + + memset(&propvar, 0, sizeof(propvar)); + + if (0) + { + /* Crashes on Windows 7 */ + hr = IPropertyStoreCache_GetValue(propcache, NULL, &propvar); + ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); + } + + hr = IPropertyStoreCache_GetValue(propcache, &pkey, NULL); + ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); + + hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(propvar.u.lVal == 12345, "expected 12345, got %d\n", propvar.u.lVal); + + pkey.fmtid = PKEY_WineTest; + pkey.pid = 10; + + /* Get information for field that isn't set yet */ + propvar.vt = VT_I2; + hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); + + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetState failed, hr=%x\n", hr); + ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); + + propvar.vt = VT_I2; + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetValueAndState failed, hr=%x\n", hr); + ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); + ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); + + /* Set state on an unset field */ + hr = IPropertyStoreCache_SetState(propcache, &pkey, PSC_NORMAL); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "SetState failed, hr=%x\n", hr); + + /* Manipulate state on already set field */ + pkey.fmtid = PKEY_WineTest; + pkey.pid = 4; + + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); + ok(hr == S_OK, "GetState failed, hr=%x\n", hr); + ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); + + hr = IPropertyStoreCache_SetState(propcache, &pkey, 10); + ok(hr == S_OK, "SetState failed, hr=%x\n", hr); + + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); + ok(hr == S_OK, "GetState failed, hr=%x\n", hr); + ok(state == 10, "expected 10, got %d\n", state); + + propvar.vt = VT_I4; + propvar.u.lVal = 12346; + hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, 5); + ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); + + memset(&propvar, 0, sizeof(propvar)); + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); + ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(propvar.u.lVal == 12346, "expected 12346, got %d\n", propvar.vt); + ok(state == 5, "expected 5, got %d\n", state); + + /* Set new field with state */ + pkey.fmtid = PKEY_WineTest; + pkey.pid = 8; + + propvar.vt = VT_I4; + propvar.u.lVal = 12347; + hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, PSC_DIRTY); + ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); + + memset(&propvar, 0, sizeof(propvar)); + state = 0xdeadbeef; + hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); + ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(propvar.u.lVal == 12347, "expected 12347, got %d\n", propvar.vt); + ok(state == PSC_DIRTY, "expected PSC_DIRTY, got %d\n", state); + + IPropertyStoreCache_Release(propcache); +} + +START_TEST(propstore) +{ + CoInitialize(NULL); + + test_inmemorystore(); + + CoUninitialize(); +} diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 850d3d2..9641d05 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -29,9 +29,9 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "initguid.h" #include "propsys.h" #include "propvarutil.h" -#include "initguid.h" #include "wine/test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

1 0

Vincent Povirk : propsys: Register CLSID_InMemoryPropertyStore.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: f37bbdc159fa525eb7ed74c3a11113f418f1b89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37bbdc159fa525eb7ed74c3a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 11:17:29 2012 -0500 propsys: Register CLSID_InMemoryPropertyStore. --- dlls/propsys/Makefile.in | 2 ++ dlls/propsys/propsys.spec | 4 ++-- dlls/propsys/propsys_classes.idl | 26 ++++++++++++++++++++++++++ dlls/propsys/propsys_main.c | 14 ++++++++++++++ 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 1cbbe7c..10d2013 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -6,4 +6,6 @@ C_SRCS = \ propsys_main.c \ propvar.c +IDL_R_SRCS = propsys_classes.idl + @MAKE_DLL_RULES@ diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 4b617ea..11b1397 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -25,8 +25,8 @@ @ stub ClearVariantArray @ stub DllCanUnloadNow @ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub InitPropVariantFromBooleanVector @ stdcall InitPropVariantFromBuffer(ptr long ptr) @ stub InitPropVariantFromCLSID diff --git a/dlls/propsys/propsys_classes.idl b/dlls/propsys/propsys_classes.idl new file mode 100644 index 0000000..28c23f2 --- /dev/null +++ b/dlls/propsys/propsys_classes.idl @@ -0,0 +1,26 @@ +/* + * Coclasses for propsys + * + * Copyright 2012 Vincent Povirk for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("Packed Property Storage Object"), + threading(both), + uuid(9a02e012-6303-4e1e-b9a1-630f802592c5) +] +coclass InMemoryPropertyStore { interface IPropertyStoreCache; } diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 3c2c3ed..264b3aa 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -26,12 +26,15 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "rpcproxy.h" #include "propsys.h" #include "wine/debug.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(propsys); +static HINSTANCE propsys_hInstance; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -41,6 +44,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + propsys_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: @@ -52,6 +56,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( propsys_hInstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( propsys_hInstance ); +} + HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { FIXME("%s stub\n", debugstr_w(path));

1 0

Vincent Povirk : propsys: Add stub InMemoryPropertyStore implementation.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: d8fcf75d0431c0055d5d547bd200b4611245ab38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8fcf75d0431c0055d5d547bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 14:18:11 2012 -0500 propsys: Add stub InMemoryPropertyStore implementation. --- dlls/propsys/Makefile.in | 3 +- dlls/propsys/propstore.c | 193 ++++++++++++++++++++++++++++++++++++++++ dlls/propsys/propsys.spec | 4 +- dlls/propsys/propsys_main.c | 77 ++++++++++++++++ dlls/propsys/propsys_private.h | 21 +++++ dlls/propsys/tests/propstore.c | 76 ++++++++-------- 6 files changed, 333 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8fcf75d0431c0055d5d5…

1 0

Vincent Povirk : propsys: Implement IPropertyStore::SetValue and GetValue.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 51ab8139481a6617a44ca804e69911d77c86f92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=51ab8139481a6617a44ca804e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:19:51 2012 -0500 propsys: Implement IPropertyStore::SetValue and GetValue. --- dlls/propsys/propstore.c | 149 ++++++++++++++++++++++++++++++++++++++- dlls/propsys/tests/propstore.c | 14 ++-- 2 files changed, 152 insertions(+), 11 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 889b9a5..88a6a7e 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -30,14 +30,34 @@ #include "propsys.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" +#include "initguid.h" #include "propsys_private.h" +DEFINE_GUID(FMTID_NamedProperties, 0xd5cdd505, 0x2e9c, 0x101b, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae); + WINE_DEFAULT_DEBUG_CHANNEL(propsys); typedef struct { + struct list entry; + DWORD pid; + PROPVARIANT propvar; + PSC_STATE state; +} propstore_value; + +typedef struct { + struct list entry; + GUID fmtid; + struct list values; /* list of struct propstore_value */ + DWORD count; +} propstore_format; + +typedef struct { IPropertyStoreCache IPropertyStoreCache_iface; LONG ref; + CRITICAL_SECTION lock; + struct list formats; /* list of struct propstore_format */ } PropertyStore; static inline PropertyStore *impl_from_IPropertyStoreCache(IPropertyStoreCache *iface) @@ -79,6 +99,17 @@ static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface) return ref; } +static void destroy_format(propstore_format *format) +{ + propstore_value *cursor, *cursor2; + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &format->values, propstore_value, entry) + { + PropVariantClear(&cursor->propvar); + HeapFree(GetProcessHeap(), 0, cursor); + } + HeapFree(GetProcessHeap(), 0, format); +} + static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) { PropertyStore *This = impl_from_IPropertyStoreCache(iface); @@ -87,7 +118,14 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) TRACE("(%p) refcount=%u\n", iface, ref); if (ref == 0) + { + propstore_format *cursor, *cursor2; + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, &This->formats, propstore_format, entry) + destroy_format(cursor); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -106,18 +144,118 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, return E_NOTIMPL; } +static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key, + int insert, propstore_value **result) +{ + propstore_format *format=NULL, *format_candidate; + propstore_value *value=NULL, *value_candidate; + + if (IsEqualGUID(&key->fmtid, &FMTID_NamedProperties)) + { + /* This is used in the property store format [MS-PROPSTORE] + * for named values and probably gets special treatment. */ + ERR("don't know how to handle FMTID_NamedProperties\n"); + return E_FAIL; + } + + LIST_FOR_EACH_ENTRY(format_candidate, &This->formats, propstore_format, entry) + { + if (IsEqualGUID(&format_candidate->fmtid, &key->fmtid)) + { + format = format_candidate; + break; + } + } + + if (!format) + { + if (!insert) + return TYPE_E_ELEMENTNOTFOUND; + + format = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format)); + if (!format) + return E_OUTOFMEMORY; + + format->fmtid = key->fmtid; + list_init(&format->values); + list_add_tail(&This->formats, &format->entry); + } + + LIST_FOR_EACH_ENTRY(value_candidate, &format->values, propstore_value, entry) + { + if (value_candidate->pid == key->pid) + { + value = value_candidate; + break; + } + } + + if (!value) + { + if (!insert) + return TYPE_E_ELEMENTNOTFOUND; + + value = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*value)); + if (!value) + return E_OUTOFMEMORY; + + value->pid = key->pid; + list_add_tail(&format->values, &value->entry); + } + + *result = value; + + return S_OK; +} + static HRESULT WINAPI PropertyStore_GetValue(IPropertyStoreCache *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { - FIXME("%p,%p,%p: stub\n", iface, key, pv); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p\n", iface, key, pv); + + if (!pv) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(pv, &value->propvar); + else if (hr == TYPE_E_ELEMENTNOTFOUND) + { + PropVariantInit(pv); + hr = S_OK; + } + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI PropertyStore_SetValue(IPropertyStoreCache *iface, REFPROPERTYKEY key, REFPROPVARIANT propvar) { - FIXME("%p,%p,%p: stub\n", iface, key, propvar); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p\n", iface, key, propvar); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 1, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(&value->propvar, propvar); + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI PropertyStore_Commit(IPropertyStoreCache *iface) @@ -185,6 +323,9 @@ HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv This->IPropertyStoreCache_iface.lpVtbl = &PropertyStore_Vtbl; This->ref = 1; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStore.lock"); + list_init(&This->formats); ret = IPropertyStoreCache_QueryInterface(&This->IPropertyStoreCache_iface, iid, ppv); IPropertyStoreCache_Release(&This->IPropertyStoreCache_iface); diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 1dc3085..c24cb35 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -88,7 +88,7 @@ static void test_inmemorystore(void) } hr = IPropertyStoreCache_SetValue(propcache, &pkey, &propvar); - todo_wine ok(hr == S_OK, "SetValue failed, hr=%x\n", hr); + ok(hr == S_OK, "SetValue failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetCount(propcache, &count); todo_wine ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); @@ -114,12 +114,12 @@ static void test_inmemorystore(void) } hr = IPropertyStoreCache_GetValue(propcache, &pkey, NULL); - todo_wine ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); + ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); - todo_wine ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); - todo_wine ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); - todo_wine ok(propvar.u.lVal == 12345, "expected 12345, got %d\n", propvar.u.lVal); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(propvar.u.lVal == 12345, "expected 12345, got %d\n", propvar.u.lVal); pkey.fmtid = PKEY_WineTest; pkey.pid = 10; @@ -127,8 +127,8 @@ static void test_inmemorystore(void) /* Get information for field that isn't set yet */ propvar.vt = VT_I2; hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar); - todo_wine ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); - todo_wine ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); state = 0xdeadbeef; hr = IPropertyStoreCache_GetState(propcache, &pkey, &state);

1 0

Vincent Povirk : propsys: Implement IPropertyStore::GetCount.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: d2d225f6a5228899a358f8ef05d77fbadd2d2385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d225f6a5228899a358f8ef0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:24:03 2012 -0500 propsys: Implement IPropertyStore::GetCount. --- dlls/propsys/propstore.c | 21 +++++++++++++++++++-- dlls/propsys/tests/propstore.c | 10 +++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 88a6a7e..b89eb76 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -133,8 +133,24 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) static HRESULT WINAPI PropertyStore_GetCount(IPropertyStoreCache *iface, DWORD *cProps) { - FIXME("%p,%p: stub\n", iface, cProps); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_format *format; + + TRACE("%p,%p\n", iface, cProps); + + if (!cProps) + return E_POINTER; + + *cProps = 0; + + EnterCriticalSection(&This->lock); + + LIST_FOR_EACH_ENTRY(format, &This->formats, propstore_format, entry) + *cProps += format->count; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, @@ -201,6 +217,7 @@ static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key value->pid = key->pid; list_add_tail(&format->values, &value->entry); + format->count++; } *result = value; diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index c24cb35..6ca67e9 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -55,11 +55,11 @@ static void test_inmemorystore(void) } hr = IPropertyStoreCache_GetCount(propcache, NULL); - todo_wine ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr); + ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetCount(propcache, &count); - todo_wine ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - todo_wine ok(count == 0, "GetCount returned %i, expected 0\n", count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 0, "GetCount returned %i, expected 0\n", count); hr = IPropertyStoreCache_Commit(propcache); ok(hr == S_OK, "Commit failed, hr=%x\n", hr); @@ -91,8 +91,8 @@ static void test_inmemorystore(void) ok(hr == S_OK, "SetValue failed, hr=%x\n", hr); hr = IPropertyStoreCache_GetCount(propcache, &count); - todo_wine ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); - todo_wine ok(count == 1, "GetCount returned %i, expected 0\n", count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 1, "GetCount returned %i, expected 0\n", count); memset(&pkey, 0, sizeof(pkey));

1 0

Jacek Caban : wininet: Moved querying INTERNET_OPTION_REQUEST_FLAGS implementation to HTTPREQ_QueryOption .
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: c0400560b54458335b77af847c46a65722199af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0400560b54458335b77af847… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 23 18:24:02 2012 +0200 wininet: Moved querying INTERNET_OPTION_REQUEST_FLAGS implementation to HTTPREQ_QueryOption. --- dlls/wininet/http.c | 10 ++++++++++ dlls/wininet/internet.c | 20 ++++++++------------ dlls/wininet/tests/internet.c | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index da10282..f26f45f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2158,6 +2158,16 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); *(DWORD *)buffer = req->connect_timeout; return ERROR_SUCCESS; + case INTERNET_OPTION_REQUEST_FLAGS: + TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); + + if (*size < sizeof(DWORD)) + return ERROR_INSUFFICIENT_BUFFER; + + *(DWORD*)buffer = 4; + *size = sizeof(DWORD); + + return ERROR_SUCCESS; } return INET_QueryOption(hdr, option, buffer, size, unicode); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 66f25eb..a41225f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1214,7 +1214,7 @@ HINTERNET WINAPI InternetConnectW(HINTERNET hInternet, HINTERNET rc = NULL; DWORD res = ERROR_SUCCESS; - TRACE("(%p, %s, %i, %s, %s, %i, %i, %lx)\n", hInternet, debugstr_w(lpszServerName), + TRACE("(%p, %s, %i, %s, %s, %i, %x, %lx)\n", hInternet, debugstr_w(lpszServerName), nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword), dwService, dwFlags, dwContext); @@ -2319,17 +2319,6 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u /* FIXME: This function currently handles more options than it should. Options requiring * proper handles should be moved to proper functions */ switch(option) { - case INTERNET_OPTION_REQUEST_FLAGS: - TRACE("INTERNET_OPTION_REQUEST_FLAGS\n"); - - if (*size < sizeof(ULONG)) - return ERROR_INSUFFICIENT_BUFFER; - - *(ULONG*)buffer = 4; - *size = sizeof(ULONG); - - return ERROR_SUCCESS; - case INTERNET_OPTION_HTTP_VERSION: if (*size < sizeof(HTTP_VERSION_INFO)) return ERROR_INSUFFICIENT_BUFFER; @@ -2471,7 +2460,9 @@ static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL u return res; } + case INTERNET_OPTION_REQUEST_FLAGS: case INTERNET_OPTION_USER_AGENT: + *size = 0; return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; case INTERNET_OPTION_POLICY: return ERROR_INVALID_PARAMETER; @@ -2509,6 +2500,11 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * *size = sizeof(DWORD_PTR); return ERROR_SUCCESS; + case INTERNET_OPTION_REQUEST_FLAGS: + WARN("INTERNET_OPTION_REQUEST_FLAGS\n"); + *size = sizeof(DWORD); + return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; + case INTERNET_OPTION_MAX_CONNS_PER_SERVER: case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER: WARN("Called on global option %u\n", option); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 8d91661..3567cc8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -212,6 +212,22 @@ static void test_InternetQueryOptionA(void) ok(retval == 0,"Got wrong return value %d\n",retval); ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); + SetLastError(0xdeadbeef); + len = sizeof(DWORD); + retval = InternetQueryOptionA(hurl,INTERNET_OPTION_REQUEST_FLAGS,NULL,&len); + err = GetLastError(); + ok(retval == 0,"Got wrong return value %d\n",retval); + ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); + ok(len == sizeof(DWORD), "len = %d\n", len); + + SetLastError(0xdeadbeef); + len = sizeof(DWORD); + retval = InternetQueryOptionA(NULL,INTERNET_OPTION_REQUEST_FLAGS,NULL,&len); + err = GetLastError(); + ok(retval == 0,"Got wrong return value %d\n",retval); + ok(err == ERROR_INTERNET_INCORRECT_HANDLE_TYPE, "Got wrong error code %d\n",err); + ok(!len, "len = %d\n", len); + InternetCloseHandle(hurl); InternetCloseHandle(hinet);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 786bcf99efa77446c60f00d7b46dc1a701a27ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=786bcf99efa77446c60f00d7b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed May 23 19:41:21 2012 +0300 po: Update Finnish translation. --- po/fi.po | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2581565..f54e878 100644 --- a/po/fi.po +++ b/po/fi.po @@ -155,21 +155,10 @@ msgid "Cancel" msgstr "Peruuta" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko -asennusohjelma" +msgstr "Wine Mono -asennusohjelma" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -178,12 +167,12 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine ei löytänyt Gecko-pakettia, jota tarvitaan HTML:ää sisältävien " -"ohjelmien toimintaan. Wine voi ladata ja asentaa sen puolestasi.\n" +"Wine ei löytänyt Mono-pakettia, jota tarvitaan, jotta .NET-sovellukset " +"toimisivat oikein. Wine voi ladata ja asentaa sen puolestasi.\n" "\n" "Huomaa, että on suositeltavampaa käyttää oman jakelusi paketteja. " -"Lisätietoja: <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/" -"Gecko</a>." +"Lisätietoja: <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/" +"Mono</a>." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 6afed7a52b8b8ce1b984ae961a5958ff2becfe1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6afed7a52b8b8ce1b984ae961… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed May 23 19:41:22 2012 +0300 po: Update Swedish translation. --- po/sv.po | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/po/sv.po b/po/sv.po index d7d9062..6507a49 100644 --- a/po/sv.po +++ b/po/sv.po @@ -157,21 +157,10 @@ msgid "Cancel" msgstr "Avbryt" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko Installationsprogram" +msgstr "Wine Mono Installationsprogram" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -180,13 +169,12 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine kunde inte hitta paketet Gecko vilket krävs för att program med " -"inbäddad HTML ska fungera korrekt. Wine kan hämta och installera det " -"automatiskt åt dig.\n" +"Wine kunde inte hitta paketet Mono vilket krävs för att .NET-program ska " +"fungera korrekt. Wine kan hämta och installera det automatiskt åt dig.\n" "\n" "Obs: Du rekommenderas att använda din distributions paket i stället. Se <a " -"href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> för " -"mer information." +"href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> för mer " +"information." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -3058,7 +3046,7 @@ msgstr "" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: gphoto2.rc:27 msgid "Files on Camera" @@ -9963,7 +9951,7 @@ msgstr "Plats:" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "Användning: hostname\n" #: hostname.rc:28 msgid "Error: Invalid option '%c'.\n" @@ -10062,6 +10050,12 @@ msgid "" "Displays the list of running services if 'service' is omitted. Otherwise " "'service' is the name of the service to start.\n" msgstr "" +"Syntax för detta kommando är:\n" +"\n" +"NET START [tjänst]\n" +"\n" +"Visar listan på tjänster som redan körs om 'tjänst' utelämnas. Annars är " +"'tjänst' namnet på tjänsten att starta.\n" #: net.rc:29 msgid "" @@ -10071,6 +10065,11 @@ msgid "" "\n" "Where 'service' is the name of the service to stop.\n" msgstr "" +"Syntax för detta kommando är:\n" +"\n" +"NET STOP tjänst\n" +"\n" +"Där 'tjänst' är namnet på tjänsten att stoppa.\n" #: net.rc:30 msgid "Stopping dependent service: %1\n"

1 0