April 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : wmc: Add support for creating resource and plain binary files.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: a8571ba0fdc2c4dd21b7dba787e19dc5c1dcca82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8571ba0fdc2c4dd21b7dba78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 18 16:55:37 2011 +0100 wmc: Add support for creating resource and plain binary files. (cherry picked from commit ecd144b40dc5b06c42e77a7f7d88c023397e89eb) --- tools/wmc/utils.c | 73 +++++++++++++++++++++++++++++++++++ tools/wmc/utils.h | 15 +++++++ tools/wmc/wmc.c | 38 ++++++++++++++++-- tools/wmc/wmc.man.in | 30 ++++++++------ tools/wmc/write.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/wmc/write.h | 1 + 6 files changed, 243 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8571ba0fdc2c4dd21b7d…

1 0

Alexandre Julliard : makefiles: Generate . res files directly from message files.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: e279c6e2577c8c259d6dda3a1cfb1a7efa5f9db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e279c6e2577c8c259d6dda3a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 18 16:56:02 2011 +0100 makefiles: Generate .res files directly from message files. (cherry picked from commit 9771ad8ca79220b0892c1e1f20cf8dd37804c13f) --- .gitignore | 16 ---------------- Make.rules.in | 12 ++++++------ tools/make_makefiles | 1 - tools/makedep.c | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 4dd2cd7..5303a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -53,22 +53,6 @@ dlls/dxdiagn/fil_data.h dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h -dlls/kernel32/nls/winerr_dan.mc.rc -dlls/kernel32/nls/winerr_deu.mc.rc -dlls/kernel32/nls/winerr_enu.mc.rc -dlls/kernel32/nls/winerr_fra.mc.rc -dlls/kernel32/nls/winerr_ita.mc.rc -dlls/kernel32/nls/winerr_jpn.mc.rc -dlls/kernel32/nls/winerr_kor.mc.rc -dlls/kernel32/nls/winerr_lth.mc.rc -dlls/kernel32/nls/winerr_nld.mc.rc -dlls/kernel32/nls/winerr_nor.mc.rc -dlls/kernel32/nls/winerr_plk.mc.rc -dlls/kernel32/nls/winerr_ptb.mc.rc -dlls/kernel32/nls/winerr_ptg.mc.rc -dlls/kernel32/nls/winerr_rus.mc.rc -dlls/kernel32/nls/winerr_sve.mc.rc -dlls/kernel32/nls/winerr_ukr.mc.rc dlls/libd3dx9.def dlls/libkernel.def dlls/libwinspool.def diff --git a/Make.rules.in b/Make.rules.in index 3f5d18e..2796800 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -117,10 +117,10 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl= $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ - $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc) + $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ - $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.res) $(EXTRA_OBJS) + $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) LINTS = $(C_SRCS:.c=.ln) @@ -136,7 +136,7 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .mc .rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -153,8 +153,8 @@ filter: dummy .l.yy.c: $(FLEX) $(LEXFLAGS) -o$@ $< -.mc.mc.rc: - $(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $< +.mc.res: + $(LDPATH) $(WMC) -U -O res -o $@ $< .rc.res: $(LDPATH) $(RC) $(RCFLAGS) -fo$@ $< @@ -253,7 +253,7 @@ install install-lib install-dev uninstall:: # Misc. rules -$(MC_SRCS:.mc=.mc.rc): $(WMC) +$(MC_SRCS:.mc=.res): $(WMC) $(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) diff --git a/tools/make_makefiles b/tools/make_makefiles index 6806edc..5583c68 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -106,7 +106,6 @@ my @ignore_srcs = ( [ 'BISON_SRCS', '\.y', '.tab.c' ], [ 'BISON_SRCS', '\.y', '.tab.h' ], [ 'LEX_SRCS', '\.l', '.yy.c' ], - [ 'MC_SRCS', '\.mc', '.mc.rc' ], [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ], [ 'IDL_H_SRCS', '\.idl', '.h' ], [ 'IDL_C_SRCS', '\.idl', '.h' ], diff --git a/tools/makedep.c b/tools/makedep.c index 4fb1ac5..1bff4fb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -857,7 +857,7 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) } else if (!strcmp( ext, "mc" )) /* message file */ { - *column += fprintf( file, "%s.mc.rc: %s", obj, pFile->filename ); + *column += fprintf( file, "%s.res: %s", obj, pFile->filename ); } else if (!strcmp( ext, "idl" )) /* IDL file */ {

1 0

Andrew Nguyen : include: Add an extern C++ block around the property key equality operators.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: efb4805e3c90c985f98c39730702ec9664f96537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb4805e3c90c985f98c39730… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jan 21 04:58:23 2011 -0600 include: Add an extern C++ block around the property key equality operators. (cherry picked from commit 2d12be7df9dd695794a71b246336b299207f8fcb) --- include/propkeydef.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index b3a2559..4aaa23a 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -58,6 +58,9 @@ #ifndef _PROPERTYKEY_EQUALITY_OPERATORS_ #define _PROPERTYKEY_EQUALITY_OPERATORS_ #ifdef __cplusplus +extern "C++" +{ + inline bool operator==(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return IsEqualPropertyKey(guidOne, guidTwo); @@ -66,5 +69,7 @@ inline bool operator!=(REFPROPERTYKEY guidOne, REFPROPERTYKEY guidOther) { return !(guidOne == guidOther); } + +} #endif #endif

1 0

Alexandre Julliard : configure: Print a notice if zlib isn't found.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 851bc356a9baf2426ae042698d53ff76ae047ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851bc356a9baf2426ae042698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 18 13:07:27 2011 +0100 configure: Print a notice if zlib isn't found. (cherry picked from commit ba6a41a4f7256fcf34932cbea385ab24549d5ce4) --- configure | 16 ++++++++++++++++ configure.ac | 3 +++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 638d7ba..35c1226 100755 --- a/configure +++ b/configure @@ -805,6 +805,7 @@ with_xshape with_xshm with_xslt with_xxf86vm +with_zlib with_wine_tools with_wine64 enable_largefile @@ -1493,6 +1494,7 @@ Optional Packages: --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension + --without-zlib do not use Zlib (data compression) --with-wine-tools=DIR use Wine tools from directory DIR --with-wine64=DIR use the 64-bit Wine in DIR for a Wow64 build --with-x use the X Window System @@ -2740,6 +2742,12 @@ if test "${with_xxf86vm+set}" = set; then : fi +# Check whether --with-zlib was given. +if test "${with_zlib+set}" = set; then : + withval=$with_zlib; if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi +fi + + # Check whether --with-wine-tools was given. if test "${with_wine_tools+set}" = set; then : @@ -10330,6 +10338,14 @@ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h fi fi +if test "x$ZLIB" = "x"; then : + case "x$with_zlib" in + x) as_fn_append wine_notices "|libz ${notice_platform}development files not found, data compression won't be supported." ;; + xno) ;; + *) as_fn_error $? "libz ${notice_platform}development files not found, data compression won't be supported. +This is an error since --with-zlib was requested." "$LINENO" 5 ;; +esac +fi if test "x$with_esd" != xno then diff --git a/configure.ac b/configure.ac index 3372e87..cab92ef 100644 --- a/configure.ac +++ b/configure.ac @@ -100,6 +100,8 @@ AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) +AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]), + [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi]) AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build])) @@ -1362,6 +1364,7 @@ then AC_CHECK_LIB(z,inflate,[AC_DEFINE(HAVE_ZLIB,1,[Define to 1 if you have the `z' library (-lz).]) AC_SUBST(ZLIB,"-lz")]) fi +WINE_NOTICE_WITH(zlib,[test "x$ZLIB" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) dnl **** Check for EsounD **** if test "x$with_esd" != xno

1 0

Huw Davies : wineps.drv: Explicitly report that we do not support blending.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: d81734c4609976196b76413eaf60c7d72001707e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d81734c4609976196b76413ea… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 11:40:28 2011 +0000 wineps.drv: Explicitly report that we do not support blending. (cherry picked from commit 40ba10ed7ae8f17e8bb0ea89ae86437f7d0f3a00) --- dlls/wineps.drv/init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 685a56a..d83c304 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -510,6 +510,8 @@ INT CDECL PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) case VREFRESH: case BLTALIGNMENT: return 0; + case SHADEBLENDCAPS: + return SB_NONE; default: FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap ); return 0;

1 0

Piotr Caban : shell32: Improved equal ITEMIDLISTs handling in ILIsParent.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 7f3953d4b8b567d36d8dfaf222171ba17f2b0829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3953d4b8b567d36d8dfaf22… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 6 00:01:28 2011 +0100 shell32: Improved equal ITEMIDLISTs handling in ILIsParent. (cherry picked from commit 92ba2168fa2b46a077f3d7746ce70ad6e815a7b2) --- dlls/shell32/pidl.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index dffa2bd..f1f89a2 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -544,6 +544,8 @@ BOOL WINAPI ILIsEqual(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) * parent = a/b, child = a/b/c -> true, c is in folder a/b * child = a/b/c/d -> false if bImmediate is true, d is not in folder a/b * child = a/b/c/d -> true if bImmediate is false, d is in a subfolder of a/b + * child = a/b -> false if bImmediate is true + * child = a/b -> true if bImmediate is false */ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL bImmediate) { @@ -569,12 +571,12 @@ BOOL WINAPI ILIsParent(LPCITEMIDLIST pidlParent, LPCITEMIDLIST pidlChild, BOOL b pChild = ILGetNext(pChild); } - /* child shorter or has equal length to parent */ - if (pParent->mkid.cb || !pChild->mkid.cb) + /* child has shorter name than parent */ + if (pParent->mkid.cb) return FALSE; /* not immediate descent */ - if ( ILGetNext(pChild)->mkid.cb && bImmediate) + if ((!pChild->mkid.cb || ILGetNext(pChild)->mkid.cb) && bImmediate) return FALSE; return TRUE;

1 0

Andrew Nguyen : mmsystem.dll16: Correctly map the MCI_SYSINFO_PARMS structure when MCI_SYSINFO_QUANTITY is set .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: ebd82af1ff0c2bfc78824ab0fbae8779d41077f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd82af1ff0c2bfc78824ab0f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jan 4 02:15:06 2011 -0600 mmsystem.dll16: Correctly map the MCI_SYSINFO_PARMS structure when MCI_SYSINFO_QUANTITY is set. (cherry picked from commit b84f2f229b08acab6622e691a5f1dbcaefa8232f) --- dlls/mmsystem.dll16/mci16.c | 59 +++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index 914636d..531c523 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -268,23 +268,30 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l } return MMSYSTEM_MAP_OKMEM; case MCI_SYSINFO: - { - LPMCI_SYSINFO_PARMSW msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(LPMCI_OPEN_PARMS16) + sizeof(MCI_SYSINFO_PARMSW)); - LPMCI_SYSINFO_PARMS16 msip16 = MapSL(*lParam); - - if (msip32w) { - *(LPMCI_SYSINFO_PARMS16*)(msip32w) = msip16; - msip32w = (LPMCI_SYSINFO_PARMSW)((char*)msip32w + sizeof(LPMCI_OPEN_PARMS16)); - msip32w->dwCallback = msip16->dwCallback; - msip32w->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, msip16->dwRetSize * sizeof(WCHAR)); - msip32w->dwRetSize = msip16->dwRetSize; - msip32w->dwNumber = msip16->dwNumber; - msip32w->wDeviceType = msip16->wDeviceType; - } else { - return MMSYSTEM_MAP_NOMEM; - } - *lParam = (DWORD)msip32w; - } + { + MCI_SYSINFO_PARMSW *msip32w = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_OPEN_PARMS16 *) + sizeof(MCI_SYSINFO_PARMSW)); + MCI_SYSINFO_PARMS16 *msip16 = MapSL(*lParam); + + if (!msip32w) + return MMSYSTEM_MAP_NOMEM; + + *(MCI_SYSINFO_PARMS16 **)msip32w = msip16; + msip32w = (MCI_SYSINFO_PARMSW *)((char *)msip32w + sizeof(MCI_OPEN_PARMS16 *)); + msip32w->dwCallback = msip16->dwCallback; + msip32w->lpstrReturn = HeapAlloc(GetProcessHeap(), 0, (dwFlags & MCI_SYSINFO_QUANTITY) ? + sizeof(DWORD) : + msip16->dwRetSize * sizeof(WCHAR)); + if (!msip32w->lpstrReturn) + { + HeapFree(GetProcessHeap(), 0, msip32w); + return MMSYSTEM_MAP_NOMEM; + } + msip32w->dwRetSize = (dwFlags & MCI_SYSINFO_QUANTITY) ? sizeof(DWORD) : msip16->dwRetSize; + msip32w->dwNumber = msip16->dwNumber; + msip32w->wDeviceType = msip16->wDeviceType; + + *lParam = (DWORD)msip32w; + } return MMSYSTEM_MAP_OKMEM; case MCI_SOUND: { @@ -390,13 +397,21 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR return MMSYSTEM_MAP_OK; case MCI_SYSINFO: if (lParam) { - LPMCI_SYSINFO_PARMSW msip32w = (LPMCI_SYSINFO_PARMSW)lParam; - LPMCI_SYSINFO_PARMS16 msip16 = *(LPMCI_SYSINFO_PARMS16*)((char*)msip32w - sizeof(LPMCI_SYSINFO_PARMS16)); + MCI_SYSINFO_PARMSW *msip32w = (MCI_SYSINFO_PARMSW *)lParam; + MCI_SYSINFO_PARMS16 *msip16 = *(MCI_SYSINFO_PARMS16 **)((char *)msip32w - sizeof(MCI_SYSINFO_PARMS16 *)); + + if (dwFlags & MCI_SYSINFO_QUANTITY) { + DWORD *quantity = MapSL(msip16->lpstrReturn); + + *quantity = *(DWORD *)msip32w->lpstrReturn; + } + else { + WideCharToMultiByte(CP_ACP, 0, + msip32w->lpstrReturn, msip32w->dwRetSize, + MapSL(msip16->lpstrReturn), msip16->dwRetSize, + NULL, NULL); + } - WideCharToMultiByte(CP_ACP, 0, - msip32w->lpstrReturn, msip32w->dwRetSize, - MapSL(msip16->lpstrReturn), msip16->dwRetSize, - NULL, NULL); HeapFree(GetProcessHeap(), 0, msip32w->lpstrReturn); HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); }

1 0

Andrew Nguyen : reg: Accept full names of the standard registry hives.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 63e9c60e50f8bcf9732b63116f0e89d5cf48c0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e9c60e50f8bcf9732b63116… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jan 4 04:47:13 2011 -0600 reg: Accept full names of the standard registry hives. (cherry picked from commit 060c8f0c6e6285630b68ada0712ca733c68a6901) --- programs/reg/reg.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f65a3c8..0f8aa15 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -66,20 +66,30 @@ static int reg_message(int msg) static HKEY get_rootkey(LPWSTR key) { static const WCHAR szHKLM[] = {'H','K','L','M',0}; + static const WCHAR szHKEY_LOCAL_MACHINE[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; static const WCHAR szHKCU[] = {'H','K','C','U',0}; + static const WCHAR szHKEY_CURRENT_USER[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; static const WCHAR szHKCR[] = {'H','K','C','R',0}; + static const WCHAR szHKEY_CLASSES_ROOT[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; static const WCHAR szHKU[] = {'H','K','U',0}; + static const WCHAR szHKEY_USERS[] = {'H','K','E','Y','_','U','S','E','R','S',0}; static const WCHAR szHKCC[] = {'H','K','C','C',0}; + static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2) + if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==2) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==2) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==2) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==2) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==2) return HKEY_CURRENT_CONFIG; else return NULL; }

1 0

André Hentschel : ntdll: Respect multiple CPUs when faking values.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 097008c1be81e3cd0f58b0e76045553adf82676b URL: http://source.winehq.org/git/wine.git/?a=commit;h=097008c1be81e3cd0f58b0e76… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 3 20:27:00 2011 +0100 ntdll: Respect multiple CPUs when faking values. (cherry picked from commit 40294182c1554a97dcfa8414b609b6f8de8f5239) --- dlls/ntdll/nt.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 99fe77b..3cbcbe7 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1588,17 +1588,18 @@ NTSTATUS WINAPI NtQuerySystemInformation( if (cpus == 0) { static int i = 1; - - sppi = RtlAllocateHeap(GetProcessHeap(),0,sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); - - memset(sppi, 0 , sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)); + int n; + cpus = min(NtCurrentTeb()->Peb->NumberOfProcessors, out_cpus); + len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * cpus; + sppi = RtlAllocateHeap(GetProcessHeap(), 0, len); FIXME("stub info_class SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION\n"); - /* many programs expect these values to change so fake change */ - len = sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); - sppi->KernelTime.QuadPart = 1 * i; - sppi->UserTime.QuadPart = 2 * i; - sppi->IdleTime.QuadPart = 3 * i; + for (n = 0; n < cpus; n++) + { + sppi[n].KernelTime.QuadPart = 1 * i; + sppi[n].UserTime.QuadPart = 2 * i; + sppi[n].IdleTime.QuadPart = 3 * i; + } i++; }

1 0

André Hentschel : msvcrt: Forward _setjmp on x86_64.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 8fbbbb63867470bfec89bdce143fb2212dc8fd6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbbbb63867470bfec89bdce1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 31 16:04:05 2010 +0100 msvcrt: Forward _setjmp on x86_64. (cherry picked from commit 28bdb8c58a3c07f7cc4867a74ff8b1a069cef514) --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 8bfde5f..b9cce26 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -263,7 +263,7 @@ @ cdecl _scalb( double long) msvcrt._scalb @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl _setmode(long long) msvcrt._setmode @ cdecl _setsystime(ptr long) msvcrt._setsystime @ cdecl _sleep(long) msvcrt._sleep diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 97783fb..7ad465a 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -483,7 +483,7 @@ @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ stub _set_security_error_handler @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index dfa04f8..3482b02 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -479,7 +479,7 @@ @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ stub _set_security_error_handler @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3d6b104..651d3a3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -880,7 +880,7 @@ @ stub _set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3b04f96..e4977ee 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -866,7 +866,7 @@ @ stub _set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 -norelay _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 92eb395..be6c55b 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -766,7 +766,7 @@ @ cdecl _searchenv(str str ptr) msvcrt._searchenv @ stdcall -i386 __seh_longjmp_unwind(a)4(ptr) msvcrt._seh_longjmp_unwind @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmbcp(long) msvcrt._setmbcp @ cdecl _setmode(long long) msvcrt._setmode diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 6f2b6c2..dcee6c0 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -831,7 +831,7 @@ @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index ec5b8fe..7665293 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -458,7 +458,7 @@ @ cdecl _set_error_mode(long) msvcrt._set_error_mode @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold @ cdecl _seterrormode(long) msvcrt._seterrormode -@ cdecl -i386 _setjmp(ptr) msvcrt._setjmp +@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp @ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio @ cdecl _setmbcp(long) msvcrt._setmbcp

1 0