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

Alexandre Julliard : comctl32/imagelist: Correctly resize the alpha flags when clearing the image list.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 1dd04884d754427723377a2fed5b58e5ebb6d3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd04884d754427723377a2fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:19:54 2014 +0200 comctl32/imagelist: Correctly resize the alpha flags when clearing the image list. --- dlls/comctl32/imagelist.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index eedf7c5..dfdb46a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2376,6 +2376,12 @@ ImageList_Remove (HIMAGELIST himl, INT i) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; + if (himl->has_alpha) + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + } + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage);

1 0

Piotr Caban : oleacc: Add Client_get_accChildCount implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 99d0590b012f7890f0d314a6ebf479dc0c2ed016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d0590b012f7890f0d314a6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:17 2014 +0200 oleacc: Add Client_get_accChildCount implementation. --- dlls/oleacc/client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e7ff812..5e5ee6f 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -120,8 +120,15 @@ static HRESULT WINAPI Client_get_accParent(IAccessible *iface, IDispatch **ppdis static HRESULT WINAPI Client_get_accChildCount(IAccessible *iface, LONG *pcountChildren) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pcountChildren); - return E_NOTIMPL; + HWND cur; + + TRACE("(%p)->(%p)\n", This, pcountChildren); + + *pcountChildren = 0; + for(cur = GetWindow(This->hwnd, GW_CHILD); cur; cur = GetWindow(cur, GW_HWNDNEXT)) + (*pcountChildren)++; + + return S_OK; } static HRESULT WINAPI Client_get_accChild(IAccessible *iface,

1 0

Huw Davies : shlwapi/tests: Fix win8 test failures.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: ddf861da00497f7c04d40af466bcb73647546f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf861da00497f7c04d40af46… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 09:29:30 2014 +0100 shlwapi/tests: Fix win8 test failures. --- dlls/shlwapi/tests/ordinal.c | 43 +++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 676c431..6833095 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -289,14 +289,15 @@ static void test_GetAcceptLanguagesA(void) When the buffer is large enough, the default language is returned When the buffer is too small for that fallback, win7_32 and w2k8_64 - and above fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), but - recent os succeed and return a partial result while - older os succeed and overflow the buffer */ + fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 fails + with HRESULT_FROM_WIN32(ERROR_MORE_DATA), other versions succeed and + return a partial result while older os succeed and overflow the buffer */ ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize)), "==_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); if (exactsize > 1) { @@ -307,7 +308,8 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize - 1)), "-1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); } @@ -318,15 +320,16 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == 1)), "=1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); len = maxlen; hr = pGetAcceptLanguagesA( NULL, &len); /* w2k3 and below: E_FAIL and untouched len, - since w2k8: S_OK and needed size (excluding 0) */ - ok( ((hr == S_OK) && (len == exactsize)) || + since w2k8: S_OK and needed size (excluding 0), win8 S_OK and size including 0. */ + ok( ((hr == S_OK) && ((len == exactsize) || (len == exactsize + 1))) || ((hr == E_FAIL) && (len == maxlen)), "NULL,max #%d: got 0x%x with %d and %s\n", i, hr, len, buffer); @@ -349,7 +352,8 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=2: got 0x%x with %d and %s\n", hr, len, buffer); len = 1; @@ -357,20 +361,21 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); /* When the buffer is too small, win7_32 and w2k8_64 and above fail with - HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), other versions succeed - and return a partial 0 terminated result while other versions + HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 ERROR_CANNOT_COPY, + other versions succeed and return a partial 0 terminated result while other versions fail with E_INVALIDARG and return a partial unterminated result */ ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=1: got 0x%x with %d and %s\n", hr, len, buffer); len = 0; memset(buffer, '#', maxlen); buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); - /* w2k3 and below: E_FAIL, since w2k8: E_INVALIDARG */ - ok((hr == E_FAIL) || (hr == E_INVALIDARG), - "got 0x%x (expected E_FAIL or E_INVALIDARG)\n", hr); + /* w2k3 and below: E_FAIL, since w2k8: E_INVALIDARG, win8 ERROR_CANNOT_COPY */ + ok((hr == E_FAIL) || (hr == E_INVALIDARG) || (hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)), + "got 0x%x\n", hr); memset(buffer, '#', maxlen); buffer[maxlen] = 0; @@ -2290,7 +2295,9 @@ static void test_IUnknown_QueryServiceExec(void) /* null source pointer */ hr = pIUnknown_QueryServiceExec(NULL, &dummy_serviceid, &dummy_groupid, 0, 0, 0, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL || + hr == E_NOTIMPL, /* win 8 */ + "got 0x%08x\n", hr); /* expected trace: IUnknown_QueryServiceExec( ptr1, serviceid, groupid, arg1, arg2, arg3, arg4); @@ -2406,7 +2413,9 @@ static void test_IUnknown_ProfferService(void) /* null source pointer */ hr = pIUnknown_ProfferService(NULL, &dummy_serviceid, 0, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL || + hr == E_NOTIMPL, /* win 8 */ + "got 0x%08x\n", hr); /* expected trace: IUnknown_ProfferService( ptr1, serviceid, arg1, arg2);

1 0

Piotr Caban : oleacc: Add Client_get_accName implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: a5f78530ddf45b7773a11af92117993abfb9c8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f78530ddf45b7773a11af92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:24 2014 +0200 oleacc: Add Client_get_accName implementation. --- dlls/oleacc/Makefile.in | 2 +- dlls/oleacc/client.c | 25 +++++++++++++++++++++++-- dlls/oleacc/main.c | 11 +++++++++++ dlls/oleacc/oleacc_private.h | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index d33f867..778791e 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = ole32 user32 uuid +IMPORTS = uuid oleaut32 ole32 user32 C_SRCS = \ client.c \ diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 5e5ee6f..30673d3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -142,8 +142,29 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); + + *pszName = NULL; + if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd)) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(name[i] == '&') { + len--; + memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR)); + break; + } + } + + *pszName = SysAllocStringLen(name, len); + return *pszName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 63dfe99..2777a38 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -70,6 +70,17 @@ const char *debugstr_variant(const VARIANT *v) } } +int convert_child_id(VARIANT *v) +{ + switch(V_VT(v)) { + case VT_I4: + return V_I4(v); + default: + FIXME("unhandled child ID variant type: %d\n", V_VT(v)); + return -1; + } +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index dbb0f8c..ebbab4c 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -21,6 +21,7 @@ HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; +int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) {

1 0

Piotr Caban : oleaut32: Handle VariantCopy errors in VariantChangeTypeEx.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: d1469144e9a5e300223703cb69d32e6e6c25b28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1469144e9a5e300223703cb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 12:14:27 2014 +0200 oleaut32: Handle VariantCopy errors in VariantChangeTypeEx. --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ea5065f..b873d82 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6269,6 +6269,13 @@ static void test_ChangeType_keep_dst(void) hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); ok(V_VT(&v2) == VT_INT && V_INT(&v2) == 4, "VariantChangeTypeEx changed dst variant\n"); + V_VT(&v2) = 0xff; /* incorrect variant type */ + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); + ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_BSTR); + ok(hres == DISP_E_BADVARTYPE, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); SysFreeString(bstr); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 053903e..c3bd225 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1042,7 +1042,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, if (SUCCEEDED(res)) { V_VT(&vTmp) = vt; - VariantCopy(pvargDest, &vTmp); + res = VariantCopy(pvargDest, &vTmp); } VariantClear(&vTmp); VariantClear(&vSrcDeref);

1 0

Alexandre Julliard : user32: Don' t bother returning a value from the SetWindowRgn driver entry point.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 6a0f3df68cb22ca341a0ca2dd642d426c74e5cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f3df68cb22ca341a0ca2dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 12:31:14 2014 +0200 user32: Don't bother returning a value from the SetWindowRgn driver entry point. --- dlls/user32/driver.c | 7 +++---- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/window.c | 4 +--- dlls/winex11.drv/window.c | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 672f194..e0bc38c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -457,9 +457,8 @@ static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { } -static int CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return 1; } static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) @@ -757,9 +756,9 @@ static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); + load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f2345e8..2bb869a 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -105,7 +105,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pSetFocus)(HWND); void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (CDECL *pSetParent)(HWND,HWND,HWND); - int (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); + void (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); void (CDECL *pSetWindowIcon)(HWND,UINT,HICON); void (CDECL *pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (CDECL *pSetWindowText)(HWND,LPCWSTR); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6ef227c..e61a517 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1374,7 +1374,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) * * Assign specified region to window (for non-rectangular windows) */ -int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) +void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) { struct macdrv_win_data *data; @@ -1393,8 +1393,6 @@ int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) if (procid != GetCurrentProcessId()) SendMessageW(hwnd, WM_MACDRV_SET_WIN_REGION, 0, 0); } - - return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d98b9f6..77cf304 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2435,7 +2435,7 @@ done: * * Assign specified region to window (for non-rectangular windows) */ -int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { struct x11drv_win_data *data; @@ -2448,7 +2448,6 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { SendMessageW( hwnd, WM_X11DRV_SET_WIN_REGION, 0, 0 ); } - return TRUE; }

1 0

Thomas Faber : qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 8365eb8753db51ab078080afe423301885644a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8365eb8753db51ab078080afe… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 13:48:00 2014 +0200 qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file. --- dlls/qmgr/qmgr_main.c | 77 ++----------------------------------------------- 1 file changed, 3 insertions(+), 74 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 051c3a5..97c206a 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "advpub.h" #include "olectl.h" +#include "rpcproxy.h" #include "winsvc.h" #include "bits.h" @@ -41,9 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Handle to the base address of this DLL */ static HINSTANCE hInst; -/* Other GUIDs used by this module */ -DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); - /* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -62,81 +60,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), - CLSID_EXPANSION_ENTRY(BackgroundCopyManager) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = qmgr_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources(hInst); } HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources(hInst); }

1 0

Huw Davies : ole32/tests: Fix win8 test failures.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: dcfd901c83a8ac413bf913ada38211d2e60183c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd901c83a8ac413bf913ada… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 11:12:56 2014 +0100 ole32/tests: Fix win8 test failures. --- dlls/ole32/tests/hglobalstream.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b509fb5..cf9fedf 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -261,14 +261,17 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); - /* IStream_Seek -- seek wraps position/size on integer overflow */ + /* IStream_Seek -- seek wraps position/size on integer overflow, but not on win8 */ ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + if (SUCCEEDED(hr)) + ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + else + ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); hr = IStream_Commit(pStream, STGC_DEFAULT);

1 0

Piotr Caban : oleacc: Add Client_get_accValue implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 5224f093713e2231dcb77a8050bea8bc9aec2485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5224f093713e2231dcb77a805… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:31 2014 +0200 oleacc: Add Client_get_accValue implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 30673d3..e16d3f8 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -170,8 +170,13 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszValue); + + *pszValue = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accDescription(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add Client_get_accDescription implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 1eb9d7e703930ae99ec920a5ce58eb774563eed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eb9d7e703930ae99ec920a5c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:37 2014 +0200 oleacc: Add Client_get_accDescription implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e16d3f8..48c8d1c 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -183,8 +183,13 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, VARIANT varID, BSTR *pszDescription) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDescription); + + *pszDescription = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 2c8bb773b6e750f5696b48cfee44a2aaee977090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8bb773b6e750f5696b48cfe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:42 2014 +0200 oleacc: Add Client_get_accRole implementation. --- dlls/oleacc/client.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 48c8d1c..7af5c38 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -195,8 +195,17 @@ static HRESULT WINAPI Client_get_accDescription(IAccessible *iface, static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARIANT *pvarRole) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarRole); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarRole) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarRole) = VT_I4; + V_I4(pvarRole) = ROLE_SYSTEM_CLIENT; + return S_OK; } static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState)

1 0

Piotr Caban : oleacc: Add Client_get_accHelpTopic implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: f196551a4d465f726f19ecbc4e74a22d9ee51975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f196551a4d465f726f19ecbc4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:58 2014 +0200 oleacc: Add Client_get_accHelpTopic implementation. --- dlls/oleacc/client.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 88009f3..a60ec24 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -238,9 +238,31 @@ static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface, static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, VARIANT varID, BSTR *pszKeyboardShortcut) { + static const WCHAR shortcut_fmt[] = {'A','l','t','+','!',0}; Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszKeyboardShortcut); + + *pszKeyboardShortcut = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + for(i=0; i<len; i++) { + if(name[i] == '&') + break; + } + if(i+1 >= len) + return S_FALSE; + + *pszKeyboardShortcut = SysAllocString(shortcut_fmt); + if(!*pszKeyboardShortcut) + return E_OUTOFMEMORY; + + (*pszKeyboardShortcut)[4] = name[i+1]; + return S_OK; } static HRESULT WINAPI Client_get_accFocus(IAccessible *iface, VARIANT *pvarID)

1 0

Piotr Caban : oleacc: Add Client_get_accRole implementaiton.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 0793010063a0714ec523438f675412aeeb59480c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0793010063a0714ec523438f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:15:03 2014 +0200 oleacc: Add Client_get_accRole implementaiton. --- dlls/oleacc/client.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index a60ec24..e768657 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -211,8 +211,28 @@ static HRESULT WINAPI Client_get_accRole(IAccessible *iface, VARIANT varID, VARI static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VARIANT *pvarState) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); - return E_NOTIMPL; + LONG style; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pvarState); + + if(convert_child_id(&varID) != CHILDID_SELF) { + V_VT(pvarState) = VT_EMPTY; + return E_INVALIDARG; + } + + V_VT(pvarState) = VT_I4; + V_I4(pvarState) = 0; + + style = GetWindowLongW(This->hwnd, GWL_STYLE); + if(style & WS_DISABLED) + V_I4(pvarState) |= STATE_SYSTEM_UNAVAILABLE; + else if(IsWindow(This->hwnd)) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSABLE; + if(GetFocus() == This->hwnd) + V_I4(pvarState) |= STATE_SYSTEM_FOCUSED; + if(!(style & WS_VISIBLE)) + V_I4(pvarState) |= STATE_SYSTEM_INVISIBLE; + return S_OK; } static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp)

1 0

Piotr Caban : oleacc: Add Client_get_accDefaultAction implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: acc45124d630f0c315c0f8841e6c3f021eff050e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc45124d630f0c315c0f8841… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:53 2014 +0200 oleacc: Add Client_get_accDefaultAction implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 104ebdb..88009f3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -261,8 +261,13 @@ static HRESULT WINAPI Client_get_accDefaultAction(IAccessible *iface, VARIANT varID, BSTR *pszDefaultAction) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszDefaultAction); + + *pszDefaultAction = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_accSelect(IAccessible *iface, LONG flagsSelect, VARIANT varID)

1 0

Piotr Caban : oleacc: Add Client_get_accHelp implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 4ecee6f7d824e4d734b5b93f3448ccb1ffe05cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecee6f7d824e4d734b5b93f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:48 2014 +0200 oleacc: Add Client_get_accHelp implementation. --- dlls/oleacc/client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 7af5c38..104ebdb 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -218,8 +218,13 @@ static HRESULT WINAPI Client_get_accState(IAccessible *iface, VARIANT varID, VAR static HRESULT WINAPI Client_get_accHelp(IAccessible *iface, VARIANT varID, BSTR *pszHelp) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszHelp); + + *pszHelp = NULL; + if(convert_child_id(&varID) != CHILDID_SELF) + return E_INVALIDARG; + return S_FALSE; } static HRESULT WINAPI Client_get_accHelpTopic(IAccessible *iface,

1 0

Piotr Caban : oleacc: Add default client accessible object stub.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: da8005c75ecabac85731dd2dd47e80dcf99ed189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8005c75ecabac85731dd2dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:13:54 2014 +0200 oleacc: Add default client accessible object stub. --- dlls/oleacc/Makefile.in | 3 +- dlls/oleacc/client.c | 319 ++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/main.c | 53 ++++++- dlls/oleacc/oleacc_private.h | 33 +++++ 4 files changed, 403 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da8005c75ecabac85731d…

1 0

Jérôme Gardou : msi: Expand REG_EXPAND_SZ keys when resolving AppSearch entries.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 70225a4de3acc2cb15034eae2b7f929078602f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70225a4de3acc2cb15034eae2… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Wed Apr 30 16:08:43 2014 +0200 msi: Expand REG_EXPAND_SZ keys when resolving AppSearch entries. --- dlls/msi/appsearch.c | 13 +++++++++++++ dlls/msi/tests/package.c | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 0d9c302..ae8c5c8 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -451,6 +451,19 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT if (sz == 0) goto end; + /* expand if needed */ + if (regType == REG_EXPAND_SZ) + { + sz = ExpandEnvironmentStringsW((LPCWSTR)value, NULL, 0); + if (sz) + { + LPWSTR buf = msi_alloc(sz * sizeof(WCHAR)); + ExpandEnvironmentStringsW((LPCWSTR)value, buf, sz); + msi_free(value); + value = (LPBYTE)buf; + } + } + if ((regType == REG_SZ || regType == REG_EXPAND_SZ) && (ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) *end = '\0'; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a0c0455..043baf9 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3689,6 +3689,8 @@ static void test_appsearch(void) MSIHANDLE hdb; CHAR prop[MAX_PATH]; DWORD size; + HKEY hkey; + const char reg_expand_value[] = "%systemroot%\\system32\\notepad.exe"; hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -3702,12 +3704,23 @@ static void test_appsearch(void) r = add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = add_appsearch_entry( hdb, "'REGEXPANDVAL', 'NewSignature3'" ); + ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = create_reglocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); r = add_reglocator_entry( hdb, "NewSignature1", 0, "htmlfile\\shell\\open\\command", "", 1 ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_EXPAND_SZ, (const BYTE*)reg_expand_value, strlen(reg_expand_value) + 1); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + r = add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", 1 ); + ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = create_drlocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create DrLocator table: %d\n", r ); @@ -3723,6 +3736,9 @@ static void test_appsearch(void) r = add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + r = add_signature_entry( hdb, "'NewSignature3', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) { @@ -3749,9 +3765,15 @@ static void test_appsearch(void) r = MsiGetPropertyA( hpkg, "NOTEPAD", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "REGEXPANDVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); } static void test_appsearch_complocator(void)

1 0

Ken Thomases : configure: Use the discovered LCMS2_LIBS when testing linking against lcms2.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: dfa98dfb497bf40324831661d90741a7f2865a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa98dfb497bf40324831661d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 30 17:48:09 2014 -0500 configure: Use the discovered LCMS2_LIBS when testing linking against lcms2. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1bca827..0db221c 100755 --- a/configure +++ b/configure @@ -11755,7 +11755,7 @@ if ${ac_cv_lib_lcms2_cmsOpenProfileFromFile+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-llcms2 $LIBS" +LIBS="-llcms2 $LCMS2_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 46602d6..673323a 100644 --- a/configure.ac +++ b/configure.ac @@ -1442,7 +1442,7 @@ then if test "$ac_cv_header_lcms2_h" = "yes" then AC_CHECK_LIB(lcms2, cmsOpenProfileFromFile, - [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""]) + [AC_DEFINE(HAVE_LCMS2, 1, [Define if you have the LittleCMS development environment])],[LCMS2_LIBS=""],[$LCMS2_LIBS]) else LCMS2_CFLAGS="" LCMS2_LIBS=""

1 0

Hans Leidekker : msi: Avoid a crash when MIME entries point to non-existing extensions.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 95d72ae6f012968486402ac82f2758b9ee44008c URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d72ae6f012968486402ac82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 1 10:07:23 2014 +0200 msi: Avoid a crash when MIME entries point to non-existing extensions. --- dlls/msi/classes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 2719a8e..df5c817 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1452,14 +1452,14 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( mt, &package->mimes, MSIMIME, entry ) { - LPWSTR extension, key; + LPWSTR extension = NULL, key; /* * check if the MIME is to be installed. Either as requested by an * extension or Class */ if ((!mt->Class || mt->Class->action != INSTALLSTATE_LOCAL) && - mt->Extension->action != INSTALLSTATE_LOCAL) + (!mt->Extension || mt->Extension->action != INSTALLSTATE_LOCAL)) { TRACE("MIME %s not scheduled to be installed\n", debugstr_w(mt->ContentType)); continue; @@ -1467,7 +1467,7 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) TRACE("Registering MIME type %s\n", debugstr_w(mt->ContentType)); - extension = msi_alloc( (strlenW( mt->Extension->Extension ) + 2) * sizeof(WCHAR) ); + if (mt->Extension) extension = msi_alloc( (strlenW( mt->Extension->Extension ) + 2) * sizeof(WCHAR) ); key = msi_alloc( (strlenW( mt->ContentType ) + strlenW( szMIMEDatabase ) + 1) * sizeof(WCHAR) ); if (extension && key) @@ -1510,7 +1510,7 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) LPWSTR mime_key; if ((!mime->Class || mime->Class->action != INSTALLSTATE_ABSENT) && - mime->Extension->action != INSTALLSTATE_ABSENT) + (!mime->Extension || mime->Extension->action != INSTALLSTATE_ABSENT)) { TRACE("MIME %s not scheduled to be removed\n", debugstr_w(mime->ContentType)); continue;

1 0

Thomas Faber : usp10: Do not write to last script item if buffer space is insufficient.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 3f9c9eaa549e342870af2ee9454a93d29090c1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9c9eaa549e342870af2ee94… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 08:57:09 2014 +0200 usp10: Do not write to last script item if buffer space is insufficient. --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 94785b2..ae164d2 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1616,12 +1616,12 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, * item is set up to prevent random behaviour if the caller erroneously * checks the n+1 structure */ index++; + if (index + 1 > cMaxItems) return E_OUTOFMEMORY; memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos); /* Set one SCRIPT_STATE item being returned */ - if (index + 1 > cMaxItems) return E_OUTOFMEMORY; if (pcItems) *pcItems = index; /* Set SCRIPT_ITEM */

1 0

Francois Gouget : testbot/web: ObjectModel::CGI::Page::initialize() does not take a Collection argument.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 9bfab74f78f79fd0829af32a702dca166a6594ab URL: http://source.winehq.org/git/tools.git/?a=commit;h=9bfab74f78f79fd0829af32a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:22:25 2014 +0200 testbot/web: ObjectModel::CGI::Page::initialize() does not take a Collection argument. --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index cfe966b..d0ba188 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -196,7 +196,7 @@ sub _initialize { my $self = shift; - $self->SUPER::_initialize(@_, CreateJobs()); + $self->SUPER::_initialize(@_); } sub OutputDot

1 0

Francois Gouget : testbot/lib: Add calls to the parent InitializeNew() method.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: c05902e1f83cb191f5707346fc3f760cd5e03b10 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c05902e1f83cb191f5707346… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:37:23 2014 +0200 testbot/lib: Add calls to the parent InitializeNew() method. --- testbot/lib/WineTestBot/Branches.pm | 1 + testbot/lib/WineTestBot/Users.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 56f9965..ce975f1 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -38,6 +38,7 @@ sub InitializeNew my $self = shift; $self->IsDefault(!1); + $self->SUPER::InitializeNew(); } package WineTestBot::Branches; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index a0034ee..1f09446 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -44,6 +44,7 @@ sub InitializeNew $self->Status('active'); $self->Password("*"); + $self->SUPER::InitializeNew(); } sub GeneratePasswordHash

1 0

Francois Gouget : testbot/WineSendLog: Remove FatalError().
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 4ae0a6dc40acb17291cd5ddeb4b3625a088a86f7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4ae0a6dc40acb17291cd5dde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:22:59 2014 +0200 testbot/WineSendLog: Remove FatalError(). Its main point was to trace the JobId but the $Job parameter was never used. So the code is clearer without it. --- testbot/bin/WineSendLog.pl | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index b375447..24cdd48 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -42,16 +42,6 @@ use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::StepsTasks; -sub FatalError -{ - my ($ErrMessage, $Job) = @_; - - my $JobKey = defined($Job) ? $Job->GetKey() : "0"; - - LogMsg "$JobKey $ErrMessage"; - - exit 1; -} sub IsBotFailure { @@ -535,17 +525,19 @@ if ($JobId =~ /^(\d+)$/) } else { - FatalError "Invalid JobId $JobId\n"; + LogMsg "Invalid JobId $JobId\n"; + exit(1); } my $Job = CreateJobs()->GetItem($JobId); if (! defined($Job)) { - FatalError "Job $JobId doesn't exist\n"; + LogMsg "Job $JobId doesn't exist\n"; + exit(1); } SendLog($Job); LogMsg "Log for job $JobId sent\n"; -exit; +exit(0);

1 0

Francois Gouget : testbot/CGI: Fix the CallGenerateError(Div|Popup)() calls in CollectionBlock.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: 21c991065acc16bb51faec0a5e0cc54f52ff9915 URL: http://source.winehq.org/git/tools.git/?a=commit;h=21c991065acc16bb51faec0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:34:19 2014 +0200 testbot/CGI: Fix the CallGenerateError(Div|Popup)() calls in CollectionBlock. They were passing too many parameters. --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 79c21ef..b663208 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -196,14 +196,14 @@ sub CallGenerateErrorDiv { my $self = shift; - $self->{EnclosingPage}->GenerateErrorDiv($self, @_); + $self->{EnclosingPage}->GenerateErrorDiv(); } sub CallGenerateErrorPopup { my $self = shift; - $self->{EnclosingPage}->GenerateErrorPopup($self, @_); + $self->{EnclosingPage}->GenerateErrorPopup(); } sub CallGenerateFormEnd

1 0

Francois Gouget : testbot/lib: Remove Roles::HasRole(), it' s unused and does not make sense.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: tools Branch: master Commit: b524951e9c26955e3f2d0c3416f4d8a8e8860469 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b524951e9c26955e3f2d0c34… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu May 1 14:36:56 2014 +0200 testbot/lib: Remove Roles::HasRole(), it's unused and does not make sense. See WineTestBot::User::HasRole() instead. --- testbot/lib/WineTestBot/Roles.pm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 620566a..2d74016 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -35,11 +35,6 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(WineTestBot::WineTestBotItem Exporter); -sub HasRole -{ - my $self = shift; - my $RoleName = shift; -} package WineTestBot::Roles;

1 0