August 2013 - Wine-commits - list.winehq.org

Daniel Jelinski : shell32: Return command strings for a few more commands.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: e6acc695c6b2ee312a31f2cdac00d493f52df6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6acc695c6b2ee312a31f2cda… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Aug 10 19:23:53 2013 +0200 shell32: Return command strings for a few more commands. --- dlls/shell32/shlview_cmenu.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index b7dc994..6004afc 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -505,6 +505,34 @@ static HRESULT WINAPI ItemMenu_GetCommandString( case GCS_VERBA: switch(idCommand) { + case FCIDM_SHVIEW_OPEN: + strcpy(lpszName, "open"); + hr = S_OK; + break; + case FCIDM_SHVIEW_EXPLORE: + strcpy(lpszName, "explore"); + hr = S_OK; + break; + case FCIDM_SHVIEW_CUT: + strcpy(lpszName, "cut"); + hr = S_OK; + break; + case FCIDM_SHVIEW_COPY: + strcpy(lpszName, "copy"); + hr = S_OK; + break; + case FCIDM_SHVIEW_CREATELINK: + strcpy(lpszName, "link"); + hr = S_OK; + break; + case FCIDM_SHVIEW_DELETE: + strcpy(lpszName, "delete"); + hr = S_OK; + break; + case FCIDM_SHVIEW_PROPERTIES: + strcpy(lpszName, "properties"); + hr = S_OK; + break; case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); hr = S_OK; @@ -517,6 +545,34 @@ static HRESULT WINAPI ItemMenu_GetCommandString( case GCS_VERBW: switch(idCommand) { + case FCIDM_SHVIEW_OPEN: + MultiByteToWideChar(CP_ACP, 0, "open", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_EXPLORE: + MultiByteToWideChar(CP_ACP, 0, "explore", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_CUT: + MultiByteToWideChar(CP_ACP, 0, "cut", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_COPY: + MultiByteToWideChar(CP_ACP, 0, "copy", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_CREATELINK: + MultiByteToWideChar(CP_ACP, 0, "link", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_DELETE: + MultiByteToWideChar(CP_ACP, 0, "delete", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; + case FCIDM_SHVIEW_PROPERTIES: + MultiByteToWideChar(CP_ACP, 0, "properties", -1, (LPWSTR)lpszName, uMaxNameLen); + hr = S_OK; + break; case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); hr = S_OK;

1 0

Daniel Jelinski : shell32/tests: Test context menu contents.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1825bddbff5db772cc82613bf854e25154bafbaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1825bddbff5db772cc82613bf… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sat Aug 10 12:42:46 2013 +0200 shell32/tests: Test context menu contents. --- dlls/shell32/tests/shlfolder.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index ef8aae9..169426e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3917,11 +3917,12 @@ static void test_GetUIObject(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { + const int baseItem = 0x40; HMENU hmenu = CreatePopupMenu(); INT max_id, max_id_check; UINT count, i; const int id_upper_limit = 32767; - hr = IContextMenu_QueryContextMenu(pcm, hmenu, 0, 0, id_upper_limit, CMF_NORMAL); + hr = IContextMenu_QueryContextMenu(pcm, hmenu, 0, baseItem, id_upper_limit, CMF_NORMAL); ok(SUCCEEDED(hr), "Got 0x%08x\n", hr); max_id = HRESULT_CODE(hr) - 1; /* returns max_id + 1 */ ok(max_id <= id_upper_limit, "Got %d\n", max_id); @@ -3933,9 +3934,12 @@ static void test_GetUIObject(void) { MENUITEMINFOA mii; INT res; + char buf[255], buf2[255]; ZeroMemory(&mii, sizeof(MENUITEMINFOA)); mii.cbSize = sizeof(MENUITEMINFOA); - mii.fMask = MIIM_ID | MIIM_FTYPE; + mii.fMask = MIIM_ID | MIIM_FTYPE | MIIM_STRING; + mii.dwTypeData = buf2; + mii.cch = sizeof(buf2); SetLastError(0); res = GetMenuItemInfoA(hmenu, i, TRUE, &mii); @@ -3944,8 +3948,17 @@ static void test_GetUIObject(void) ok( (mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); if(!(mii.fType & MFT_SEPARATOR)) + { max_id_check = (mii.wID>max_id_check)?mii.wID:max_id_check; + hr = IContextMenu_GetCommandString(pcm, mii.wID - baseItem, GCS_VERBA, 0, buf, sizeof(buf)); + ok(SUCCEEDED(hr) || hr == E_NOTIMPL, "for id 0x%x got 0x%08x (menustr: %s)\n", mii.wID - baseItem, hr, mii.dwTypeData); + if (SUCCEEDED(hr)) + trace("for id 0x%x got string %s (menu string: %s)\n", mii.wID - baseItem, buf, mii.dwTypeData); + else if (hr == E_NOTIMPL) + trace("for id 0x%x got E_NOTIMPL (menu string: %s)\n", mii.wID - baseItem, mii.dwTypeData); + } } + max_id_check -= baseItem; ok((max_id_check == max_id) || (max_id_check == max_id-1 /* Win 7 */), "Not equal (or near equal), got %d and %d\n", max_id_check, max_id);

1 0

Ken Thomases : gdi32: Link against AppKit on the Mac to avoid later crash in the Mac driver.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1f2d55637399b6d2507b661d013c0bbf8a9c0d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2d55637399b6d2507b661d0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Aug 4 22:53:44 2013 -0500 gdi32: Link against AppKit on the Mac to avoid later crash in the Mac driver. --- configure | 3 +++ configure.ac | 1 + dlls/gdi32/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 7c9c76c..0cdfd36 100755 --- a/configure +++ b/configure @@ -697,6 +697,7 @@ COREAUDIO SECURITYLIB DISKARBITRATIONLIB LDEXECFLAGS +APPKITLIB CORESERVICESLIB APPLICATIONSERVICESLIB FORCEFEEDBACKLIB @@ -6686,6 +6687,8 @@ clean:: CORESERVICESLIB="-framework CoreServices" + APPKITLIB="-framework AppKit" + case $host_os in darwin11*) LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist" diff --git a/configure.ac b/configure.ac index 0e3df61..ca3d038 100644 --- a/configure.ac +++ b/configure.ac @@ -734,6 +734,7 @@ clean:: AC_SUBST(FORCEFEEDBACKLIB,"-framework ForceFeedback -framework CoreFoundation") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") AC_SUBST(CORESERVICESLIB,"-framework CoreServices") + AC_SUBST(APPKITLIB,"-framework AppKit") case $host_os in darwin11*) AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000,-sectcreate,__TEXT,__info_plist,wine_info.plist"]) ;; diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index f4661da..c7953a9 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -3,7 +3,7 @@ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = @FREETYPE_CFLAGS@ @FONTCONFIGINCL@ -EXTRALIBS = @CARBONLIB@ +EXTRALIBS = @CARBONLIB@ @APPKITLIB@ DELAYIMPORTS = usp10 C_SRCS = \

1 0

Piotr Caban : jscript: Fix compilation issues when dtoa is defined in headers.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 2e752a115ac814fc252af592d01c816b34e96cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e752a115ac814fc252af592d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 5 13:59:34 2013 +0200 jscript: Fix compilation issues when dtoa is defined in headers. --- dlls/jscript/number.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 4dc07af..d60925c 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -54,7 +54,7 @@ static inline NumberInstance *number_this(vdisp_t *jsthis) return is_vclass(jsthis, JSCLASS_NUMBER) ? number_from_vdisp(jsthis) : NULL; } -static inline void dtoa(double d, WCHAR *buf, int size, int *dec_point) +static inline void number_to_str(double d, WCHAR *buf, int size, int *dec_point) { ULONGLONG l; int i; @@ -113,7 +113,7 @@ static inline jsstr_t *number_to_fixed(double val, int prec) if(buf_size > NUMBER_DTOA_SIZE) buf_size = NUMBER_DTOA_SIZE; - dtoa(val, buf, buf_size, &dec_point); + number_to_str(val, buf, buf_size, &dec_point); dec_point++; size = 0; if(neg) @@ -171,7 +171,7 @@ static inline jsstr_t *number_to_exponential(double val, int prec) buf_size = prec+2; if(buf_size<2 || buf_size>NUMBER_DTOA_SIZE) buf_size = NUMBER_DTOA_SIZE; - dtoa(val, buf, buf_size, &dec_point); + number_to_str(val, buf, buf_size, &dec_point); buf_size--; if(prec == -1) for(; buf_size>1 && buf[buf_size-1]=='0'; buf_size--)

1 0

Jacek Caban : inputscope.idl: Imported from mingw-w64.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: b25983ff7ea98ab14c22810006f5f222bbf7733e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25983ff7ea98ab14c2281000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 5 13:14:50 2013 +0200 inputscope.idl: Imported from mingw-w64. --- .gitignore | 1 + dlls/msctf/msctf.c | 5 ++- include/Makefile.in | 1 + include/inputscope.idl | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 2 - 5 files changed, 98 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8c51c2a..5147285 100644 --- a/.gitignore +++ b/.gitignore @@ -194,6 +194,7 @@ include/iextag.h include/imnact.h include/imnxport.h include/indexsrv.h +include/inputscope.h include/mediaobj.h include/metahost.h include/mimeinfo.h diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 2a8b0e1..78992f7 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -35,6 +35,7 @@ #include "comcat.h" #include "rpcproxy.h" #include "msctf.h" +#include "inputscope.h" #include "msctf_internal.h" @@ -602,7 +603,7 @@ HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim) /*********************************************************************** * SetInputScope(MSCTF.@) */ -HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) +HRESULT WINAPI SetInputScope(HWND hwnd, InputScope inputscope) { FIXME("STUB: %p %i\n",hwnd,inputscope); return S_OK; @@ -611,7 +612,7 @@ HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) /*********************************************************************** * SetInputScopes(MSCTF.@) */ -HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, +HRESULT WINAPI SetInputScopes(HWND hwnd, const InputScope *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS) { diff --git a/include/Makefile.in b/include/Makefile.in index 7f26dca..b1e48fa 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -49,6 +49,7 @@ PUBLIC_IDL_H_SRCS = \ imnact.idl \ imnxport.idl \ indexsrv.idl \ + inputscope.idl \ mediaobj.idl \ metahost.idl \ mimeinfo.idl \ diff --git a/include/inputscope.idl b/include/inputscope.idl new file mode 100644 index 0000000..059b6f8 --- /dev/null +++ b/include/inputscope.idl @@ -0,0 +1,93 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given. + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef enum { + IS_DEFAULT = 0, + IS_URL = 1, + IS_FILE_FULLFILEPATH = 2, + IS_FILE_FILENAME = 3, + IS_EMAIL_USERNAME = 4, + IS_EMAIL_SMTPEMAILADDRESS = 5, + IS_LOGINNAME = 6, + IS_PERSONALNAME_FULLNAME = 7, + IS_PERSONALNAME_PREFIX = 8, + IS_PERSONALNAME_GIVENNAME = 9, + IS_PERSONALNAME_MIDDLENAME = 10, + IS_PERSONALNAME_SURNAME = 11, + IS_PERSONALNAME_SUFFIX = 12, + IS_ADDRESS_FULLPOSTALADDRESS = 13, + IS_ADDRESS_POSTALCODE = 14, + IS_ADDRESS_STREET = 15, + IS_ADDRESS_STATEORPROVINCE = 16, + IS_ADDRESS_CITY = 17, + IS_ADDRESS_COUNTRYNAME = 18, + IS_ADDRESS_COUNTRYSHORTNAME = 19, + IS_CURRENCY_AMOUNTANDSYMBOL = 20, + IS_CURRENCY_AMOUNT = 21, + IS_DATE_FULLDATE = 22, + IS_DATE_MONTH = 23, + IS_DATE_DAY = 24, + IS_DATE_YEAR = 25, + IS_DATE_MONTHNAME = 26, + IS_DATE_DAYNAME = 27, + IS_DIGITS = 28, + IS_NUMBER = 29, + IS_ONECHAR = 30, + IS_PASSWORD = 31, + IS_TELEPHONE_FULLTELEPHONENUMBER = 32, + IS_TELEPHONE_COUNTRYCODE = 33, + IS_TELEPHONE_AREACODE = 34, + IS_TELEPHONE_LOCALNUMBER = 35, + IS_TIME_FULLTIME = 36, + IS_TIME_HOUR = 37, + IS_TIME_MINORSEC = 38, + IS_NUMBER_FULLWIDTH = 39, + IS_ALPHANUMERIC_HALFWIDTH = 40, + IS_ALPHANUMERIC_FULLWIDTH = 41, + IS_CURRENCY_CHINESE = 42, + IS_BOPOMOFO = 43, + IS_HIRAGANA = 44, + IS_KATAKANA_HALFWIDTH = 45, + IS_KATAKANA_FULLWIDTH = 46, + IS_HANJA = 47, + IS_HANGUL_HALFWIDTH = 48, + IS_HANGUL_FULLWIDTH = 49, + IS_SEARCH = 50, + IS_FORMULA = 51, + IS_SEARCH_INCREMENTAL = 52, + IS_CHINESE_HALFWIDTH = 53, + IS_CHINESE_FULLWIDTH = 54, + IS_NATIVE_SCRIPT = 55, + + IS_PHRASELIST = -1, + IS_REGULAREXPRESSION = -2, + IS_SRGS = -3, + IS_XML = -4, + IS_ENUMSTRING = -5 +} InputScope; + +cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope);") +cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS);") +cpp_quote("HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML);") + +cpp_quote("DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d);") + +[ + object, + uuid(fde1eaee-6924-4cdf-91e7-da38cff5559d), + pointer_default(unique) +] +interface ITfInputScope : IUnknown +{ + HRESULT GetInputScopes([out, size_is(,*pcCount)] InputScope **pprgInputScopes, [out] UINT *pcCount); + HRESULT GetPhrase([out, size_is(,*pcCount)] BSTR **ppbstrPhrases, [out] UINT *pcCount); + HRESULT GetRegularExpression([out] BSTR *pbstrRegExp); + HRESULT GetSRGS([out] BSTR *pbstrSRGS); + HRESULT GetXML([out] BSTR *pbstrXML); +} diff --git a/include/msctf.idl b/include/msctf.idl index e17132b..a3db32e 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -29,8 +29,6 @@ cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") -cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope);") -cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS);") cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);")

1 0

Qian Hong : ntdll: Fixed parameter list in spec file for RtlpNtQueryValueKey.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: f56edbf5379d969dd4997ee8627c2ceab2f8af9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56edbf5379d969dd4997ee86… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Aug 6 15:55:25 2013 +0800 ntdll: Fixed parameter list in spec file for RtlpNtQueryValueKey. --- dlls/ntdll/ntdll.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6f592b4..5caff45 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -939,7 +939,7 @@ @ stdcall RtlpNtEnumerateSubKey(ptr ptr long) @ stdcall RtlpNtMakeTemporaryKey(ptr) @ stdcall RtlpNtOpenKey(ptr long ptr) -@ stdcall RtlpNtQueryValueKey(long ptr ptr ptr) +@ stdcall RtlpNtQueryValueKey(long ptr ptr ptr ptr) @ stdcall RtlpNtSetValueKey(ptr long ptr long) @ stdcall RtlpUnWaitCriticalSection(ptr) @ stdcall RtlpWaitForCriticalSection(ptr)

1 0

André Hentschel : msvcp90/tests: Add dynamically loaded functions for ARM.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 1151546ce05439ee6570a1b2e52170ad39cec81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1151546ce05439ee6570a1b2e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 7 21:51:20 2013 +0200 msvcp90/tests: Add dynamically loaded functions for ARM. --- dlls/msvcp90/tests/ios.c | 112 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/tests/misc.c | 56 ++++++++++++++++++++++ 2 files changed, 168 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1151546ce05439ee6570a…

1 0

André Hentschel : winemaker: Improved check for libXML at runtime.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 6fb4e062984fc3fe49ebc396698d1f805b0b3906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb4e062984fc3fe49ebc3966… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Aug 8 00:10:43 2013 +0200 winemaker: Improved check for libXML at runtime. --- tools/winemaker | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index c6eb480..af26243 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -873,8 +873,12 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_DEFINES]},$prj_target_defines; push @{@$project_settings[$T_LDFLAGS]},$prj_target_ldflags; } elsif ($filename =~ /.vcproj$/i) { - # Import XML::LibXML, you need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl) - require XML::LibXML; + eval { + require XML::LibXML; + }; + if ($@) { + die "Error: You need the libxml package (deb: libxml-libxml-perl, rpm: perl-libxml-perl)"; + } my $xmlparser = XML::LibXML->new(); my $project_xml = $xmlparser->parse_file($filename);

1 0

Aric Stewart : wineps.drv: Handle empty strings when building vertical runs .
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 7bd8623810f9d5e524ca1dcc58a633974f576e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd8623810f9d5e524ca1dcc5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 9 12:36:16 2013 -0500 wineps.drv: Handle empty strings when building vertical runs. --- dlls/wineps.drv/text.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/text.c b/dlls/wineps.drv/text.c index 1a54510..a9623a1 100644 --- a/dlls/wineps.drv/text.c +++ b/dlls/wineps.drv/text.c @@ -91,15 +91,16 @@ static BOOL check_unicode_tategaki(WCHAR uchar) static Run* build_vertical_runs(PHYSDEV dev, UINT flags, LPCWSTR str, UINT count, INT *run_count) { - BOOL last_vert = check_unicode_tategaki(str[0]); + BOOL last_vert; INT start, end; INT array_size = 5; Run *run = HeapAlloc(GetProcessHeap(),0,sizeof(Run)*array_size); int index = 0; LOGFONTW lf; - if ((!(flags & ETO_GLYPH_INDEX)) && GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf ) && (lf.lfFaceName[0] == '@')) + if (count && str && (!(flags & ETO_GLYPH_INDEX)) && GetObjectW( GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf ) && (lf.lfFaceName[0] == '@')) { + last_vert = check_unicode_tategaki(str[0]); start = end = 0; while (start < count) {

1 0

Ken Thomases : winemac: Avoid using display palette API, which was deprecated with the 10.7 SDK.
by Alexandre Julliard 15 Aug '13

15 Aug '13

Module: wine Branch: master Commit: 4b24fce4e2390fbcc0e6ba8fc607595c3d05df02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b24fce4e2390fbcc0e6ba8fc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Aug 9 16:37:29 2013 -0500 winemac: Avoid using display palette API, which was deprecated with the 10.7 SDK. --- dlls/winemac.drv/gdi.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index e05f9ab..951b569 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -49,7 +49,6 @@ static int vert_res; /* height in pixels of screen */ static int desktop_horz_res; /* width in pixels of virtual desktop */ static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ -static int palette_size; /* number of color entries in palette */ static int device_data_valid; /* do the above variables have up-to-date values? */ static CRITICAL_SECTION device_data_section; @@ -141,7 +140,6 @@ static void device_init(void) CGDirectDisplayID mainDisplay = CGMainDisplayID(); CGSize size_mm = CGDisplayScreenSize(mainDisplay); CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay); - CGDirectPaletteRef palette; /* Initialize device caps */ log_pixels_x = log_pixels_y = get_dpi(); @@ -187,15 +185,6 @@ static void device_init(void) desktop_horz_res = desktop_rect.size.width; desktop_vert_res = desktop_rect.size.height; - palette = CGPaletteCreateWithDisplay(mainDisplay); - if (palette) - { - palette_size = CGPaletteGetNumberOfSamples(palette); - CGPaletteRelease(palette); - } - else - palette_size = 0; - device_data_valid = TRUE; } @@ -368,7 +357,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case RASTERCAPS: ret = (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | - (palette_size ? RC_PALETTE : 0)); + (bits_per_pixel <= 8 ? RC_PALETTE : 0)); break; case SHADEBLENDCAPS: ret = (SB_GRAD_RECT | SB_GRAD_TRI | SB_CONST_ALPHA | SB_PIXEL_ALPHA); @@ -393,7 +382,7 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) ret = 0; break; case SIZEPALETTE: - ret = palette_size; + ret = bits_per_pixel <= 8 ? 1 << bits_per_pixel : 0; break; case NUMRESERVED: case PHYSICALWIDTH:

1 0