June 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : gdiplus: Check GetMetadataFormat() return value (Coverity) .
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: c2ae34c54d5e385c8f85a2b28a0328bf57e1fd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ae34c54d5e385c8f85a2b28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 14:29:37 2015 +0300 gdiplus: Check GetMetadataFormat() return value (Coverity). --- dlls/gdiplus/image.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 351c5b3..73f2f74 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3058,8 +3058,8 @@ static BOOL get_bool_property(IWICMetadataReader *reader, const GUID *guid, cons PROPVARIANT id, value; BOOL ret = FALSE; - IWICMetadataReader_GetMetadataFormat(reader, &format); - if (!IsEqualGUID(&format, guid)) return FALSE; + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (FAILED(hr) || !IsEqualGUID(&format, guid)) return FALSE; PropVariantInit(&id); PropVariantInit(&value); @@ -3085,8 +3085,8 @@ static PropertyItem *get_property(IWICMetadataReader *reader, const GUID *guid, PROPVARIANT id, value; PropertyItem *item = NULL; - IWICMetadataReader_GetMetadataFormat(reader, &format); - if (!IsEqualGUID(&format, guid)) return NULL; + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (FAILED(hr) || !IsEqualGUID(&format, guid)) return NULL; PropVariantInit(&id); PropVariantInit(&value);

1 0

Nikolay Sivov : ole32: Handle EnumElements() failure (Coverity).
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 64456de761f9264f4bcbebcf34323e0b07353e4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=64456de761f9264f4bcbebcf3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 20:25:52 2015 +0300 ole32: Handle EnumElements() failure (Coverity). --- dlls/ole32/storage32.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b1bad38..220e17e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2421,7 +2421,12 @@ static HRESULT deleteStorageContents( /* * Enumerate the elements */ - IStorage_EnumElements( childStorage, 0, 0, 0, &elements); + hr = IStorage_EnumElements(childStorage, 0, 0, 0, &elements); + if (FAILED(hr)) + { + IStorage_Release(childStorage); + return hr; + } do {

1 0

Nikolay Sivov : shell32: Fix memory leak on NULL return length (Coverity).
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 7ca31b81195ac39ddb3feb49624b57a7d92da994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca31b81195ac39ddb3feb496… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 22:07:39 2015 +0300 shell32: Fix memory leak on NULL return length (Coverity). --- dlls/shell32/assoc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 21df493..90d00a8 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -745,7 +745,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, static const WCHAR edit_flags[] = {'E','d','i','t','F','l','a','g','s',0}; IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); - void *data; + void *data = NULL; DWORD size; HRESULT hres; @@ -761,10 +761,8 @@ static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, return HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION); hres = ASSOC_GetValue(This->hkeyProgID, edit_flags, &data, &size); - if(FAILED(hres) || !pcbOut) - return hres; - - hres = ASSOC_ReturnData(pvOut, pcbOut, data, size); + if(SUCCEEDED(hres) && pcbOut) + hres = ASSOC_ReturnData(pvOut, pcbOut, data, size); HeapFree(GetProcessHeap(), 0, data); return hres; default:

1 0

Nikolay Sivov : winecfg: Fix a leak when applying drive changes (Coverity) .
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 74c3a4a7e72f67aa2d415e41f6666a19518f6de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c3a4a7e72f67aa2d415e41f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 23:14:11 2015 +0300 winecfg: Fix a leak when applying drive changes (Coverity). --- programs/winecfg/drive.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 8cad14a..b5ef69d 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -367,6 +367,7 @@ void apply_drive_changes(void) } else WINE_WARN( "failed to set drive %c: to %s type %u err %u\n", 'a' + i, wine_dbgstr_a(drives[i].unixpath), drives[i].type, GetLastError() ); + HeapFree( GetProcessHeap(), 0, ioctl ); } CloseHandle( mgr ); }

1 0

Nikolay Sivov : winecfg: Fix string buffer length for override settings ( Valgrind).
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: d11b498c813bdce1756a22c54accf78a0bf034bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11b498c813bdce1756a22c54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 27 23:19:56 2015 +0300 winecfg: Fix string buffer length for override settings (Valgrind). --- programs/winecfg/libraries.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index f00449d..ff3f67a 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -106,7 +106,7 @@ static enum dllmode string_to_mode(char *in) enum dllmode res; len = strlen(in); - out = HeapAlloc(GetProcessHeap(), 0, len); + out = HeapAlloc(GetProcessHeap(), 0, len + 1); /* remove the spaces */ for (i = j = 0; i <= len; ++i) {

1 0

Nikolay Sivov : oleaut32: Use context redirects when creating typelib marshaler proxy/stub.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 50a66f28eec5f2874973f7d4ad25424979736546 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a66f28eec5f2874973f7d4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 28 11:16:23 2015 +0300 oleaut32: Use context redirects when creating typelib marshaler proxy/stub. --- dlls/oleaut32/tmarshal.c | 101 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 86 insertions(+), 15 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 7bf62b7..a2d1ea1 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -263,18 +263,71 @@ PSFacBuf_QueryInterface(LPPSFACTORYBUFFER iface, REFIID iid, LPVOID *ppv) { static ULONG WINAPI PSFacBuf_AddRef(LPPSFACTORYBUFFER iface) { return 2; } static ULONG WINAPI PSFacBuf_Release(LPPSFACTORYBUFFER iface) { return 1; } -static HRESULT -_get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { - HRESULT hres; +struct ifacepsredirect_data +{ + ULONG size; + DWORD mask; + GUID iid; + ULONG nummethods; + GUID tlbid; + GUID base; + ULONG name_len; + ULONG name_offset; +}; + +struct tlibredirect_data +{ + ULONG size; + DWORD res; + ULONG name_len; + ULONG name_offset; + LANGID langid; + WORD flags; + ULONG help_len; + ULONG help_offset; + WORD major_version; + WORD minor_version; +}; + +static BOOL actctx_get_typelib_module(REFIID riid, WCHAR *module, DWORD len) +{ + struct ifacepsredirect_data *iface; + struct tlibredirect_data *tlib; + ACTCTX_SECTION_KEYED_DATA data; + WCHAR *ptrW; + + data.cbSize = sizeof(data); + if (!FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, + riid, &data)) + return FALSE; + + iface = (struct ifacepsredirect_data*)data.lpData; + if (!FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION, + &iface->tlbid, &data)) + return FALSE; + + tlib = (struct tlibredirect_data*)data.lpData; + ptrW = (WCHAR*)((BYTE*)data.lpSectionBase + tlib->name_offset); + + if (tlib->name_len/sizeof(WCHAR) >= len) { + ERR("need larger module buffer, %u\n", tlib->name_len); + return FALSE; + } + + memcpy(module, ptrW, tlib->name_len); + module[tlib->name_len/sizeof(WCHAR)] = 0; + return TRUE; +} + +static HRESULT reg_get_typelib_module(REFIID riid, WCHAR *module, DWORD len) +{ HKEY ikey; REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; BOOL is_wow64; char tlguid[200],typelibkey[300],interfacekey[300],ver[100]; char tlfn[260]; - OLECHAR tlfnW[260]; DWORD tlguidlen, verlen, type; LONG tlfnlen, err; - ITypeLib *tl; sprintf( interfacekey, "Interface\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\Typelib", riid->Data1, riid->Data2, riid->Data3, @@ -318,19 +371,37 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo**ti) { } #endif } - MultiByteToWideChar(CP_ACP, 0, tlfn, -1, tlfnW, sizeof(tlfnW) / sizeof(tlfnW[0])); - hres = LoadTypeLib(tlfnW,&tl); - if (hres) { - ERR("Failed to load typelib for %s, but it should be there.\n",debugstr_guid(riid)); - return hres; + MultiByteToWideChar(CP_ACP, 0, tlfn, -1, module, len); + return S_OK; +} + +static HRESULT +_get_typeinfo_for_iid(REFIID riid, ITypeInfo **typeinfo) +{ + OLECHAR moduleW[260]; + ITypeLib *typelib; + HRESULT hres; + + *typeinfo = NULL; + + moduleW[0] = 0; + if (!actctx_get_typelib_module(riid, moduleW, sizeof(moduleW)/sizeof(moduleW[0]))) { + hres = reg_get_typelib_module(riid, moduleW, sizeof(moduleW)/sizeof(moduleW[0])); + if (FAILED(hres)) + return hres; } - hres = ITypeLib_GetTypeInfoOfGuid(tl,riid,ti); - if (hres) { - ERR("typelib does not contain info for %s?\n",debugstr_guid(riid)); - ITypeLib_Release(tl); + + hres = LoadTypeLib(moduleW, &typelib); + if (hres != S_OK) { + ERR("Failed to load typelib for %s, but it should be there.\n",debugstr_guid(riid)); return hres; } - ITypeLib_Release(tl); + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, riid, typeinfo); + ITypeLib_Release(typelib); + if (hres != S_OK) + ERR("typelib does not contain info for %s\n", debugstr_guid(riid)); + return hres; }

1 0

Nikolay Sivov : gdi32: Add a separate helper to load FT_Short values ( Coverity).
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 7ebdd58556e83644122b0012959fcad2f2609548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ebdd58556e83644122b00129… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 28 13:02:55 2015 +0300 gdi32: Add a separate helper to load FT_Short values (Coverity). --- dlls/gdi32/freetype.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 06b1b1e..07d80a2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1511,7 +1511,15 @@ static LONG reg_load_dword(HKEY hkey, const WCHAR *value, DWORD *data) return ERROR_SUCCESS; } -static LONG reg_load_ftlong(HKEY hkey, const WCHAR *value, FT_Long *data) +static inline LONG reg_load_ftlong(HKEY hkey, const WCHAR *value, FT_Long *data) +{ + DWORD dw; + LONG ret = reg_load_dword(hkey, value, &dw); + *data = dw; + return ret; +} + +static inline LONG reg_load_ftshort(HKEY hkey, const WCHAR *value, FT_Short *data) { DWORD dw; LONG ret = reg_load_dword(hkey, value, &dw); @@ -1557,7 +1565,7 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu needed = sizeof(face->fs); RegQueryValueExW(hkey_face, face_font_sig_value, NULL, NULL, (BYTE*)&face->fs, &needed); - if(reg_load_dword(hkey_face, face_height_value, (DWORD*)&face->size.height) != ERROR_SUCCESS) + if(reg_load_ftshort(hkey_face, face_height_value, &face->size.height) != ERROR_SUCCESS) { face->scalable = TRUE; memset(&face->size, 0, sizeof(face->size)); @@ -1565,11 +1573,11 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *bu else { face->scalable = FALSE; - reg_load_dword(hkey_face, face_width_value, (DWORD*)&face->size.width); + reg_load_ftshort(hkey_face, face_width_value, &face->size.width); reg_load_ftlong(hkey_face, face_size_value, &face->size.size); reg_load_ftlong(hkey_face, face_x_ppem_value, &face->size.x_ppem); reg_load_ftlong(hkey_face, face_y_ppem_value, &face->size.y_ppem); - reg_load_dword(hkey_face, face_internal_leading_value, (DWORD*)&face->size.internal_leading); + reg_load_ftshort(hkey_face, face_internal_leading_value, &face->size.internal_leading); TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", face->size.height, face->size.width, face->size.size >> 6,

1 0

Nikolay Sivov : kernel32: Simplify the way EnumCalendarInfo vs EnumCalendarInfoEx are handled internally.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: c1c42d3caf1af36400006c3e4dfe67c519f65028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c42d3caf1af36400006c3e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 28 15:58:30 2015 +0300 kernel32: Simplify the way EnumCalendarInfo vs EnumCalendarInfoEx are handled internally. --- dlls/kernel32/lcformat.c | 122 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index 8ec1d8a..ea96167 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1971,26 +1971,29 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) return TRUE; } +enum enumcalendar_callback_type { + CALLBACK_ENUMPROC, + CALLBACK_ENUMPROCEX, +}; + +struct enumcalendar_context { + enum enumcalendar_callback_type type; /* callback kind */ + union { + CALINFO_ENUMPROCW callback; /* user callback pointer */ + CALINFO_ENUMPROCEXW callbackex; + } u; + LCID lcid; /* locale of interest */ + CALID calendar; /* specific calendar or ENUM_ALL_CALENDARS */ + CALTYPE caltype; /* calendar information type */ + BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ +}; + /****************************************************************************** - * NLS_EnumCalendarInfoAW <internal> + * NLS_EnumCalendarInfo <internal> * Enumerates calendar information for a specified locale. * * PARAMS - * calinfoproc [I] Pointer to the callback - * locale [I] The locale for which to retrieve calendar information. - * This parameter can be a locale identifier created by the - * MAKELCID macro, or one of the following values: - * LOCALE_SYSTEM_DEFAULT - * Use the default system locale. - * LOCALE_USER_DEFAULT - * Use the default user locale. - * calendar [I] The calendar for which information is requested, or - * ENUM_ALL_CALENDARS. - * caltype [I] The type of calendar information to be returned. Note - * that only one CALTYPE value can be specified per call - * of this function, except where noted. - * unicode [I] Specifies if the callback expects a unicode string. - * ex [I] Specifies if the callback needs the calendar identifier. + * ctxt [I] enumeration context, see 'struct enumcalendar_context' * * RETURNS * Success: TRUE. @@ -2005,14 +2008,14 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) * TODO * The above note should be respected by GetCalendarInfoA. */ -static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, - CALID calendar, CALTYPE caltype, BOOL unicode, BOOL ex ) +static BOOL NLS_EnumCalendarInfo(const struct enumcalendar_context *ctxt) { WCHAR *buf, *opt = NULL, *iter = NULL; + CALID calendar = ctxt->calendar; BOOL ret = FALSE; int bufSz = 200; /* the size of the buffer */ - if (calinfoproc == NULL) + if (ctxt->u.callback == NULL) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -2027,7 +2030,7 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, if (calendar == ENUM_ALL_CALENDARS) { - int optSz = GetLocaleInfoW(locale, LOCALE_IOPTIONALCALENDAR, NULL, 0); + int optSz = GetLocaleInfoW(ctxt->lcid, LOCALE_IOPTIONALCALENDAR, NULL, 0); if (optSz > 1) { opt = HeapAlloc(GetProcessHeap(), 0, optSz * sizeof(WCHAR)); @@ -2036,30 +2039,30 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } - if (GetLocaleInfoW(locale, LOCALE_IOPTIONALCALENDAR, opt, optSz)) + if (GetLocaleInfoW(ctxt->lcid, LOCALE_IOPTIONALCALENDAR, opt, optSz)) iter = opt; } - calendar = NLS_GetLocaleNumber(locale, LOCALE_ICALENDARTYPE); + calendar = NLS_GetLocaleNumber(ctxt->lcid, LOCALE_ICALENDARTYPE); } while (TRUE) /* loop through calendars */ { do /* loop until there's no error */ { - if (caltype & CAL_RETURN_NUMBER) - ret = GetCalendarInfoW(locale, calendar, caltype, NULL, bufSz / sizeof(WCHAR), (LPDWORD)buf); - else if (unicode) - ret = GetCalendarInfoW(locale, calendar, caltype, buf, bufSz / sizeof(WCHAR), NULL); - else ret = GetCalendarInfoA(locale, calendar, caltype, (CHAR*)buf, bufSz / sizeof(CHAR), NULL); + if (ctxt->caltype & CAL_RETURN_NUMBER) + ret = GetCalendarInfoW(ctxt->lcid, calendar, ctxt->caltype, NULL, bufSz / sizeof(WCHAR), (LPDWORD)buf); + else if (ctxt->unicode) + ret = GetCalendarInfoW(ctxt->lcid, calendar, ctxt->caltype, buf, bufSz / sizeof(WCHAR), NULL); + else ret = GetCalendarInfoA(ctxt->lcid, calendar, ctxt->caltype, (CHAR*)buf, bufSz / sizeof(CHAR), NULL); if (!ret) { if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { /* so resize it */ int newSz; - if (unicode) - newSz = GetCalendarInfoW(locale, calendar, caltype, NULL, 0, NULL) * sizeof(WCHAR); - else newSz = GetCalendarInfoA(locale, calendar, caltype, NULL, 0, NULL) * sizeof(CHAR); + if (ctxt->unicode) + newSz = GetCalendarInfoW(ctxt->lcid, calendar, ctxt->caltype, NULL, 0, NULL) * sizeof(WCHAR); + else newSz = GetCalendarInfoA(ctxt->lcid, calendar, ctxt->caltype, NULL, 0, NULL) * sizeof(CHAR); if (bufSz >= newSz) { ERR("Buffer resizing disorder: was %d, requested %d.\n", bufSz, newSz); @@ -2079,10 +2082,17 @@ static BOOL NLS_EnumCalendarInfoAW(void *calinfoproc, LCID locale, * we must check for Ex, but we don't care about Unicode * because the buffer is already in the correct format. */ - if (ex) { - ret = ((CALINFO_ENUMPROCEXW)calinfoproc)(buf, calendar); - } else - ret = ((CALINFO_ENUMPROCW)calinfoproc)(buf); + switch (ctxt->type) + { + case CALLBACK_ENUMPROC: + ret = ctxt->u.callback(buf); + break; + case CALLBACK_ENUMPROCEX: + ret = ctxt->u.callbackex(buf, calendar); + break; + default: + ; + } if (!ret) { /* the callback told to stop */ ret = TRUE; @@ -2118,8 +2128,17 @@ cleanup: BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) { + struct enumcalendar_context ctxt; + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); - return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, FALSE, FALSE); + + ctxt.type = CALLBACK_ENUMPROC; + ctxt.u.callback = (CALINFO_ENUMPROCW)calinfoproc; + ctxt.lcid = locale; + ctxt.calendar = calendar; + ctxt.caltype = caltype; + ctxt.unicode = FALSE; + return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** @@ -2130,8 +2149,17 @@ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, BOOL WINAPI EnumCalendarInfoW( CALINFO_ENUMPROCW calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) { + struct enumcalendar_context ctxt; + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); - return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, TRUE, FALSE); + + ctxt.type = CALLBACK_ENUMPROC; + ctxt.u.callback = calinfoproc; + ctxt.lcid = locale; + ctxt.calendar = calendar; + ctxt.caltype = caltype; + ctxt.unicode = TRUE; + return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** @@ -2142,8 +2170,17 @@ BOOL WINAPI EnumCalendarInfoW( CALINFO_ENUMPROCW calinfoproc,LCID locale, BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) { + struct enumcalendar_context ctxt; + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); - return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, FALSE, TRUE); + + ctxt.type = CALLBACK_ENUMPROCEX; + ctxt.u.callbackex = (CALINFO_ENUMPROCEXW)calinfoproc; + ctxt.lcid = locale; + ctxt.calendar = calendar; + ctxt.caltype = caltype; + ctxt.unicode = FALSE; + return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** @@ -2154,6 +2191,15 @@ BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA calinfoproc,LCID locale, BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) { + struct enumcalendar_context ctxt; + TRACE("(%p,0x%08x,0x%08x,0x%08x)\n", calinfoproc, locale, calendar, caltype); - return NLS_EnumCalendarInfoAW(calinfoproc, locale, calendar, caltype, TRUE, TRUE); + + ctxt.type = CALLBACK_ENUMPROCEX; + ctxt.u.callbackex = calinfoproc; + ctxt.lcid = locale; + ctxt.calendar = calendar; + ctxt.caltype = caltype; + ctxt.unicode = TRUE; + return NLS_EnumCalendarInfo(&ctxt); }

1 0

Nikolay Sivov : kernel32: Implement EnumCalendarInfoExEx().
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 15eba3997888e50968da6d6c0c2e758319437e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15eba3997888e50968da6d6c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 28 16:03:57 2015 +0300 kernel32: Implement EnumCalendarInfoExEx(). --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 38 ++++++++++++++++++++++++++++++-------- include/winnls.h | 2 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9a0770..0070c98 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -396,7 +396,7 @@ @ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection @ stdcall EnumCalendarInfoA(ptr long long long) @ stdcall EnumCalendarInfoExA(ptr long long long) -# @ stub EnumCalendarInfoExEx +@ stdcall EnumCalendarInfoExEx(ptr wstr long wstr long long) @ stdcall EnumCalendarInfoExW(ptr long long long) @ stdcall EnumCalendarInfoW(ptr long long long) @ stdcall EnumDateFormatsA(ptr long long) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index ea96167..2c81d02 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1974,6 +1974,7 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) enum enumcalendar_callback_type { CALLBACK_ENUMPROC, CALLBACK_ENUMPROCEX, + CALLBACK_ENUMPROCEXEX }; struct enumcalendar_context { @@ -1981,10 +1982,12 @@ struct enumcalendar_context { union { CALINFO_ENUMPROCW callback; /* user callback pointer */ CALINFO_ENUMPROCEXW callbackex; + CALINFO_ENUMPROCEXEX callbackexex; } u; LCID lcid; /* locale of interest */ CALID calendar; /* specific calendar or ENUM_ALL_CALENDARS */ CALTYPE caltype; /* calendar information type */ + LPARAM lParam; /* user input parameter passed to callback, for ExEx case only */ BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ }; @@ -2090,6 +2093,9 @@ static BOOL NLS_EnumCalendarInfo(const struct enumcalendar_context *ctxt) case CALLBACK_ENUMPROCEX: ret = ctxt->u.callbackex(buf, calendar); break; + case CALLBACK_ENUMPROCEXEX: + ret = ctxt->u.callbackexex(buf, calendar, NULL, ctxt->lParam); + break; default: ; } @@ -2122,8 +2128,6 @@ cleanup: /****************************************************************************** * EnumCalendarInfoA [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2137,14 +2141,13 @@ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; ctxt.unicode = FALSE; return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** * EnumCalendarInfoW [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoW( CALINFO_ENUMPROCW calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2158,14 +2161,13 @@ BOOL WINAPI EnumCalendarInfoW( CALINFO_ENUMPROCW calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; ctxt.unicode = TRUE; return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** * EnumCalendarInfoExA [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2179,14 +2181,13 @@ BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; ctxt.unicode = FALSE; return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** * EnumCalendarInfoExW [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2200,6 +2201,27 @@ BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; + ctxt.unicode = TRUE; + return NLS_EnumCalendarInfo(&ctxt); +} + +/****************************************************************************** + * EnumCalendarInfoExEx [KERNEL32.@] + */ +BOOL WINAPI EnumCalendarInfoExEx( CALINFO_ENUMPROCEXEX calinfoproc, LPCWSTR locale, CALID calendar, + LPCWSTR reserved, CALTYPE caltype, LPARAM lParam) +{ + struct enumcalendar_context ctxt; + + TRACE("(%p,%s,0x%08x,%p,0x%08x,0x%ld)\n", calinfoproc, debugstr_w(locale), calendar, reserved, caltype, lParam); + + ctxt.type = CALLBACK_ENUMPROCEXEX; + ctxt.u.callbackexex = calinfoproc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.calendar = calendar; + ctxt.caltype = caltype; + ctxt.lParam = lParam; ctxt.unicode = TRUE; return NLS_EnumCalendarInfo(&ctxt); } diff --git a/include/winnls.h b/include/winnls.h index 693cb30..bf5431f 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -733,6 +733,7 @@ typedef struct _nlsversioninfoex { /* Define a bunch of callback types */ +typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXEX)(LPWSTR,CALID,LPWSTR,LPARAM); #if defined(STRICT) typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR); @@ -832,6 +833,7 @@ WINBASEAPI BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CAL WINBASEAPI BOOL WINAPI EnumCalendarInfoExA(CALINFO_ENUMPROCEXA,LCID,CALID,CALTYPE); WINBASEAPI BOOL WINAPI EnumCalendarInfoExW(CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE); #define EnumCalendarInfoEx WINELIB_NAME_AW(EnumCalendarInfoEx) +WINBASEAPI BOOL WINAPI EnumCalendarInfoExEx(CALINFO_ENUMPROCEXEX,LPCWSTR,CALID,LPCWSTR,CALTYPE,LPARAM); WINBASEAPI BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA,LCID,DWORD); WINBASEAPI BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW,LCID,DWORD); #define EnumDateFormats WINELIB_NAME_AW(EnumDateFormats)

1 0

Michael Stefaniuc : dmstyle: Move struct definitions to the files that need them.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 0b4bc2f965dccd2f464cd31be37cedf6485c64d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4bc2f965dccd2f464cd31be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:32:38 2015 +0200 dmstyle: Move struct definitions to the files that need them. --- dlls/dmstyle/auditiontrack.c | 8 ++++ dlls/dmstyle/chordtrack.c | 9 ++++ dlls/dmstyle/commandtrack.c | 9 ++++ dlls/dmstyle/dmstyle_private.h | 95 ------------------------------------------ dlls/dmstyle/motiftrack.c | 8 ++++ dlls/dmstyle/mutetrack.c | 8 ++++ dlls/dmstyle/styletrack.c | 9 ++++ 7 files changed, 51 insertions(+), 95 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index f237a72..448adfc 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicAuditionTrack implementation */ +typedef struct IDirectMusicAuditionTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicAuditionTrack; + /* IDirectMusicAuditionTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicAuditionTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicAuditionTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 23fe16b..bf65752 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -30,6 +30,15 @@ static ULONG WINAPI IDirectMusicChordTrack_IPersistStream_AddRef (LPPERSISTSTREA /***************************************************************************** * IDirectMusicChordTrack implementation */ +typedef struct IDirectMusicChordTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DWORD dwScale; +} IDirectMusicChordTrack; + /* IDirectMusicChordTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicChordTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 35415fb..c82fad6 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -29,6 +29,15 @@ static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_AddRef (LPPERSISTSTR /***************************************************************************** * IDirectMusicCommandTrack implementation */ +typedef struct IDirectMusicCommandTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Commands; +} IDirectMusicCommandTrack; + /* IDirectMusicCommandTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicCommandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicCommandTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 95ad92f..3382468 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -45,13 +45,7 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicAuditionTrack IDirectMusicAuditionTrack; -typedef struct IDirectMusicChordTrack IDirectMusicChordTrack; -typedef struct IDirectMusicCommandTrack IDirectMusicCommandTrack; typedef struct IDirectMusicMelodyFormulationTrack IDirectMusicMelodyFormulationTrack; -typedef struct IDirectMusicMotifTrack IDirectMusicMotifTrack; -typedef struct IDirectMusicMuteTrack IDirectMusicMuteTrack; -typedef struct IDirectMusicStyleTrack IDirectMusicStyleTrack; /***************************************************************************** * ClassFactory @@ -97,35 +91,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; -/***************************************************************************** - * IDirectMusicAuditionTrack implementation structure - */ -struct IDirectMusicAuditionTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicAuditionTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicChordTrack implementation structure - */ -struct IDirectMusicChordTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordTrack fields */ - LPDMUS_OBJECTDESC pDesc; - DWORD dwScale; -}; - typedef struct _DMUS_PRIVATE_COMMAND { struct list entry; /* for listing elements */ DMUS_IO_COMMAND pCommand; @@ -133,22 +98,6 @@ typedef struct _DMUS_PRIVATE_COMMAND { } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND; /***************************************************************************** - * IDirectMusicCommandTrack implementation structure - */ -struct IDirectMusicCommandTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicCommandTrack fields */ - LPDMUS_OBJECTDESC pDesc; - /* track data */ - struct list Commands; -}; - -/***************************************************************************** * IDirectMusicMelodyFormulationTrack implementation structure */ struct IDirectMusicMelodyFormulationTrack { @@ -170,50 +119,6 @@ extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IDirectMusicTrack_AddRe /* IPersistStream: */ extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirectMusicMotifTrack implementation structure - */ -struct IDirectMusicMotifTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicMotifTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicMuteTrack implementation structure - */ -struct IDirectMusicMuteTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicMuteTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicStyleTrack implementation structure - */ -struct IDirectMusicStyleTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicStyleTrack fields */ - LPDMUS_OBJECTDESC pDesc; - - struct list Items; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmstyle.dll */ diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index d0449a7..e068406 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREA /***************************************************************************** * IDirectMusicMotifTrack implementation */ +typedef struct IDirectMusicMotifTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicMotifTrack; + /* IDirectMusicMotifTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicMotifTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMotifTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 3010ad6..33fb954 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_AddRef (LPPERSISTSTREAM /***************************************************************************** * IDirectMusicMuteTrack implementation */ +typedef struct IDirectMusicMuteTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicMuteTrack; + /* IDirectMusicMuteTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicMuteTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMuteTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 69c3889..0de6558 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -29,6 +29,15 @@ static ULONG WINAPI IDirectMusicStyleTrack_IPersistStream_AddRef (LPPERSISTSTREA /***************************************************************************** * IDirectMusicStyleTrack implementation */ +typedef struct IDirectMusicStyleTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Items; +} IDirectMusicStyleTrack; + /* IDirectMusicStyleTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicStyleTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyleTrack, UnknownVtbl, iface);

1 0