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

André Hentschel : hhcrtl.ocx: Resize search tab too.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 35103290ca96ce091b9982c43fc76e0fc2678f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35103290ca96ce091b9982c43… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 16 17:31:15 2011 +0200 hhcrtl.ocx: Resize search tab too. --- dlls/hhctrl.ocx/help.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 61d90f6..e151ab2 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -441,6 +441,7 @@ static LRESULT Child_OnSize(HWND hwnd) ResizeTabChild(info, TAB_CONTENTS); ResizeTabChild(info, TAB_INDEX); + ResizeTabChild(info, TAB_SEARCH); return 0; }

1 0

Anders Jonsson : po: Update Swedish translation.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 766eb46a0f15a96ee9c0525c863edbffa4f0ae47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766eb46a0f15a96ee9c0525c8… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Mon Apr 18 22:19:35 2011 +0200 po: Update Swedish translation. --- po/sv.po | 414 +++++++++++++++++++++++--------------------------------------- 1 files changed, 154 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=766eb46a0f15a96ee9c05…

1 0

Hans Leidekker : mspatcha: Add a version resource.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: d1d9fe065597bbce5d0eaa3e259da22e33d51627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1d9fe065597bbce5d0eaa3e2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 19 11:29:31 2011 +0200 mspatcha: Add a version resource. --- dlls/mspatcha/Makefile.in | 2 ++ dlls/mspatcha/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index 23663eb..53c9098 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -3,4 +3,6 @@ MODULE = mspatcha.dll C_SRCS = \ mspatcha_main.c +RC_SRCS = version.rc + @MAKE_DLL_RULES@ diff --git a/dlls/mspatcha/version.rc b/dlls/mspatcha/version.rc new file mode 100644 index 0000000..e2afe68 --- /dev/null +++ b/dlls/mspatcha/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine File Patch API" +#define WINE_FILENAME_STR "mspatcha.dll" +#define WINE_FILEVERSION 6,1,7600,16385 +#define WINE_FILEVERSION_STR "6.1.7600.16385" +#define WINE_PRODUCTVERSION 6,1,7600,16385 +#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" + +#include "wine/wine_common_ver.rc"

1 0

Jacek Caban : psapi: Forward EmptyWorkingSet implementation to kernel32.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 25023c130219c53fa84991e6ca22bbc4645c807d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25023c130219c53fa84991e6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 19 14:21:08 2011 +0200 psapi: Forward EmptyWorkingSet implementation to kernel32. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 8 ++++++++ dlls/psapi/psapi.spec | 2 +- dlls/psapi/psapi_main.c | 8 -------- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b3b8fd5..21e8210 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -767,6 +767,7 @@ @ stdcall IsValidLocale(long long) # @ stub IsValidUILanguage @ stdcall IsWow64Process(ptr ptr) +@ stdcall K32EmptyWorkingSet(long) @ stdcall K32GetProcessImageFileNameA(long ptr long) @ stdcall K32GetProcessImageFileNameW(long ptr long) @ stdcall -i386 -private -register K32Thk1632Epilog() krnl386.exe16.K32Thk1632Epilog diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c263092..d1d6a3b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3232,6 +3232,14 @@ BOOL WINAPI SetProcessWorkingSetSize(HANDLE hProcess, SIZE_T minset, } /*********************************************************************** + * K32EmptyWorkingSet (KERNEL32.@) + */ +BOOL WINAPI K32EmptyWorkingSet(HANDLE hProcess) +{ + return SetProcessWorkingSetSize(hProcess, (SIZE_T)-1, (SIZE_T)-1); +} + +/*********************************************************************** * GetProcessWorkingSetSize (KERNEL32.@) */ BOOL WINAPI GetProcessWorkingSetSize(HANDLE hProcess, PSIZE_T minset, diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index aefe3e4..25e39cc 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -1,4 +1,4 @@ -@ stdcall EmptyWorkingSet(long) +@ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet @ stdcall EnumDeviceDrivers(ptr long ptr) @ stdcall EnumPageFilesA(ptr ptr) @ stdcall EnumPageFilesW(ptr ptr) diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c index 327005c..07863ea 100644 --- a/dlls/psapi/psapi_main.c +++ b/dlls/psapi/psapi_main.c @@ -148,14 +148,6 @@ static BOOL PSAPI_GetLdrModule(HANDLE hProcess, HMODULE hModule, } /*********************************************************************** - * EmptyWorkingSet (PSAPI.@) - */ -BOOL WINAPI EmptyWorkingSet(HANDLE hProcess) -{ - return SetProcessWorkingSetSize(hProcess, 0xFFFFFFFF, 0xFFFFFFFF); -} - -/*********************************************************************** * EnumDeviceDrivers (PSAPI.@) */ BOOL WINAPI EnumDeviceDrivers(LPVOID *lpImageBase, DWORD cb, LPDWORD lpcbNeeded)

1 0

Hans Leidekker : msi: Sync with the action request instead of the action taken in msi_seltree_sync_item_state .
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 9ad5d05a6a1deed56a7d7120bbe2a00c561dd5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad5d05a6a1deed56a7d7120b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 19 11:29:13 2011 +0200 msi: Sync with the action request instead of the action taken in msi_seltree_sync_item_state. --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 40aa7dff..705dde3 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2071,7 +2071,7 @@ static void msi_seltree_sync_item_state( HWND hwnd, MSIFEATURE *feature, HTREEITEM hItem ) { TVITEMW tvi; - DWORD index = feature->Action; + DWORD index = feature->ActionRequest; TRACE("Feature %s -> %d %d %d\n", debugstr_w(feature->Title), feature->Installed, feature->Action, feature->ActionRequest);

1 0

Dylan Smith : include: Add include file for d3dx9 X file interfaces.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 9981a303b659e68304280af9fa779dc758ff5843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9981a303b659e68304280af9f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Apr 19 03:27:52 2011 -0400 include: Add include file for d3dx9 X file interfaces. --- include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9xof.h | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 182 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index e677f38..cf4262c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -181,6 +181,7 @@ SRCDIR_INCLUDES = \ d3dx9shader.h \ d3dx9shape.h \ d3dx9tex.h \ + d3dx9xof.h \ dbccmd.idl \ dbcses.idl \ dbdsad.idl \ diff --git a/include/d3dx9.h b/include/d3dx9.h index 09ae553..6bd80d8 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -30,6 +30,7 @@ #include "d3d9.h" #include "d3dx9math.h" #include "d3dx9core.h" +#include "d3dx9xof.h" #include "d3dx9mesh.h" #include "d3dx9shader.h" #include "d3dx9effect.h" diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h new file mode 100644 index 0000000..123f0ac --- /dev/null +++ b/include/d3dx9xof.h @@ -0,0 +1,180 @@ +/* + * Copyright 2011 Dylan Smith + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3DX9XOF_H +#define __WINE_D3DX9XOF_H + +#include "d3dx9.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef DWORD D3DXF_FILEFORMAT; +#define D3DXF_FILEFORMAT_BINARY 0 +#define D3DXF_FILEFORMAT_TEXT 1 +#define D3DXF_FILEFORMAT_COMPRESSED 2 + +typedef DWORD D3DXF_FILESAVEOPTIONS; +#define D3DXF_FILESAVE_TOFILE 0x00 +#define D3DXF_FILESAVE_TOWFILE 0x01 + +typedef DWORD D3DXF_FILELOADOPTIONS; +#define D3DXF_FILELOAD_FROMFILE 0x00 +#define D3DXF_FILELOAD_FROMWFILE 0x01 +#define D3DXF_FILELOAD_FROMRESOURCE 0x02 +#define D3DXF_FILELOAD_FROMMEMORY 0x03 + +typedef struct _D3DXF_FILELOADRESOURCE { + HMODULE hModule; + LPCSTR lpName; + LPCSTR lpType; +} D3DXF_FILELOADRESOURCE; + +typedef struct _D3DXF_FILELOADMEMORY { + LPVOID lpMemory; + SIZE_T dSize; +} D3DXF_FILELOADMEMORY; + + +#ifndef _NO_COM +DEFINE_GUID(IID_ID3DXFile, 0xcef08cf9, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01); +DEFINE_GUID(IID_ID3DXFileSaveObject, 0xcef08cfa, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01); +DEFINE_GUID(IID_ID3DXFileSaveData, 0xcef08cfb, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01); +DEFINE_GUID(IID_ID3DXFileEnumObject, 0xcef08cfc, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01); +DEFINE_GUID(IID_ID3DXFileData, 0xcef08cfd, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01); +#endif /* _NO_COM */ + +typedef interface ID3DXFile *LPD3DXFILE, *LPLPD3DXFILE; +typedef interface ID3DXFileSaveObject *LPD3DXFILESAVEOBJECT, **LPLPD3DXFILESAVEOBJECT; +typedef interface ID3DXFileSaveData *LPD3DXFILESAVEDATA, **LPLPD3DXFILESAVEDATA; +typedef interface ID3DXFileEnumObject *LPD3DXFILEENUMOBJECT, **LPLPD3DXFILEENUMOBJECT; +typedef interface ID3DXFileData *LPD3DXFILEDATA, **LPLPD3DXFILEDATA; + +STDAPI D3DXFileCreate(LPD3DXFILE*); + +#define INTERFACE ID3DXFile +DECLARE_INTERFACE_IID_(ID3DXFile,IUnknown,"cef08cf9-7b4f-4429-9624-2a690a933201") +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** ID3DXFile methods ***/ + STDMETHOD(CreateEnumObject)(THIS_ LPCVOID, D3DXF_FILELOADOPTIONS, LPD3DXFILEENUMOBJECT*) PURE; + STDMETHOD(CreateSaveObject)(THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS, D3DXF_FILEFORMAT, LPD3DXFILESAVEOBJECT*) PURE; + STDMETHOD(RegisterTemplates)(THIS_ LPCVOID, SIZE_T) PURE; + STDMETHOD(RegisterEnumTemplates)(THIS_ LPD3DXFILEENUMOBJECT) PURE; +}; +#undef INTERFACE + +#define INTERFACE ID3DXFileSaveObject +DECLARE_INTERFACE_IID_(ID3DXFileSaveObject,IUnknown,"cef08cfa-7b4f-4429-9624-2a690a933201") +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** ID3DXFileSaveObject methods ***/ + STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(AddDataObject)(THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, LPD3DXFILESAVEDATA*) PURE; + STDMETHOD(Save)(THIS) PURE; +}; +#undef INTERFACE + +#define INTERFACE ID3DXFileSaveData +DECLARE_INTERFACE_IID_(ID3DXFileSaveData,IUnknown,"cef08cfb-7b4f-4429-9624-2a690a933201") +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** ID3DXFileSaveObject methods ***/ + STDMETHOD(GetSave)(THIS_ LPD3DXFILESAVEOBJECT*) PURE; + STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetId)(THIS_ LPGUID) PURE; + STDMETHOD(GetType)(THIS_ GUID*) PURE; + STDMETHOD(AddDataObject)(THIS_ REFGUID, LPCSTR, CONST GUID*, SIZE_T, LPCVOID, LPD3DXFILESAVEDATA*) PURE; + STDMETHOD(AddDataReference)(THIS_ LPCSTR, CONST GUID*) PURE; +}; +#undef INTERFACE + + +#define INTERFACE ID3DXFileEnumObject +DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a690a933201") +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** ID3DXFileEnumObject methods ***/ + STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; + STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetDataObjectById)(THIS_ REFGUID, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetDataObjectByName)(THIS_ LPCSTR, LPD3DXFILEDATA*) PURE; +}; +#undef INTERFACE + +#define INTERFACE ID3DXFileData +DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933201") +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID, LPVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** ID3DXFileData methods ***/ + STDMETHOD(GetEnum)(THIS_ LPD3DXFILEENUMOBJECT*) PURE; + STDMETHOD(GetName)(THIS_ LPSTR, SIZE_T*) PURE; + STDMETHOD(GetId)(THIS_ LPGUID) PURE; + STDMETHOD(Lock)(THIS_ SIZE_T*, LPCVOID*) PURE; + STDMETHOD(Unlock)(THIS) PURE; + STDMETHOD(GetType)(THIS_ GUID*) PURE; + STDMETHOD_(BOOL,IsReference)(THIS) PURE; + STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; +}; +#undef INTERFACE + +/* D3DX File errors */ +#define _FACD3DXF 0x876 + +#define D3DXFERR_BADOBJECT MAKE_HRESULT(1,_FACD3DXF,900) +#define D3DXFERR_BADVALUE MAKE_HRESULT(1,_FACD3DXF,901) +#define D3DXFERR_BADTYPE MAKE_HRESULT(1,_FACD3DXF,902) +#define D3DXFERR_NOTFOUND MAKE_HRESULT(1,_FACD3DXF,903) +#define D3DXFERR_NOTDONEYET MAKE_HRESULT(1,_FACD3DXF,904) +#define D3DXFERR_FILENOTFOUND MAKE_HRESULT(1,_FACD3DXF,905) +#define D3DXFERR_RESOURCENOTFOUND MAKE_HRESULT(1,_FACD3DXF,906) +#define D3DXFERR_BADRESOURCE MAKE_HRESULT(1,_FACD3DXF,907) +#define D3DXFERR_BADFILETYPE MAKE_HRESULT(1,_FACD3DXF,908) +#define D3DXFERR_BADFILEVERSION MAKE_HRESULT(1,_FACD3DXF,909) +#define D3DXFERR_BADFILEFLOATSIZE MAKE_HRESULT(1,_FACD3DXF,910) +#define D3DXFERR_BADFILE MAKE_HRESULT(1,_FACD3DXF,911) +#define D3DXFERR_PARSEERROR MAKE_HRESULT(1,_FACD3DXF,912) +#define D3DXFERR_BADARRAYSIZE MAKE_HRESULT(1,_FACD3DXF,913) +#define D3DXFERR_BADDATAREFERENCE MAKE_HRESULT(1,_FACD3DXF,914) +#define D3DXFERR_NOMOREOBJECTS MAKE_HRESULT(1,_FACD3DXF,915) +#define D3DXFERR_NOMOREDATA MAKE_HRESULT(1,_FACD3DXF,916) +#define D3DXFERR_BADCACHEFILE MAKE_HRESULT(1,_FACD3DXF,917) + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_D3DX9XOF_H */

1 0

Dylan Smith : include: Add missing declarations to d3dx9mesh.h.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 2b6e1b9465020eda656df0b90d10c9e714c58adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6e1b9465020eda656df0b90… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Apr 19 03:28:03 2011 -0400 include: Add missing declarations to d3dx9mesh.h. --- include/d3dx9mesh.h | 620 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 620 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b6e1b9465020eda656df…

1 0

André Hentschel : winecfg: Also distinguish versions by product type.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 5ad5a190274a1926f6746ccad92bfe02005036c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad5a190274a1926f6746ccad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 16 13:50:53 2011 +0200 winecfg: Also distinguish versions by product type. --- programs/winecfg/appdefaults.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 452071e..8f431c2 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -70,11 +70,12 @@ static const struct static const char szKey9x[] = "Software\\Microsoft\\Windows\\CurrentVersion"; static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; +static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; static int get_registry_version(void) { int i, best = -1, platform, major, minor = 0, build = 0; - char *p, *ver; + char *p, *ver, *type; if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL ))) { @@ -82,8 +83,10 @@ static int get_registry_version(void) platform = VER_PLATFORM_WIN32_NT; - build_str = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL ); + build_str = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL ); build = atoi(build_str); + + type = get_reg_key( HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL ); } else if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL ))) platform = VER_PLATFORM_WIN32_WINDOWS; @@ -108,6 +111,7 @@ static int get_registry_version(void) { if (win_versions[i].dwPlatformId != platform) continue; if (win_versions[i].dwMajorVersion != major) continue; + if (type && strcasecmp(win_versions[i].szProductType, type)) continue; best = i; if ((win_versions[i].dwMinorVersion == minor) && (win_versions[i].dwBuildNumber == build)) @@ -409,7 +413,6 @@ static void on_winver_change(HWND dialog) } else /* global version only */ { - static const char szKeyProdNT[] = "System\\CurrentControlSet\\Control\\ProductOptions"; static const char szKeyWindNT[] = "System\\CurrentControlSet\\Control\\Windows"; static const char szKeyEnvNT[] = "System\\CurrentControlSet\\Control\\Session Manager\\Environment"; char Buffer[40];

1 0

Alexandre Julliard : winex11: Allow installing the event handler multiple times.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 55bfd2ef0d5212db173c0b73cf01cbd48cabe431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55bfd2ef0d5212db173c0b73c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 17:17:48 2011 +0200 winex11: Allow installing the event handler multiple times. --- dlls/winex11.drv/event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 97c6f29..75e7d8d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -186,7 +186,7 @@ static inline void free_event_data( XEvent *event ) void X11DRV_register_event_handler( int type, x11drv_event_handler handler, const char *name ) { assert( type <= MAX_EVENT_HANDLERS ); - assert( !handlers[type] ); + assert( !handlers[type] || handlers[type] == handler ); handlers[type] = handler; event_names[type] = name; TRACE("registered handler %p for event %d %s\n", handler, type, debugstr_a(name) );

1 0

Alexandre Julliard : server: Reuse existing file descriptor objects for duplicate file mappings.
by Alexandre Julliard April 19, 2011

April 19, 2011

Module: wine Branch: master Commit: 200f8d958f43c9985240c0e14b27a9ea10efdfb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200f8d958f43c9985240c0e14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 19 17:19:31 2011 +0200 server: Reuse existing file descriptor objects for duplicate file mappings. --- server/fd.c | 14 ++++++++++++++ server/file.h | 1 + server/mapping.c | 11 +++++++---- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/server/fd.c b/server/fd.c index 1743952..fd0e2fc 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1670,6 +1670,20 @@ failed: return NULL; } +/* find an existing fd object that can be reused for a mapping */ +struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, unsigned int sharing ) +{ + struct fd *fd_ptr; + + if (!fd->inode) return NULL; + + LIST_FOR_EACH_ENTRY( fd_ptr, &fd->inode->open, struct fd, inode_entry ) + if (fd_ptr->access == access && fd_ptr->sharing == sharing) + return (struct fd *)grab_object( fd_ptr ); + + return NULL; +} + /* set the status to return when the fd has no associated unix fd */ void set_no_fd_status( struct fd *fd, unsigned int status ) { diff --git a/server/file.h b/server/file.h index 218b553..ead356d 100644 --- a/server/file.h +++ b/server/file.h @@ -61,6 +61,7 @@ extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, struct object *user, unsigned int options ); extern struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, unsigned int options ); +extern struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, unsigned int sharing ); extern void *get_fd_user( struct fd *fd ); extern void set_fd_user( struct fd *fd, const struct fd_ops *ops, struct object *user ); extern unsigned int get_fd_options( struct fd *fd ); diff --git a/server/mapping.c b/server/mapping.c index 733dc89..f37016f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -496,6 +496,7 @@ static struct object *create_mapping( struct directory *root, const struct unico if (handle) { + const unsigned int sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; unsigned int mapping_access = FILE_MAPPING_ACCESS; if (!(protect & VPROT_COMMITTED)) @@ -509,14 +510,16 @@ static struct object *create_mapping( struct directory *root, const struct unico /* file sharing rules for mappings are different so we use magic the access rights */ if (protect & VPROT_IMAGE) mapping_access |= FILE_MAPPING_IMAGE; else if (protect & VPROT_WRITE) mapping_access |= FILE_MAPPING_WRITE; - mapping->fd = dup_fd_object( fd, mapping_access, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT ); + + if (!(mapping->fd = get_fd_object_for_mapping( fd, mapping_access, sharing ))) + { + mapping->fd = dup_fd_object( fd, mapping_access, sharing, FILE_SYNCHRONOUS_IO_NONALERT ); + if (mapping->fd) set_fd_user( mapping->fd, &mapping_fd_ops, NULL ); + } release_object( file ); release_object( fd ); if (!mapping->fd) goto error; - set_fd_user( mapping->fd, &mapping_fd_ops, &mapping->obj ); if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; if (protect & VPROT_IMAGE) {

1 0