June 2014 - Wine-Commits - list.winehq.org

Vincent Povirk : windowscodecs: Check for empty rect in WriteSource_Proxy.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 88f17cdb545855c1462bfc9a4f2083b8bc37b263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f17cdb545855c1462bfc9a4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 13 14:39:26 2014 -0500 windowscodecs: Check for empty rect in WriteSource_Proxy. --- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/proxy.c | 3 ++ dlls/windowscodecs/tests/converter.c | 50 ++++++++++++++++++++++++++++++---- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index a4cb93f..d346711 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -182,7 +182,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, prc = &rc; } - if (prc->Width != width) + if (prc->Width != width || prc->Height <= 0) return E_INVALIDARG; stride = (bpp * width + 7)/8; diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 53c7d17..38f076f 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -225,6 +225,9 @@ HRESULT WINAPI IWICBitmapFrameEncode_SetThumbnail_Proxy_W(IWICBitmapFrameEncode HRESULT WINAPI IWICBitmapFrameEncode_WriteSource_Proxy_W(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { + if (prc && (prc->Width <= 0 || prc->Height <= 0)) + prc = NULL; + return IWICBitmapFrameEncode_WriteSource(iface, pIBitmapSource, prc); } diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 6c3d232..095298f 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -509,7 +509,7 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* clsid_encoder, - const struct bitmap_data **dsts, const CLSID *clsid_decoder, const char *name) + const struct bitmap_data **dsts, const CLSID *clsid_decoder, WICRect *rc, const char *name) { HRESULT hr; IWICBitmapEncoder *encoder; @@ -565,8 +565,14 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); - hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, NULL); - ok(SUCCEEDED(hr), "WriteSource failed, hr=%x\n", hr); + hr = IWICBitmapFrameEncode_WriteSource(frameencode, &src_obj->IWICBitmapSource_iface, rc); + if (rc && (rc->Width <= 0 || rc->Height <= 0)) + { + /* WriteSource fails but WriteSource_Proxy succeeds. */ + ok(hr == E_INVALIDARG, "WriteSource failed, hr=%x (%s)\n", hr, name); + hr = IWICBitmapFrameEncode_WriteSource_Proxy(frameencode, &src_obj->IWICBitmapSource_iface, rc); + } + ok(SUCCEEDED(hr), "WriteSource failed, hr=%x (%s)\n", hr, name); hr = IWICBitmapFrameEncode_Commit(frameencode); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); @@ -635,7 +641,39 @@ static void test_encoder(const struct bitmap_data *src, const CLSID* clsid_encod dsts[0] = dst; dsts[1] = NULL; - test_multi_encoder(srcs, clsid_encoder, dsts, clsid_decoder, name); + test_multi_encoder(srcs, clsid_encoder, dsts, clsid_decoder, NULL, name); +} + +static void test_encoder_rects(void) +{ + const struct bitmap_data *srcs[2]; + const struct bitmap_data *dsts[2]; + WICRect rc; + + srcs[0] = &testdata_24bppBGR; + srcs[1] = NULL; + dsts[0] = &testdata_24bppBGR; + dsts[1] = NULL; + + rc.X = 0; + rc.Y = 0; + rc.Width = 4; + rc.Height = 2; + + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects full"); + + rc.Width = 0; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects width=0"); + + rc.Width = -1; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects width=-1"); + + rc.Width = 4; + rc.Height = 0; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects height=0"); + + rc.Height = -1; + test_multi_encoder(srcs, &CLSID_WICTiffEncoder, dsts, &CLSID_WICTiffDecoder, &rc, "test_encoder_rects height=-1"); } static const struct bitmap_data *multiple_frames[3] = { @@ -673,7 +711,9 @@ START_TEST(converter) &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); test_multi_encoder(multiple_frames, &CLSID_WICTiffEncoder, - multiple_frames, &CLSID_WICTiffDecoder, "TIFF encoder multi-frame"); + multiple_frames, &CLSID_WICTiffDecoder, NULL, "TIFF encoder multi-frame"); + + test_encoder_rects(); CoUninitialize(); }

1 0

Nikolay Sivov : comctl32/tests: Avoid testing uninitialized value ( Valgrind).
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 055129485d022976caeacbdf4e98f982c88e9d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055129485d022976caeacbdf4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 13 18:31:28 2014 +0400 comctl32/tests: Avoid testing uninitialized value (Valgrind). --- dlls/comctl32/tests/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 96fb766..ecb438e 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -743,10 +743,10 @@ todo_wine ok(lstrcmpW(nameW, WC_BUTTONW), "got %s\n", wine_dbgstr_w(nameW)); ret = GetClassInfoExW(NULL, nameW, &ex2W); -todo_wine { +todo_wine ok(ret, "got %d\n", ret); +if (ret) /* TODO: remove once Wine is fixed */ ok(ex2W.lpfnWndProc == exW.lpfnWndProc, "got %p, %p\n", exW.lpfnWndProc, ex2W.lpfnWndProc); -} /* Check reported class name */ hwnd = create_button(BS_CHECKBOX, NULL);

1 0

Vincent Povirk : windowscodecs: Share WriteSource code between implementations.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 30f98340618b1ebfce38c83ac7c189a34d2559e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30f98340618b1ebfce38c83ac… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 13 14:02:23 2014 -0500 windowscodecs: Share WriteSource code between implementations. --- dlls/windowscodecs/bmpencode.c | 57 +++------------------ dlls/windowscodecs/icnsformat.c | 58 +++------------------ dlls/windowscodecs/jpegformat.c | 62 +++-------------------- dlls/windowscodecs/main.c | 86 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 62 +++-------------------- dlls/windowscodecs/tiffformat.c | 64 +++--------------------- dlls/windowscodecs/wincodecs_private.h | 10 ++++ 7 files changed, 130 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30f98340618b1ebfce38c…

1 0

Vincent Povirk : ole32: Add tests for STGC_OVERWRITE.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: a270ed90adaff0f58bb05780297dbd6173f26626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a270ed90adaff0f58bb057802… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 3 12:59:44 2014 -0500 ole32: Add tests for STGC_OVERWRITE. --- dlls/ole32/tests/storage32.c | 114 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 74b6def..e25f976 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3529,6 +3529,119 @@ static void test_transacted_shared(void) DeleteFileA(filenameA); } +static void test_overwrite(void) +{ + IStorage *stg = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'C','O','N','T','E','N','T','2',0 }; + LARGE_INTEGER pos; + ULARGE_INTEGER upos; + char buffer[4096]; + DWORD orig_size, new_size; + ULONG bytesread; + HANDLE hfile; + int i; + + DeleteFileA(filenameA); + + r = StgCreateDocfile(filename, STGM_CREATE | STGM_READWRITE | STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed %x\n", r); + + r = WriteClassStg(stg, &test_stg_cls); + ok(r == S_OK, "WriteClassStg failed %x\n", r); + + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + memset(buffer, 'a', sizeof(buffer)); + for (i=0; i<4; i++) + { + /* Write enough bytes to pass the minimum storage file size */ + r = IStream_Write(stm, buffer, sizeof(buffer), NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + } + + r = IStorage_Commit(stg, STGC_DEFAULT); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + hfile = CreateFileA(filenameA, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, NULL); + ok(hfile != NULL, "couldn't open file %d\n", GetLastError()); + + orig_size = GetFileSize(hfile, NULL); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "b", 1, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + r = IStorage_Commit(stg, STGC_OVERWRITE); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + new_size = GetFileSize(hfile, NULL); + + todo_wine ok(new_size == orig_size, "file grew from %d bytes to %d\n", orig_size, new_size); + + IStream_Release(stm); + + IStorage_RenameElement(stg, stmname, stmname2); + + r = IStorage_Commit(stg, STGC_OVERWRITE); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + new_size = GetFileSize(hfile, NULL); + + todo_wine ok(new_size == orig_size, "file grew from %d bytes to %d\n", orig_size, new_size); + + IStorage_Release(stg); + + r = StgOpenStorage(filename, NULL, STGM_READWRITE | STGM_TRANSACTED | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + ok(r==S_OK, "StgOpenStorage failed %x\n", r); + + r = IStorage_OpenStream(stg, stmname2, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed %x\n", r); + + r = IStream_Read(stm, buffer, sizeof(buffer), &bytesread); + ok(r==S_OK, "IStream->Write failed %x\n", r); + ok(bytesread == sizeof(buffer), "only read %d bytes\n", bytesread); + ok(buffer[0] == 'b', "unexpected data at byte 0\n"); + + for (i=1; i<sizeof(buffer); i++) + if (buffer[i] != 'a') + break; + ok(i == sizeof(buffer), "unexpected data at byte %i\n", i); + + pos.QuadPart = 0; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &upos); + ok(r==S_OK, "IStream->Seek failed %x\n", r); + + r = IStream_Write(stm, "c", 1, NULL); + ok(r==S_OK, "IStream->Write failed %x\n", r); + + r = IStorage_Commit(stg, STGC_OVERWRITE); + ok(r==S_OK, "IStorage->Commit failed %x\n", r); + + new_size = GetFileSize(hfile, NULL); + + todo_wine ok(new_size == orig_size, "file grew from %d bytes to %d\n", orig_size, new_size); + + IStream_Release(stm); + + IStorage_Release(stg); + + CloseHandle(hfile); + + DeleteFileA(filenameA); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3576,4 +3689,5 @@ START_TEST(storage32) test_direct_swmr(); test_locking(); test_transacted_shared(); + test_overwrite(); }

1 0

Andrew Eikum : ole32: Respect TreatAs in CoCreateInstance.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: c2089cbd0d488e7d26858caf0a55b8e0c62a267c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2089cbd0d488e7d26858caf0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 13:01:13 2014 -0500 ole32: Respect TreatAs in CoCreateInstance. --- dlls/ole32/compobj.c | 15 ++++++++++----- dlls/ole32/tests/compobj.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 98f6439..7af3bb7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3160,6 +3160,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( HRESULT hres; LPCLASSFACTORY lpclf = 0; APARTMENT *apt; + CLSID clsid; TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); @@ -3167,6 +3168,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( if (ppv==0) return E_POINTER; + hres = CoGetTreatAsClass(rclsid, &clsid); + if(FAILED(hres)) + clsid = *rclsid; + *ppv = 0; if (!(apt = COM_CurrentApt())) @@ -3182,7 +3187,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( /* * The Standard Global Interface Table (GIT) object is a process-wide singleton. */ - if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable)) + if (IsEqualIID(&clsid, &CLSID_StdGlobalInterfaceTable)) { IGlobalInterfaceTable *git = get_std_git(); hres = IGlobalInterfaceTable_QueryInterface(git, iid, ppv); @@ -3192,13 +3197,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( return S_OK; } - if (IsEqualCLSID(rclsid, &CLSID_ManualResetEvent)) + if (IsEqualCLSID(&clsid, &CLSID_ManualResetEvent)) return ManualResetEvent_Construct(pUnkOuter, iid, ppv); /* * Get a class factory to construct the object we want. */ - hres = CoGetClassObject(rclsid, + hres = CoGetClassObject(&clsid, dwClsContext, NULL, &IID_IClassFactory, @@ -3215,11 +3220,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance( if (FAILED(hres)) { if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) - FIXME("Class %s does not support aggregation\n", debugstr_guid(rclsid)); + FIXME("Class %s does not support aggregation\n", debugstr_guid(&clsid)); else FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", debugstr_guid(iid), - debugstr_guid(rclsid),hres); + debugstr_guid(&clsid),hres); } return hres; diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 219d2f9..6d5e811 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1903,6 +1903,7 @@ static void test_TreatAsClass(void) CLSID out; static GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; static const char deadbeefA[] = "{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"; + IInternetProtocol *pIP = NULL; HKEY clsidkey, deadbeefkey; LONG lr; @@ -1935,6 +1936,21 @@ static void test_TreatAsClass(void) ok(hr == S_OK, "CoGetTreatAsClass failed: %08x\n",hr); ok(IsEqualGUID(&out, &CLSID_FileProtocol), "expected to get substituted clsid\n"); + OleInitialize(NULL); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pIP); + if(hr == REGDB_E_CLASSNOTREG) + { + win_skip("IE not installed so can't test CoCreateInstance\n"); + goto exit; + } + + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + if(pIP){ + IInternetProtocol_Release(pIP); + pIP = NULL; + } + hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); @@ -1942,7 +1958,17 @@ static void test_TreatAsClass(void) ok(hr == S_FALSE, "expected S_FALSE got %08x\n", hr); ok(IsEqualGUID(&out, &deadbeef), "expected to get same clsid back\n"); + /* bizarrely, native's CoTreatAsClass takes some time to take effect in CoCreateInstance */ + Sleep(200); + + hr = CoCreateInstance(&deadbeef, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void **)&pIP); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance gave wrong error: %08x\n", hr); + + if(pIP) + IInternetProtocol_Release(pIP); + exit: + OleUninitialize(); RegCloseKey(deadbeefkey); RegDeleteKeyA(clsidkey, deadbeefA); RegCloseKey(clsidkey);

1 0

Andrew Eikum : ole32: Implement CoTreatAsClass for classes without AutoTreatAs.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: 42f51185709e86f804c2babf259d0b1816b33d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f51185709e86f804c2babf2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 13:00:46 2014 -0500 ole32: Implement CoTreatAsClass for classes without AutoTreatAs. --- dlls/ole32/compobj.c | 26 ++++++++++++++++++++------ dlls/ole32/tests/compobj.c | 41 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d117c02..98f6439 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3731,7 +3731,8 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) res = COM_OpenKeyForCLSID(clsidOld, NULL, KEY_READ | KEY_WRITE, &hkey); if (FAILED(res)) goto done; - if (!memcmp( clsidOld, clsidNew, sizeof(*clsidOld) )) + + if (IsEqualGUID( clsidOld, clsidNew )) { if (!RegQueryValueW(hkey, wszAutoTreatAs, auto_treat_as, &auto_treat_as_size) && CLSIDFromString(auto_treat_as, &id) == S_OK) @@ -3744,15 +3745,28 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew) } else { - RegDeleteKeyW(hkey, wszTreatAs); + if(RegDeleteKeyW(hkey, wszTreatAs)) + res = REGDB_E_WRITEREGDB; goto done; } } - else if (!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew)) && - !RegSetValueW(hkey, wszTreatAs, REG_SZ, szClsidNew, sizeof(szClsidNew))) + else { - res = REGDB_E_WRITEREGDB; - goto done; + if(IsEqualGUID(clsidNew, &CLSID_NULL)){ + RegDeleteKeyW(hkey, wszTreatAs); + }else{ + if(!StringFromGUID2(clsidNew, szClsidNew, ARRAYSIZE(szClsidNew))){ + WARN("StringFromGUID2 failed\n"); + res = E_FAIL; + goto done; + } + + if(RegSetValueW(hkey, wszTreatAs, REG_SZ, szClsidNew, sizeof(szClsidNew)) != ERROR_SUCCESS){ + WARN("RegSetValue failed\n"); + res = REGDB_E_WRITEREGDB; + goto done; + } + } } done: diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 16ae501..219d2f9 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -41,6 +41,7 @@ static HRESULT (WINAPI * pCoInitializeEx)(LPVOID lpReserved, DWORD dwCoInit); static HRESULT (WINAPI * pCoGetObjectContext)(REFIID riid, LPVOID *ppv); static HRESULT (WINAPI * pCoSwitchCallContext)(IUnknown *pObject, IUnknown **ppOldObject); static HRESULT (WINAPI * pCoGetTreatAsClass)(REFCLSID clsidOld, LPCLSID pClsidNew); +static HRESULT (WINAPI * pCoTreatAsClass)(REFCLSID clsidOld, REFCLSID pClsidNew); static HRESULT (WINAPI * pCoGetContextToken)(ULONG_PTR *token); static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); @@ -1896,11 +1897,14 @@ static void test_CoGetContextToken(void) CoUninitialize(); } -static void test_CoGetTreatAsClass(void) +static void test_TreatAsClass(void) { HRESULT hr; CLSID out; static GUID deadbeef = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + static const char deadbeefA[] = "{DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF}"; + HKEY clsidkey, deadbeefkey; + LONG lr; if (!pCoGetTreatAsClass) { @@ -1910,6 +1914,38 @@ static void test_CoGetTreatAsClass(void) hr = pCoGetTreatAsClass(&deadbeef,&out); ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); + + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); + ok(lr == ERROR_SUCCESS, "Couldn't open CLSID key\n"); + + lr = RegCreateKeyExA(clsidkey, deadbeefA, 0, NULL, 0, KEY_WRITE, NULL, &deadbeefkey, NULL); + ok(lr == ERROR_SUCCESS, "Couldn't create class key\n"); + + hr = pCoTreatAsClass(&deadbeef, &deadbeef); + ok(hr == REGDB_E_WRITEREGDB, "CoTreatAsClass gave wrong error: %08x\n", hr); + + hr = pCoTreatAsClass(&deadbeef, &CLSID_FileProtocol); + if(hr == REGDB_E_WRITEREGDB){ + win_skip("Insufficient privileges to use CoTreatAsClass\n"); + goto exit; + } + ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); + + hr = pCoGetTreatAsClass(&deadbeef, &out); + ok(hr == S_OK, "CoGetTreatAsClass failed: %08x\n",hr); + ok(IsEqualGUID(&out, &CLSID_FileProtocol), "expected to get substituted clsid\n"); + + hr = pCoTreatAsClass(&deadbeef, &CLSID_NULL); + ok(hr == S_OK, "CoTreatAsClass failed: %08x\n", hr); + + hr = pCoGetTreatAsClass(&deadbeef, &out); + ok(hr == S_FALSE, "expected S_FALSE got %08x\n", hr); + ok(IsEqualGUID(&out, &deadbeef), "expected to get same clsid back\n"); + +exit: + RegCloseKey(deadbeefkey); + RegDeleteKeyA(clsidkey, deadbeefA); + RegCloseKey(clsidkey); } static void test_CoInitializeEx(void) @@ -1994,6 +2030,7 @@ static void init_funcs(void) pCoGetObjectContext = (void*)GetProcAddress(hOle32, "CoGetObjectContext"); pCoSwitchCallContext = (void*)GetProcAddress(hOle32, "CoSwitchCallContext"); pCoGetTreatAsClass = (void*)GetProcAddress(hOle32,"CoGetTreatAsClass"); + pCoTreatAsClass = (void*)GetProcAddress(hOle32,"CoTreatAsClass"); pCoGetContextToken = (void*)GetProcAddress(hOle32, "CoGetContextToken"); pRegOverridePredefKey = (void*)GetProcAddress(hAdvapi32, "RegOverridePredefKey"); pCoInitializeEx = (void*)GetProcAddress(hOle32, "CoInitializeEx"); @@ -2038,7 +2075,7 @@ START_TEST(compobj) test_CoGetObjectContext(); test_CoGetCallContext(); test_CoGetContextToken(); - test_CoGetTreatAsClass(); + test_TreatAsClass(); test_CoInitializeEx(); test_OleRegGetMiscStatus(); test_CoCreateGuid();

1 0

Jacek Caban : vbscript: Reset error number on error mode change.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: wine Branch: master Commit: be583662d45b84693b71d44d2ecf6ef39fdf29b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be583662d45b84693b71d44d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 13 17:27:44 2014 +0200 vbscript: Reset error number on error mode change. --- dlls/vbscript/interp.c | 1 + dlls/vbscript/tests/error.vbs | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3b5f78c..10641db 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1276,6 +1276,7 @@ static HRESULT interp_errmode(exec_ctx_t *ctx) TRACE("%d\n", err_mode); ctx->resume_next = err_mode; + ctx->script->err_number = S_OK; return S_OK; } diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index afe9da2..830344c 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -284,6 +284,20 @@ x = 0 call callTestOnError(false) call ok(x = 1, "x = " & x) +sub testOnErrorClear() + on error resume next + call ok(Err.Number = 0, "Err.Number = " & Err.Number) + throwInt(E_TESTERROR) + call ok(Err.Number = E_TESTERROR, "Err.Number = " & Err.Number) + + on error goto 0 + call ok(Err.Number = 0, "Err.Number = " & Err.Number) + x = "ok" +end sub + +call testOnErrorClear() +call ok(x = "ok", "testOnErrorClear failed") + sub testForEachError() on error resume next

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.20
by Jeremy Newman June 16, 2014

June 16, 2014

Module: website Branch: master Commit: 94a5df3630af048f613b927bd32de2dd3199e29b URL: http://source.winehq.org/git/website.git/?a=commit;h=94a5df3630af048f613b92… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 14 07:36:21 2014 +0200 Polish translation for release 1.7.20 --- news/pl/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2014061301.xml b/news/pl/2014061301.xml new file mode 100644 index 0000000..b287acd --- /dev/null +++ b/news/pl/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>Czerwiec 13, 2014</date> +<title>Wydano Wine 1.7.20</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.20 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.20">Co nowego</a> w tym wydaniu: +<ul> + <li>Poprawki do przeciągania i upuszczania w X11.</li> + <li>Dodanie kilku nowych funkcji bibliotek uruchomieniowych C/C++.</li> + <li>Poprawki rozmaitych problemów z pamięcią znalezionych przez Valgrind.</li> + <li>Kilka poprawek do systemu przechowalni OLE.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Julian Rüger : German translation for release 1.7.20
by Jeremy Newman June 16, 2014

June 16, 2014

Module: website Branch: master Commit: 0298b8e1401264a305fa05a429b8c2a86f8928e3 URL: http://source.winehq.org/git/website.git/?a=commit;h=0298b8e1401264a305fa05… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Jun 13 23:08:58 2014 +0200 German translation for release 1.7.20 --- news/de/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2014061301.xml b/news/de/2014061301.xml new file mode 100644 index 0000000..829bd84 --- /dev/null +++ b/news/de/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>13. Juni 2014</date> +<title>Wine 1.7.20 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.20 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.20">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Korrekturen für X11 Drag & Drop.</li> + <li>Zusätzliche C/C++ Laufzeitfunktionen.</li> + <li>Fehlerkorrekturen für verschiedene Speicherprobleme, die mit Valgrind gefunden wurden.</li> + <li>Einige OLE-Speicher Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.20
by Jeremy Newman June 16, 2014

June 16, 2014

Module: website Branch: master Commit: b544fbcc328b155d26d76326c94b9e8b385adc18 URL: http://source.winehq.org/git/website.git/?a=commit;h=b544fbcc328b155d26d763… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jun 13 21:19:18 2014 +0200 French translation for release 1.7.20 --- news/fr/2014061301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014061301.xml b/news/fr/2014061301.xml new file mode 100644 index 0000000..10a6382 --- /dev/null +++ b/news/fr/2014061301.xml @@ -0,0 +1,15 @@ +<news> +<date>13 juin 2014</date> +<title>Sortie de Wine 1.7.20</title> +<body> +<p> La version de développement 1.7.20 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.20">Nouveautés</a> de cette version : +<ul> + <li>Correctifs dans le glisser-déposer X11.</li> + <li>Quelques fonctions supplémentaires dans les moteurs C/C++.</li> + <li>Correctifs pour divers problèmes mémoire détectés par Valgrind.</li> + <li>Plusieurs correctifs dans le stockage OLE.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Francois Gouget : testbot/web: Use a PropertyDescriptor and FormPage:: GenerateField() to handle the Remarks field.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 421c5c8ad65b350c27a50fa759d365211b02b3bc URL: http://source.winehq.org/git/tools.git/?a=commit;h=421c5c8ad65b350c27a50fa7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:28:53 2014 +0200 testbot/web: Use a PropertyDescriptor and FormPage::GenerateField() to handle the Remarks field. This increases code reuse and avoids losing that field if some other field was invalid. --- testbot/web/Register.pl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 1e18e23..70d8868 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -21,6 +21,8 @@ use strict; package RegisterPage; use URI::Escape; + +use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::ItemPage; use WineTestBot::Config; use WineTestBot::Users; @@ -33,6 +35,11 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); + + $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); + $self->{ExtraProperties} = [ + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 200) + ]; } sub GetTitle($) @@ -81,8 +88,10 @@ sub GenerateFields($) my ($self) = @_; print "<div><input type='hidden' name='Status' value='active'></div>\n"; + $self->SUPER::GenerateFields(); - print "<div class='DetailProperty'><label>Remarks</label><textarea name='Remarks' cols='40' rows='4'></textarea></div>\n"; + map { $self->GenerateField($_, "rw") } @{$self->{ExtraProperties}}; + $self->GenerateRequiredLegend(); $self->{HasRequired} = !1; }

1 0

Francois Gouget : testbot/CGI: Let FormPage::GenerateField() print the label as well as the input tag.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: b49b22c6654e6699f04ceac3096ee8c8f0857427 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b49b22c6654e6699f04ceac3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:27:10 2014 +0200 testbot/CGI: Let FormPage::GenerateField() print the label as well as the input tag. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 77c02b3..740b97e 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -148,14 +148,7 @@ sub GenerateFields($) foreach my $PropertyDescriptor (@{$PropertyDescriptors}) { my $Display = $self->DisplayProperty($PropertyDescriptor); - if ($Display) - { - print "<div class='ItemProperty'><label>", - $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) . - "</label>"; - $self->GenerateField($PropertyDescriptor, $Display); - print "</div>\n"; - } + $self->GenerateField($PropertyDescriptor, $Display) if ($Display); } } @@ -231,6 +224,10 @@ sub GenerateField($$$) { my ($self, $PropertyDescriptor, $Display) = @_; + print "<div class='ItemProperty'><label>", + $self->CGI->escapeHTML($self->GetDisplayName($PropertyDescriptor)) . + "</label>"; + my $Value = $self->GetDisplayValue($PropertyDescriptor); if ($Display eq "rw") { @@ -303,6 +300,8 @@ sub GenerateField($$$) print " "; } } + + print "</div>\n"; } sub GenerateRequired($$)

1 0

Francois Gouget : testbot/web: Recognize 'textarea' properties and use the appropriate input type.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 197a4e91f94c36b02be16355355708bfd7626375 URL: http://source.winehq.org/git/tools.git/?a=commit;h=197a4e91f94c36b02be16355… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:22:17 2014 +0200 testbot/web: Recognize 'textarea' properties and use the appropriate input type. This simplifies the code for web pages that have multiline input fields. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 15 ++++----------- testbot/web/Feedback.pl | 14 +------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index dc4a58a..77c02b3 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -221,17 +221,10 @@ sub GetInputType($$) { my ($self, $PropertyDescriptor) = @_; - if ($PropertyDescriptor->GetClass() eq "Enum") - { - return "select"; - } - - if ($PropertyDescriptor->GetType() eq "B") - { - return "checkbox"; - } - - return "text"; + return $PropertyDescriptor->GetClass() eq "Enum" ? "select" : + $PropertyDescriptor->GetType() eq "B" ? "checkbox" : + $PropertyDescriptor->GetType() eq "textarea" ? "textarea" : + "text"; } sub GenerateField($$$) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 39558da..f0ae921 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -34,7 +34,7 @@ sub _initialize($$$) my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Name", "Name", !1, !1, "A", 40), CreateBasicPropertyDescriptor("EMail", "Email", !1, !1, "A", 40), - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "A", 1024), + CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, 1, "textarea", 1024), ); $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); @@ -79,18 +79,6 @@ sub GetHeaderText($) "or email address."; } -sub GetInputType($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if (substr($PropertyDescriptor->GetName(), 0, 8) eq "Remarks") - { - return "textarea"; - } - - return $self->SUPER::GetInputType($PropertyDescriptor); -} - sub GetActions($) { my ($self) = @_;

1 0

Francois Gouget : testbot/lib: Improve the PropertyDescriptor methods argument handling.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 7c18f6d54ce2686fd869fb0d4054502402be47e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7c18f6d54ce2686fd869fb0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:19:51 2014 +0200 testbot/lib: Improve the PropertyDescriptor methods argument handling. This standardizes the way we handle the arguments. Make it so one can readily see the list of arguments the method takes without having to hunt down the implementation of all its ancestors. Because these are methods the added prototypes have no effect whatsoever as far as Perl is concerned. However they do document which arguments are optional. --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 30 +++++++++----------- .../lib/ObjectModel/DetailrefPropertyDescriptor.pm | 22 +++++++------- testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 25 ++++++++-------- .../lib/ObjectModel/ItemrefPropertyDescriptor.pm | 26 ++++++++--------- testbot/lib/ObjectModel/PropertyDescriptor.pm | 26 +++++++++-------- 5 files changed, 64 insertions(+), 65 deletions(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index 2e83b60..e355aa6 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -37,44 +37,41 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateBasicPropertyDescriptor); -sub _initialize +sub _initialize($$$) { - my $self = shift; - my $Type = shift; - my $MaxLength = shift; + my ($self, $Type, $MaxLength) = @_; $self->{Class} = "Basic"; $self->{Type} = $Type; $self->{MaxLength} = $MaxLength; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetType +sub GetType($) { - my $self = shift; + my ($self) = @_; return $self->{Type}; } -sub GetMaxLength +sub GetMaxLength($) { - my $self = shift; + my ($self) = @_; return $self->{MaxLength}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return [$self->{Name}]; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired()) { @@ -104,9 +101,10 @@ sub ValidateValue return undef; } -sub CreateBasicPropertyDescriptor +sub CreateBasicPropertyDescriptor($$$$$$) { - return ObjectModel::BasicPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Type, $MaxLength) = @_; + return ObjectModel::BasicPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Type, $MaxLength); } 1; diff --git a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm index 4832dd7..9575466 100644 --- a/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm @@ -30,37 +30,39 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateDetailrefPropertyDescriptor); -sub _initialize +sub _initialize($$) { - my $self = shift; - my $Creator = shift; + my ($self, $Creator) = @_; $self->{Class} = "Detailref"; $self->{Creator} = $Creator; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetColNames +sub GetColNames($) { + #my ($self) = @_; return []; } -sub GetCreator +sub GetCreator($) { - my $self = shift; + my ($self) = @_; return $self->{Creator}; } -sub ValidateValue +sub ValidateValue($$$) { + #my ($self, $Value, $IsNew) = @_; return undef; } -sub CreateDetailrefPropertyDescriptor +sub CreateDetailrefPropertyDescriptor($$$$$) { - return ObjectModel::DetailrefPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator) = @_; + return ObjectModel::DetailrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator); } 1; diff --git a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm index 3373c47..29c618b 100644 --- a/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/EnumPropertyDescriptor.pm @@ -37,35 +37,33 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateEnumPropertyDescriptor); -sub _initialize +sub _initialize($$) { - my $self = shift; - my $Values = shift; + my ($self, $Values) = @_; $self->{Class} = "Enum"; $self->{Values} = $Values; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetValues +sub GetValues($) { - my $self = shift; + my ($self) = @_; return $self->{Values}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return [$self->{Name}]; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired()) { @@ -82,9 +80,10 @@ sub ValidateValue return $self->GetDisplayName() . ": Is not valid"; } -sub CreateEnumPropertyDescriptor +sub CreateEnumPropertyDescriptor($$$$$) { - return ObjectModel::EnumPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Values) = @_; + return ObjectModel::EnumPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Values); } 1; diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index bf2a548..64b577a 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -30,37 +30,34 @@ require Exporter; @ISA = qw(ObjectModel::PropertyDescriptor Exporter); @EXPORT = qw(&CreateItemrefPropertyDescriptor); -sub _initialize +sub _initialize($$$) { - my $self = shift; - my $Creator = shift; - my $ColNames = shift; + my ($self, $Creator, $ColNames) = @_; $self->{Class} = "Itemref"; $self->{Creator} = $Creator; $self->{ColNames} = $ColNames; - $self->SUPER::_initialize(@_); + $self->SUPER::_initialize(); } -sub GetCreator +sub GetCreator($) { - my $self = shift; + my ($self) = @_; return $self->{Creator}; } -sub GetColNames +sub GetColNames($) { - my $self = shift; + my ($self) = @_; return $self->{ColNames}; } -sub ValidateValue +sub ValidateValue($$$) { - my $self = shift; - my ($Value, $IsNew) = @_; + my ($self, $Value, $IsNew) = @_; if ($self->GetIsRequired() && ! defined($Value)) { @@ -70,9 +67,10 @@ sub ValidateValue return undef; } -sub CreateItemrefPropertyDescriptor +sub CreateItemrefPropertyDescriptor($$$$$$) { - return ObjectModel::ItemrefPropertyDescriptor->new(@_); + my ($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames) = @_; + return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, $IsKey, $IsRequired, $Creator, $ColNames); } 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index 5b5cbc4..a8a7271 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -36,7 +36,7 @@ use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -sub new +sub new($$$$$@) { my $class = shift; my $Name = shift; @@ -54,41 +54,43 @@ sub new return $self; } -sub _initialize +sub _initialize($) { + #my ($self) = @_; } -sub GetName +sub GetName($) { - my $self = shift; + my ($self) = @_; return $self->{Name}; } -sub GetDisplayName +sub GetDisplayName($) { - my $self = shift; + my ($self) = @_; return $self->{DisplayName}; } -sub GetIsKey +sub GetIsKey($) { - my $self = shift; + my ($self) = @_; return $self->{IsKey}; } -sub GetIsRequired +sub GetIsRequired($) { - my $self = shift; + my ($self) = @_; + return $self->{IsRequired}; } -sub GetClass +sub GetClass($) { - my $self = shift; + my ($self) = @_; return $self->{Class}; }

1 0

Francois Gouget : testbot/web: Add a simple 'captcha' on the registration page.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: a83696fd675954763053ea193f09977b6d452625 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a83696fd675954763053ea19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:32:32 2014 +0200 testbot/web: Add a simple 'captcha' on the registration page. The captcha is in the form of a simple configurable question where the answer should be obvious to Wine developers. --- testbot/lib/WineTestBot/Config.pm | 6 ++++-- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 5 +++++ testbot/web/Register.pl | 20 +++++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index fbf2b0b..db7f18d 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -33,7 +33,8 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName + $RegistrationQ $RegistrationARE); require Exporter; @ISA = qw(Exporter); @@ -45,7 +46,8 @@ require Exporter; $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel - $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName); + $TunnelDefaults $JobPurgeDays $JobArchiveDays $WebHostName + $RegistrationQ $RegistrationARE); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); if ($::RootDir !~ m=^/=) diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl index 260d79e..6d8128b 100644 --- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl +++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl @@ -49,6 +49,11 @@ $WineTestBot::Config::WinePatchCc = ""; # Host name of the web interface $WineTestBot::Config::WebHostName = undef; +# The question to ask to filter out bots trying to register, and the regular +# expression that the answer must match. +$RegistrationQ = "What is the software project being tested?"; +$RegistrationARE = "(?i:wine)"; + # Prefix of the tag used for sending winetest reports $WineTestBot::Config::TagPrefix = undef; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 70d8868..eb0f1ec 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -35,11 +35,15 @@ sub _initialize($$$) my ($self, $Request, $RequiredRole) = @_; $self->SUPER::_initialize($Request, $RequiredRole, CreateUsers()); + $self->{ExtraProperties} = []; + if ($RegistrationQ) + { + $self->GetParam("RegA", "") if (!defined $self->GetParam("RegA")); + push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("RegA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); + } $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); - $self->{ExtraProperties} = [ - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 200) - ]; + push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 160); } sub GetTitle($) @@ -110,6 +114,16 @@ sub OnSendRequest($) { my ($self) = @_; + if ($RegistrationQ) + { + my $RegA = $self->GetParam("RegA"); + if ($RegA !~ /$RegistrationARE/) + { + $self->{ErrMessage} = "Wrong 'captcha' answer. Please try again."; + $self->{ErrField} = "Captcha"; + return !1; + } + } if (! $self->Save()) { return !1;

1 0

Francois Gouget : testbot/bin: Standardize handling of the Engine' s function arguments and add prototypes.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 8c390b93891db0b59adc94044ca8bdb43f10fb90 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8c390b93891db0b59adc9404… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:20:06 2014 +0200 testbot/bin: Standardize handling of the Engine's function arguments and add prototypes. The prototypes let Perl detect when the wrong number of parameters is passed to these functions. The exception to the rule is the HandleXxx() functions due to the way they are called. The prototypes also document which arguments are optional. --- testbot/bin/Engine.pl | 46 ++++++++++++++++-------------- testbot/lib/WineTestBot/Engine/Events.pm | 12 ++++---- testbot/lib/WineTestBot/Engine/Notify.pm | 30 +++++++++---------- 3 files changed, 45 insertions(+), 43 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ccaadc1..29dc919 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -56,7 +56,7 @@ use WineTestBot::VMs; my $RunEngine = 1; -sub FatalError +sub FatalError(@) { LogMsg @_; LogMsg "Shutdown following a fatal error\n"; @@ -215,7 +215,7 @@ sub Cleanup(;$$) } -sub HandleShutdown +sub HandleShutdown($$) { my ($KillTasks, $KillVMs) = @_; @@ -252,12 +252,12 @@ sub HandleShutdown return "1OK\n"; } -sub HandlePing +sub HandlePing() { return "1pong\n"; } -sub HandleJobStatusChange +sub HandleJobStatusChange($$$) { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -297,9 +297,9 @@ sub HandleJobStatusChange return "1OK"; } -sub HandleJobCancel +sub HandleJobCancel($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Job = CreateJobs()->GetItem($JobKey); if (! $Job) @@ -327,9 +327,9 @@ sub HandleJobCancel return "1OK"; } -sub HandleJobRestart +sub HandleJobRestart($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Job = CreateJobs()->GetItem($JobKey); if (! $Job) @@ -357,7 +357,7 @@ sub HandleJobRestart return "1OK"; } -sub HandleRescheduleJobs +sub HandleRescheduleJobs() { my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) @@ -368,7 +368,7 @@ sub HandleRescheduleJobs return "1OK"; } -sub HandleVMStatusChange +sub HandleVMStatusChange($$$) { my ($VMKey, $OldStatus, $NewStatus) = @_; @@ -392,7 +392,7 @@ sub HandleVMStatusChange return "1OK"; } -sub HandleWinePatchMLSubmission +sub HandleWinePatchMLSubmission() { my $dh; if (!opendir($dh, "$DataDir/staging")) @@ -443,7 +443,7 @@ sub HandleWinePatchMLSubmission return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } -sub HandleWinePatchWebSubmission +sub HandleWinePatchWebSubmission() { my $LatestWebPatchId = 0; my $Patches = CreatePatches(); @@ -514,15 +514,17 @@ sub HandleWinePatchWebSubmission return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; } -sub HandleGetScreenshot +sub HandleGetScreenshot($) { + my ($VMName) = @_; + # Validate VM name - if ($_[0] !~ m/^(\w+)$/) + if ($VMName !~ m/^(\w+)$/) { LogMsg "Invalid VM name for screenshot\n"; return "0Invalid VM name"; } - my $VMName = $1; + $VMName = $1; my $VM = CreateVMs()->GetItem($VMName); if (! defined($VM)) @@ -554,7 +556,7 @@ my %Handlers=( "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, ); -sub HandleClientCmd +sub HandleClientCmd(@) { my $Cmd = shift; @@ -565,9 +567,9 @@ sub HandleClientCmd return "0Unknown command $Cmd\n"; } -sub ClientRead +sub ClientRead($) { - my $Client = shift; + my ($Client) = @_; my $Buf; my $GotSomething = !1; @@ -596,7 +598,7 @@ checks whether any pending patchsets are now complete and thus can be scheduled. =back =cut -sub SafetyNet +sub SafetyNet() { CheckJobs(); ScheduleJobs(); @@ -610,9 +612,9 @@ sub SafetyNet } } -sub PrepareSocket +sub PrepareSocket($) { - my $Socket = $_[0]; + my ($Socket) = @_; my $Flags = 0; if (fcntl($Socket, F_GETFL, $Flags)) @@ -663,7 +665,7 @@ sub REAPER $SIG{CHLD} = \&REAPER; # still loathe SysV } -sub main +sub main() { my ($Shutdown, $KillTasks, $KillVMs); while (@ARGV) diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 9a8da83..584a7e5 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -34,7 +34,7 @@ require Exporter; my %Events; -sub AddEvent +sub AddEvent($$$$) { my ($Name, $Timeout, $Repeat, $HandlerFunc) = @_; @@ -44,21 +44,21 @@ sub AddEvent HandlerFunc => $HandlerFunc}; } -sub DeleteEvent +sub DeleteEvent($) { - my $Name = $_[0]; + my ($Name) = @_; delete $Events{$Name}; } -sub EventScheduled +sub EventScheduled($) { - my $Name = $_[0]; + my ($Name) = @_; return defined($Events{$Name}); } -sub RunEvents +sub RunEvents() { my $Now = time(); my $Next = undef; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index d0d4890..3063e99 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -39,9 +39,9 @@ require Exporter; @EXPORT_OK = qw($RunningInEngine); -sub SendCmdReceiveReply +sub SendCmdReceiveReply($) { - my $Cmd = shift; + my ($Cmd) = @_; if (defined($RunningInEngine)) { @@ -74,7 +74,7 @@ sub SendCmdReceiveReply return $Reply; } -sub Shutdown +sub Shutdown($$) { my ($KillTasks, $KillVMs) = @_; @@ -93,13 +93,13 @@ sub Shutdown return substr($Reply, 1); } -sub PingEngine +sub PingEngine() { my $Reply = SendCmdReceiveReply("ping\n"); return 1 <= length($Reply) && substr($Reply, 0, 1) eq "1"; } -sub JobStatusChange +sub JobStatusChange($$$) { my ($JobKey, $OldStatus, $NewStatus) = @_; @@ -116,9 +116,9 @@ sub JobStatusChange return substr($Reply, 1); } -sub JobCancel +sub JobCancel($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Reply = SendCmdReceiveReply("jobcancel $JobKey\n"); if (length($Reply) < 1) @@ -133,9 +133,9 @@ sub JobCancel return substr($Reply, 1); } -sub JobRestart +sub JobRestart($) { - my $JobKey = $_[0]; + my ($JobKey) = @_; my $Reply = SendCmdReceiveReply("jobrestart $JobKey\n"); if (length($Reply) < 1) @@ -150,7 +150,7 @@ sub JobRestart return substr($Reply, 1); } -sub RescheduleJobs +sub RescheduleJobs() { my $Reply = SendCmdReceiveReply("reschedulejobs\n"); if (length($Reply) < 1) @@ -165,7 +165,7 @@ sub RescheduleJobs return substr($Reply, 1); } -sub VMStatusChange +sub VMStatusChange($$$) { my ($VMKey, $OldStatus, $NewStatus) = @_; @@ -182,7 +182,7 @@ sub VMStatusChange return substr($Reply, 1); } -sub WinePatchMLSubmission +sub WinePatchMLSubmission() { my $Reply = SendCmdReceiveReply("winepatchmlsubmission\n"); if (length($Reply) < 1) @@ -197,7 +197,7 @@ sub WinePatchMLSubmission return substr($Reply, 1); } -sub WinePatchWebSubmission +sub WinePatchWebSubmission() { my $Reply = SendCmdReceiveReply("winepatchwebsubmission\n"); if (length($Reply) < 1) @@ -212,9 +212,9 @@ sub WinePatchWebSubmission return substr($Reply, 1); } -sub GetScreenshot +sub GetScreenshot($) { - my $VMName = $_[0]; + my ($VMName) = @_; my $Reply = SendCmdReceiveReply("getscreenshot $VMName\n"); if (length($Reply) < 1)

1 0

Francois Gouget : testbot/web: Simplify the FeedBack page by using GetParam() to set suitable defaults.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: 5e34ba480fac9e561253ca91c1ea9530a4bd1e0e URL: http://source.winehq.org/git/tools.git/?a=commit;h=5e34ba480fac9e561253ca91… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:23:32 2014 +0200 testbot/web: Simplify the FeedBack page by using GetParam() to set suitable defaults. --- testbot/web/Feedback.pl | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index f0ae921..5d3e2e6 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -42,27 +42,11 @@ sub _initialize($$$) my $Session = $self->GetCurrentSession(); if (defined($Session)) { + # Provide default values my $User = $Session->User; - $self->{Name} = $User->RealName; - $self->{EMail} = $User->EMail; + $self->GetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); + $self->GetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); } - else - { - $self->{Name} = undef; - $self->{EMail} = undef; - } -} - -sub GetPropertyValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if (defined($self->{$PropertyDescriptor->GetName()})) - { - return $self->{$PropertyDescriptor->GetName()}; - } - - return $self->SUPER::GetPropertyValue($PropertyDescriptor); } sub GetTitle($)

1 0

Francois Gouget : testbot/web: Fix the vertical-align CSS statements so the form labels and inputs align correctly.
by Alexandre Julliard June 16, 2014

June 16, 2014

Module: tools Branch: master Commit: d56366da8ee186c474b17cfd2fb599bbb8dcc44b URL: http://source.winehq.org/git/tools.git/?a=commit;h=d56366da8ee186c474b17cfd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 13 18:21:38 2014 +0200 testbot/web: Fix the vertical-align CSS statements so the form labels and inputs align correctly. --- testbot/web/WineTestBot.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index a64584b..5d25c42 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -191,7 +191,7 @@ h2 { width: 45%; display: inline-block; - vertical-align: center; + vertical-align: middle; text-align: right; padding-right: 6px; } @@ -199,6 +199,7 @@ h2 .ItemValue { display: inline-block; + vertical-align: middle; /* The joys of IE. Got the following 2 lines from http://blog.mozilla.com/webdev/2009/02/20/cross-browser-inline-block/ */ zoom: 1;

1 0

Alexandre Julliard : Wine release 1.7.20
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: website Branch: master Commit: 379eab9862638a3df289d3a1a716b3427ce2146d URL: http://source.winehq.org/git/website.git/?a=commit;h=379eab9862638a3df289d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:53:01 2014 +0200 Wine release 1.7.20 --- news/en/2014061301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014061301.xml b/news/en/2014061301.xml new file mode 100644 index 0000000..8d72896 --- /dev/null +++ b/news/en/2014061301.xml @@ -0,0 +1,16 @@ +<news> +<date>June 13, 2014</date> +<title>Wine 1.7.20 Released</title> +<body> +<p> The Wine development release 1.7.20 is now available.</p> +<p> <a href="{$root}/announce/1.7.20">What's new</a> in this release: +<ul> + <li>X11 drag & drop fixes.</li> + <li>A few more C/C++ runtime functions.</li> + <li>Fixes for various memory issues found by Valgrind.</li> + <li>Some OLE storage fixes.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Tag wine-1.7.20 : Alexandre Julliard : Release 1.7.20
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: refs/tags/wine-1.7.20 Tag: 144e733c73abef6fe05846d57efaf440613a498f URL: http://source.winehq.org/git/wine.git/?a=tag;h=144e733c73abef6fe05846d57efa… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:45:11 2014 +0200 Release 1.7.20

1 0

Alexandre Julliard : Release 1.7.20.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 56999940a37df73fd69d4ec9876eeb3e2015e4a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56999940a37df73fd69d4ec98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:45:11 2014 +0200 Release 1.7.20. --- ANNOUNCE | 760 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 384 insertions(+), 401 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56999940a37df73fd69d4…

1 0

Damjan Jovanovic : winex11.drv: Migrate importing text/ uri-list XDND selections to the clipboard.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 026fe4d08e14c7a706985f8b367bb28895335bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026fe4d08e14c7a706985f8b3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:55 2014 +0200 winex11.drv: Migrate importing text/uri-list XDND selections to the clipboard. --- dlls/winex11.drv/clipboard.c | 176 +++++++++++++++++++++++++++++++++ dlls/winex11.drv/xdnd.c | 223 ++---------------------------------------- 2 files changed, 182 insertions(+), 217 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026fe4d08e14c7a706985…

1 0

Michael Stefaniuc : dmusic: Remove the redundant "IDirectMusicCollection" from method names.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: d33989f675d3a98c98268ab92a39c69650a1ebe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33989f675d3a98c98268ab92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:22:45 2014 +0200 dmusic: Remove the redundant "IDirectMusicCollection" from method names. --- dlls/dmusic/collection.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index f3bb510..5754884 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -60,7 +60,8 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea } /* IDirectMusicCollectionImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicCollection *iface, + REFIID riid, void **ret_iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); @@ -84,7 +85,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt return S_OK; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_AddRef(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -94,7 +95,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD return ref; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_Release(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -110,7 +111,8 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP } /* IDirectMusicCollection Interface follows: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD patch, IDirectMusicInstrument** instrument) +static HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument(IDirectMusicCollection *iface, + DWORD patch, IDirectMusicInstrument **instrument) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; @@ -136,7 +138,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstr return DMUS_E_INVALIDPATCH; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD index, DWORD* patch, LPWSTR name, DWORD name_length) +static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicCollection *iface, + DWORD index, DWORD *patch, LPWSTR name, DWORD name_length) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DWORD i = 0; @@ -165,11 +168,11 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInst } static const IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = { - IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface, - IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef, - IDirectMusicCollectionImpl_IDirectMusicCollection_Release, - IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument, - IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument + IDirectMusicCollectionImpl_QueryInterface, + IDirectMusicCollectionImpl_AddRef, + IDirectMusicCollectionImpl_Release, + IDirectMusicCollectionImpl_GetInstrument, + IDirectMusicCollectionImpl_EnumInstrument }; /* IDirectMusicCollectionImpl IDirectMusicObject part: */ @@ -191,7 +194,8 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM stream, LPDMUS_OBJECTDESC desc) +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) { struct dmobject *This = impl_from_IDirectMusicObject(iface); DMUS_PRIVATE_CHUNK chunk; @@ -385,11 +389,12 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor + IDirectMusicObjectImpl_ParseDescriptor }; /* IDirectMusicCollectionImpl IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream) +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, + IStream *stream) { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; @@ -698,7 +703,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, unimpl_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IDirectMusicCollectionImpl_IPersistStream_Load, + IPersistStreamImpl_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax };

1 0

Michael Stefaniuc : dmusic: Use generic "unimplemented" methods for IPersistStream.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: 4e81a977c7601ae5542bb0084a72b44a891bff57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e81a977c7601ae5542bb0084… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:12:28 2014 +0200 dmusic: Use generic "unimplemented" methods for IPersistStream. --- dlls/dmusic/collection.c | 28 ++++------------------------ dlls/dmusic/dmobject.c | 26 ++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 9 +++++++++ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 9c6f357..c7084db 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -390,16 +390,6 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { }; /* IDirectMusicCollectionImpl IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPERSISTSTREAM iface, CLSID* pClassID) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) -{ - return S_FALSE; -} - static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream) { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); @@ -703,25 +693,15 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Save(LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetSizeMax(LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) -{ - return E_NOTIMPL; -} - static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_QueryInterface, dmobj_IPersistStream_AddRef, dmobj_IPersistStream_Release, - IDirectMusicCollectionImpl_IPersistStream_GetClassID, - IDirectMusicCollectionImpl_IPersistStream_IsDirty, + unimpl_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, IDirectMusicCollectionImpl_IPersistStream_Load, - IDirectMusicCollectionImpl_IPersistStream_Save, - IDirectMusicCollectionImpl_IPersistStream_GetSizeMax + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index f6c83a0..4afd5b9 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -134,6 +134,32 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) return IUnknown_Release(This->outer_unk); } +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + TRACE("(%p, %p): method not implemented\n", iface, class); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) +{ + TRACE("(%p): method not implemented, always returning S_FALSE\n", iface); + return S_FALSE; +} + +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) +{ + TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) +{ + TRACE("(%p, %p): method not implemented\n", iface, size); + return E_NOTIMPL; +} + void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) { diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index 1a09a0b..3574939 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -42,3 +42,12 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID void **ret_iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; + +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, + CLSID *class) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, + ULARGE_INTEGER *size) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : ole32: Fix return type.
by Alexandre Julliard June 13, 2014

June 13, 2014

Module: wine Branch: master Commit: e9533ca85aba0fefe72e1d942489adb2beb8f7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9533ca85aba0fefe72e1d942… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 09:07:57 2014 -0500 ole32: Fix return type. --- dlls/ole32/storage32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 69a2198..757138d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -7910,9 +7910,9 @@ HRESULT SmallBlockChainStream_WriteAt( /* * Step to the next big block. */ - if(FAILED(SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, - &blockIndex))) - return FALSE; + res = SmallBlockChainStream_GetNextBlockInChain(This, blockIndex, &blockIndex); + if (FAILED(res)) + return res; bufferWalker += bytesWrittenToBigBlockFile; size -= bytesWrittenToBigBlockFile; *bytesWritten += bytesWrittenToBigBlockFile;

1 0