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

Christian Costa : d3drm: Add support for D3DRMLOAD_FROMFILE in IDirect3DRMMeshBuilder3_Load.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: a33037abd1830ac9fae258ceae2d5af93112285e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33037abd1830ac9fae258cea… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 25 08:04:54 2012 +0200 d3drm: Add support for D3DRMLOAD_FROMFILE in IDirect3DRMMeshBuilder3_Load. --- dlls/d3drm/meshbuilder.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4d4da0f..97f85c9 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1309,6 +1309,11 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* { load_options = DXFILELOAD_FROMMEMORY; } + else if (loadflags == D3DRMLOAD_FROMFILE) + { + load_options = DXFILELOAD_FROMFILE; + TRACE("Loading from file %s\n", debugstr_a(filename)); + } else { FIXME("Load options %d not supported yet\n", loadflags);

1 0

Michael Stefaniuc : urlmon/tests: Fix typo in an ok() message.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 8d73c163451f42e8249f3641ad5fe72d726a55f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d73c163451f42e8249f3641a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 25 11:33:30 2012 +0200 urlmon/tests: Fix typo in an ok() message. --- dlls/urlmon/tests/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 40c8a76..bc6d1be 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -11105,7 +11105,7 @@ static void test_IPersistStream(void) break; } } - ok(props == 0, "%d) No all properties were processed %d. Next property type: %d\n", + ok(props == 0, "%d) Not all properties were processed %d. Next property type: %d\n", i, props, dw_data[0]); IPersistStream_Release(persist_stream);

1 0

Michael Stefaniuc : riched20/tests: Check the correct return value.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 8660d5e77f667d0590ced84ece6d554a95859427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8660d5e77f667d0590ced84ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 25 11:35:10 2012 +0200 riched20/tests: Check the correct return value. --- dlls/riched20/tests/editor.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f6db413..1ca221d 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2440,10 +2440,9 @@ static void test_EM_SCROLL(void) y_before, y_after); y_before = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); - SendMessage(hwndRichEdit, EM_SCROLL, - SB_LINEDOWN, 0); /* line down beyond bot */ + r = SendMessage(hwndRichEdit, EM_SCROLL, SB_LINEDOWN, 0); /* line down beyond bot */ y_after = SendMessage(hwndRichEdit, EM_GETFIRSTVISIBLELINE, 0, 0); - + ok(r == 0x00010000, "EM_SCROLL line down returned indicating movement (0x%08x)\n", r); ok(y_before == y_after,

1 0

Michael Stefaniuc : mshtml/tests: Remove stray ok() calls.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 630560ea8fb13c78f490fb269b80a5d36f5c15f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630560ea8fb13c78f490fb269… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 25 11:36:16 2012 +0200 mshtml/tests: Remove stray ok() calls. --- dlls/mshtml/tests/style.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 7b6d69d..262c4d1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -662,7 +662,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationUnderline(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationUnderline failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationUnderline = %x\n", b); hres = IHTMLStyle_get_textDecorationUnderline(style, &b); ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres); @@ -678,7 +677,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationLineThrough(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationLineThrough failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); hres = IHTMLStyle_get_textDecorationLineThrough(style, &b); ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); @@ -694,7 +692,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationNone(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationNone failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationNone = %x\n", b); hres = IHTMLStyle_get_textDecorationNone(style, &b); ok(hres == S_OK, "get_textDecorationNone failed: %08x\n", hres); @@ -710,7 +707,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationOverline(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationOverline failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationOverline = %x\n", b); hres = IHTMLStyle_get_textDecorationOverline(style, &b); ok(hres == S_OK, "get_textDecorationOverline failed: %08x\n", hres); @@ -726,7 +722,6 @@ static void test_body_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_TRUE); ok(hres == S_OK, "put_textDecorationBlink failed: %08x\n", hres); - ok(b == VARIANT_FALSE, "textDecorationBlink = %x\n", b); hres = IHTMLStyle_get_textDecorationBlink(style, &b); ok(hres == S_OK, "get_textDecorationBlink failed: %08x\n", hres);

1 0

Dmitry Timoshkov : windowscodecs: Fix some typos in the tEXt metadata test.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 9cc82dd644735a95b4aa8f9eaebac377f9fdc29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc82dd644735a95b4aa8f9ea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 25 19:13:24 2012 +0900 windowscodecs: Fix some typos in the tEXt metadata test. --- dlls/windowscodecs/tests/metadata.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 4cfc53c..09e26ca 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -205,8 +205,8 @@ static void test_metadata_tEXt(void) ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); ok(!strcmp(U(id).pszVal, "winetest"), "unexpected id: %s\n", U(id).pszVal); - ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", value.vt); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(value).pszVal); PropVariantClear(&schema); PropVariantClear(&id); @@ -240,7 +240,7 @@ static void test_metadata_tEXt(void) hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(value).pszVal); PropVariantClear(&value); strcpy(U(id).pszVal, "test"); @@ -265,8 +265,8 @@ static void test_metadata_tEXt(void) hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value); ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr); - ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); - ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(id).pszVal); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", value.vt); + ok(!strcmp(U(value).pszVal, "value"), "unexpected value: %s\n", U(value).pszVal); PropVariantClear(&value); hr = IWICMetadataReader_GetValueByIndex(reader, 1, NULL, NULL, NULL);

1 0

Christian Costa : dmusic: Cleanup DMUSIC_CreateDirectMusicImpl.
by Alexandre Julliard May 25, 2012

May 25, 2012

Module: wine Branch: master Commit: 0b0985f3910e269f220f9f94d12552bebd73c4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0985f3910e269f220f9f94d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 25 08:04:31 2012 +0200 dmusic: Cleanup DMUSIC_CreateDirectMusicImpl. --- dlls/dmusic/dmusic.c | 48 +++++++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 9c93ba8..3e0f9aa 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -369,23 +369,37 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { IDirectMusic8Impl_SetExternalMasterClock }; -/* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusic8Impl *dmusic; +/* For ClassFactory */ +HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNOWN unkouter) +{ + IDirectMusic8Impl *dmusic; + HRESULT ret; - TRACE("(%p,%p,%p)\n",lpcGUID, ppobj, pUnkOuter); + TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); - dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); - if (NULL == dmusic) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; - dmusic->ref = 0; /* will be inited with QueryInterface */ - dmusic->pMasterClock = NULL; - dmusic->ppPorts = NULL; - dmusic->nrofports = 0; - DMUSIC_CreateReferenceClockImpl (&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL); - - return IDirectMusic8Impl_QueryInterface ((LPDIRECTMUSIC8)dmusic, lpcGUID, ppobj); + *ret_iface = NULL; + + dmusic = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusic8Impl)); + if (!dmusic) + return E_OUTOFMEMORY; + + dmusic->IDirectMusic8_iface.lpVtbl = &DirectMusic8_Vtbl; + dmusic->ref = 0; /* Will be inited by QueryInterface */ + dmusic->pMasterClock = NULL; + dmusic->ppPorts = NULL; + dmusic->nrofports = 0; + ret = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&dmusic->pMasterClock, NULL); + if (FAILED(ret)) { + HeapFree(GetProcessHeap(), 0, dmusic); + return ret; + } + + ret = IDirectMusic8Impl_QueryInterface(&dmusic->IDirectMusic8_iface, riid, ret_iface); + if (FAILED(ret)) { + IReferenceClock_Release(&dmusic->pMasterClock->IReferenceClock_iface); + HeapFree(GetProcessHeap(), 0, dmusic); + return ret; + } + + return S_OK; }

1 0

Vincent Povirk : propsys: Implement IPropertyStoreCache::GetValueAndState.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: c3748c7daaeb2b0ca961787c7866434842b680d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3748c7daaeb2b0ca961787c7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:40:45 2012 -0500 propsys: Implement IPropertyStoreCache::GetValueAndState. --- dlls/propsys/propstore.c | 27 +++++++++++++++++++++++++-- dlls/propsys/tests/propstore.c | 10 +++++----- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 00ff701..7c28131 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -351,8 +351,31 @@ static HRESULT WINAPI PropertyStore_GetState(IPropertyStoreCache *iface, static HRESULT WINAPI PropertyStore_GetValueAndState(IPropertyStoreCache *iface, REFPROPERTYKEY key, PROPVARIANT *ppropvar, PSC_STATE *pstate) { - FIXME("%p,%p,%p,%p: stub\n", iface, key, ppropvar, pstate); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p,%p\n", iface, key, ppropvar, pstate); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(ppropvar, &value->propvar); + + if (SUCCEEDED(hr)) + *pstate = value->state; + + LeaveCriticalSection(&This->lock); + + if (FAILED(hr)) + { + PropVariantInit(ppropvar); + *pstate = PSC_NORMAL; + } + + return hr; } static HRESULT WINAPI PropertyStore_SetState(IPropertyStoreCache *iface, diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 17cf7f3..ad06ea0 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -138,9 +138,9 @@ static void test_inmemorystore(void) propvar.vt = VT_I2; state = 0xdeadbeef; hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); - todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetValueAndState failed, hr=%x\n", hr); - todo_wine ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt); - todo_wine ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", 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); @@ -171,8 +171,8 @@ static void test_inmemorystore(void) memset(&propvar, 0, sizeof(propvar)); state = 0xdeadbeef; hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); - todo_wine ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); - todo_wine ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); + ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr); + ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt); todo_wine ok(propvar.u.lVal == 12346, "expected 12346, got %d\n", propvar.vt); todo_wine ok(state == 5, "expected 5, got %d\n", state);

1 0

Vincent Povirk : propsys: Implement IPropertyStoreCache::SetValueAndState.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: 91e95e125e457a9977e845279edb54e16cd81091 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e95e125e457a9977e845279… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:46:23 2012 -0500 propsys: Implement IPropertyStoreCache::SetValueAndState. --- dlls/propsys/propstore.c | 21 +++++++++++++++++++-- dlls/propsys/tests/propstore.c | 16 ++++++++-------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index c9df65e..e438ce3 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -402,8 +402,25 @@ static HRESULT WINAPI PropertyStore_SetState(IPropertyStoreCache *iface, static HRESULT WINAPI PropertyStore_SetValueAndState(IPropertyStoreCache *iface, REFPROPERTYKEY key, const PROPVARIANT *ppropvar, PSC_STATE state) { - FIXME("%p,%p,%p,%d: stub\n", iface, key, ppropvar, state); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p,%d\n", iface, key, ppropvar, state); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 1, &value); + + if (SUCCEEDED(hr)) + hr = PropVariantCopy(&value->propvar, ppropvar); + + if (SUCCEEDED(hr)) + value->state = state; + + LeaveCriticalSection(&This->lock); + + return hr; } static const IPropertyStoreCacheVtbl PropertyStore_Vtbl = { diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index b6c1e5a..5c1b021 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -166,15 +166,15 @@ static void test_inmemorystore(void) propvar.vt = VT_I4; propvar.u.lVal = 12346; hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, 5); - todo_wine ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); + 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); - todo_wine ok(propvar.u.lVal == 12346, "expected 12346, got %d\n", propvar.vt); - todo_wine ok(state == 5, "expected 5, got %d\n", state); + 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; @@ -183,15 +183,15 @@ static void test_inmemorystore(void) propvar.vt = VT_I4; propvar.u.lVal = 12347; hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, PSC_DIRTY); - todo_wine ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); + ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr); memset(&propvar, 0, sizeof(propvar)); state = 0xdeadbeef; hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state); - todo_wine ok(hr == S_OK, "GetValueAndState 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 == 12347, "expected 12347, got %d\n", propvar.vt); - todo_wine ok(state == PSC_DIRTY, "expected PSC_DIRTY, got %d\n", 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); }

1 0

Vincent Povirk : propsys: Implement IPropertyStoreCache::SetState.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: f833061e50dc44edbf8a892c1aab226e2bbb9c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f833061e50dc44edbf8a892c1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:43:01 2012 -0500 propsys: Implement IPropertyStoreCache::SetState. --- dlls/propsys/propstore.c | 18 ++++++++++++++++-- dlls/propsys/tests/propstore.c | 6 +++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 7c28131..c9df65e 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -381,8 +381,22 @@ static HRESULT WINAPI PropertyStore_GetValueAndState(IPropertyStoreCache *iface, static HRESULT WINAPI PropertyStore_SetState(IPropertyStoreCache *iface, REFPROPERTYKEY key, PSC_STATE pstate) { - FIXME("%p,%p,%d: stub\n", iface, key, pstate); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%d\n", iface, key, pstate); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + value->state = pstate; + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI PropertyStore_SetValueAndState(IPropertyStoreCache *iface, diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index ad06ea0..b6c1e5a 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -144,7 +144,7 @@ static void test_inmemorystore(void) /* Set state on an unset field */ hr = IPropertyStoreCache_SetState(propcache, &pkey, PSC_NORMAL); - todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "SetState failed, hr=%x\n", hr); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "SetState failed, hr=%x\n", hr); /* Manipulate state on already set field */ pkey.fmtid = PKEY_WineTest; @@ -156,12 +156,12 @@ static void test_inmemorystore(void) ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state); hr = IPropertyStoreCache_SetState(propcache, &pkey, 10); - todo_wine ok(hr == S_OK, "SetState failed, hr=%x\n", hr); + 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); - todo_wine ok(state == 10, "expected 10, got %d\n", state); + ok(state == 10, "expected 10, got %d\n", state); propvar.vt = VT_I4; propvar.u.lVal = 12346;

1 0

Vincent Povirk : propsys: Implement IPropertyStoreCache::GetState.
by Alexandre Julliard May 24, 2012

May 24, 2012

Module: wine Branch: master Commit: a28183f390cc3975800ca2693a2a8ffec376e148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28183f390cc3975800ca2693… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 22 15:38:22 2012 -0500 propsys: Implement IPropertyStoreCache::GetState. --- 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 a57bb2e..00ff701 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -327,8 +327,25 @@ static HRESULT WINAPI PropertyStore_Commit(IPropertyStoreCache *iface) static HRESULT WINAPI PropertyStore_GetState(IPropertyStoreCache *iface, REFPROPERTYKEY key, PSC_STATE *pstate) { - FIXME("%p,%p,%p: stub\n", iface, key, pstate); - return E_NOTIMPL; + PropertyStore *This = impl_from_IPropertyStoreCache(iface); + propstore_value *value; + HRESULT hr; + + TRACE("%p,%p,%p\n", iface, key, pstate); + + EnterCriticalSection(&This->lock); + + hr = PropertyStore_LookupValue(This, key, 0, &value); + + if (SUCCEEDED(hr)) + *pstate = value->state; + + LeaveCriticalSection(&This->lock); + + if (FAILED(hr)) + *pstate = PSC_NORMAL; + + return hr; } static HRESULT WINAPI PropertyStore_GetValueAndState(IPropertyStoreCache *iface, diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 7915b96..17cf7f3 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -132,8 +132,8 @@ static void test_inmemorystore(void) state = 0xdeadbeef; hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); - todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetState failed, hr=%x\n", hr); - todo_wine ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", 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; @@ -152,15 +152,15 @@ static void test_inmemorystore(void) state = 0xdeadbeef; hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); - todo_wine ok(hr == S_OK, "GetState failed, hr=%x\n", hr); - todo_wine ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", 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); todo_wine ok(hr == S_OK, "SetState failed, hr=%x\n", hr); state = 0xdeadbeef; hr = IPropertyStoreCache_GetState(propcache, &pkey, &state); - todo_wine ok(hr == S_OK, "GetState failed, hr=%x\n", hr); + ok(hr == S_OK, "GetState failed, hr=%x\n", hr); todo_wine ok(state == 10, "expected 10, got %d\n", state); propvar.vt = VT_I4;

1 0