November 2010 - Wine-Commits

Christian Inci : wined3d: Add nVidia GT 320M to the table.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: 4229b1f3b634e521f8f016a973ee638b534a7d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4229b1f3b634e521f8f016a97… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Wed Nov 24 00:43:45 2010 +0100 wined3d: Add nVidia GT 320M to the table. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cfdf3f5..8a832bf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1080,6 +1080,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE6, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1427,6 +1428,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GT 330M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ {"GT 325M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ + {"GT 320M", CARD_NVIDIA_GEFORCE_GT320M}, /* Geforce 300 - midend mobile */ {"GTX 295", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 285", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 63eec76..4bd7d2e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1395,6 +1395,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX260 = 0x05e2, CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, + CARD_NVIDIA_GEFORCE_GT320M = 0x0a2d, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0,

1 0

Volodymyr M. Shcherbyna : dbgeng: Add initial stub dll implementation.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: acee9cde176f0be10bbf619f975a6a61037281e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acee9cde176f0be10bbf619f9… Author: Volodymyr M. Shcherbyna <volodymyr(a)shcherbyna.com> Date: Sun Nov 21 21:40:04 2010 +0100 dbgeng: Add initial stub dll implementation. --- configure | 1 + configure.ac | 1 + dlls/dbgeng/Makefile.in | 6 +++ dlls/dbgeng/dbgeng.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/dbgeng/dbgeng.spec | 3 + 5 files changed, 115 insertions(+), 0 deletions(-) diff --git a/configure b/configure index b9ff5e1..52d384f 100755 --- a/configure +++ b/configure @@ -14823,6 +14823,7 @@ wine_fn_config_dll d3dx9_42 enable_d3dx9_42 wine_fn_config_dll d3dx9_43 enable_d3dx9_43 wine_fn_config_dll d3dxof enable_d3dxof d3dxof wine_fn_config_test dlls/d3dxof/tests d3dxof_test +wine_fn_config_dll dbgeng enable_dbgeng dbgeng wine_fn_config_dll dbghelp enable_dbghelp dbghelp wine_fn_config_dll dciman32 enable_dciman32 dciman32 wine_fn_config_dll ddeml.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 6ad4532..c72e51b 100644 --- a/configure.ac +++ b/configure.ac @@ -2400,6 +2400,7 @@ WINE_CONFIG_DLL(d3dx9_42) WINE_CONFIG_DLL(d3dx9_43) WINE_CONFIG_DLL(d3dxof,,[d3dxof]) WINE_CONFIG_TEST(dlls/d3dxof/tests) +WINE_CONFIG_DLL(dbgeng,,[dbgeng]) WINE_CONFIG_DLL(dbghelp,,[dbghelp]) WINE_CONFIG_DLL(dciman32,,[dciman32]) WINE_CONFIG_DLL(ddeml.dll16,enable_win16) diff --git a/dlls/dbgeng/Makefile.in b/dlls/dbgeng/Makefile.in new file mode 100644 index 0000000..ba26387 --- /dev/null +++ b/dlls/dbgeng/Makefile.in @@ -0,0 +1,6 @@ +MODULE = dbgeng.dll +IMPORTLIB = dbgeng + +C_SRCS = dbgeng.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c new file mode 100644 index 0000000..d213653 --- /dev/null +++ b/dlls/dbgeng/dbgeng.c @@ -0,0 +1,104 @@ +/* + * Support for Microsoft Debugging Extension API + * + * Copyright (C) 2010 Volodymyr Shcherbyna + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbgeng); + +/************************************************************ +* DebugExtensionInitialize (DBGENG.@) +* +* Initializing Debug Engine +* +* PARAMS +* pVersion [O] Recieving the version of extension +* pFlags [O] Reserved +* +* RETURNS +* Success: S_OK +* Failure: Anything other than S_OK +* +* BUGS +* Unimplemented +*/ +HRESULT WINAPI DebugExtensionInitialize(ULONG * pVersion, ULONG * pFlags) +{ + FIXME("(%p,%p): stub\n", pVersion, pFlags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return E_NOTIMPL; +} + +/************************************************************ +* DebugCreate (DBGENG.@) +* +* Creating Debug Engine client object +* +* PARAMS +* InterfaceId [I] Interface Id of debugger client +* pInterface [O] Pointer to interface as requested via InterfaceId +* +* RETURNS +* Success: S_OK +* Failure: Anything other than S_OK +* +* BUGS +* Unimplemented +*/ +HRESULT WINAPI DebugCreate(REFIID InterfaceId, PVOID * pInterface) +{ + FIXME("(%p,%p): stub\n", InterfaceId, pInterface); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return E_NOTIMPL; +} + +/************************************************************ +* DebugConnect (DBGENG.@) +* +* Creating Debug Engine client object and connecting it to remote host +* +* PARAMS +* RemoteOptions [I] Options which define how debugger engine connects to remote host +* InterfaceId [I] Interface Id of debugger client +* pInterface [O] Pointer to interface as requested via InterfaceId +* +* RETURNS +* Success: S_OK +* Failure: Anything other than S_OK +* +* BUGS +* Unimplemented +*/ +HRESULT DebugConnect(PCSTR RemoteOptions, REFIID InterfaceId, PVOID * pInterface) +{ + FIXME("(%p,%p,%p): stub\n", RemoteOptions, InterfaceId, pInterface); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return E_NOTIMPL; +} diff --git a/dlls/dbgeng/dbgeng.spec b/dlls/dbgeng/dbgeng.spec new file mode 100644 index 0000000..b2ba6f3 --- /dev/null +++ b/dlls/dbgeng/dbgeng.spec @@ -0,0 +1,3 @@ +@ stdcall DebugExtensionInitialize(ptr ptr) +@ stdcall DebugCreate(ptr ptr) +@ stdcall DebugConnect(ptr ptr ptr)

1 0

Louis Lenders : ntdll: Set the IdleTime member from the SystemPerformanceInformation info class in NtQuerySystemInformation .
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: fa2b7066e547294ac1f2452b9d60afeb97d4492f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2b7066e547294ac1f2452b9… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Nov 19 18:57:08 2010 +0100 ntdll: Set the IdleTime member from the SystemPerformanceInformation info class in NtQuerySystemInformation. --- dlls/ntdll/nt.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ba4202f..7ad56e4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1370,12 +1370,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( { SYSTEM_PERFORMANCE_INFORMATION spi; static BOOL fixme_written = FALSE; + FILE *fp; memset(&spi, 0 , sizeof(spi)); len = sizeof(spi); spi.Reserved3 = 0x7fffffff; /* Available paged pool memory? */ + if ((fp = fopen("/proc/uptime", "r"))) + { + double uptime, idle_time; + + fscanf(fp, "%lf %lf", &uptime, &idle_time); + fclose(fp); + spi.IdleTime.QuadPart = 10000000 * idle_time; + } + else + { + static ULONGLONG idle; + /* many programs expect IdleTime to change so fake change */ + spi.IdleTime.QuadPart = ++idle; + } + if (Length >= len) { if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;

1 0

Peter Urbanec : msi: Add AMD64 platform definition to support installation of Visual C++ 8. 0 redistributable.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: edab173047607af016fc744e3c79b493c15f9777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edab173047607af016fc744e3… Author: Peter Urbanec <winehq.org(a)urbanec.net> Date: Fri Nov 26 20:27:07 2010 +1100 msi: Add AMD64 platform definition to support installation of Visual C++ 8.0 redistributable. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bed321e..feb82a0 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1076,6 +1076,7 @@ static const WCHAR szAdminUser[] = {'A','d','m','i','n','U','s','e','r',0}; static const WCHAR szIntel[] = {'I','n','t','e','l',0}; static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; +static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 72f3392..596db2b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1328,7 +1328,7 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) package->platform = PLATFORM_INTEL; else if (!strcmpW( template, szIntel64 )) package->platform = PLATFORM_INTEL64; - else if (!strcmpW( template, szX64 )) + else if (!strcmpW( template, szX64 ) || !strcmpW( template, szAMD64 )) package->platform = PLATFORM_X64; else {

1 0

Akihiro Sagawa : jscript: Update Japanese translation.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: e7bf31c40dc3d2ee1c844ad52f4c8324bfb16a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bf31c40dc3d2ee1c844ad52… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Nov 25 21:47:16 2010 +0900 jscript: Update Japanese translation. --- dlls/jscript/jscript_Ja.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jscript_Ja.rc b/dlls/jscript/jscript_Ja.rc index d1949e3..bf97883 100644 --- a/dlls/jscript/jscript_Ja.rc +++ b/dlls/jscript/jscript_Ja.rc @@ -28,6 +28,7 @@ STRINGTABLE { IDS_TO_PRIMITIVE "オブジェクトを基本型に変換できません" IDS_INVALID_CALL_ARG "手続き呼び出しまたは引数が無効です" + IDS_SUBSCRIPT_OUT_OF_RANGE "添字が範囲外です" IDS_CREATE_OBJ_ERROR "オートメーションサーバはオブジェクトを生成できません" IDS_NO_PROPERTY "オブジェクトはこのプロパティまたはメソッドをサポートしていません" IDS_UNSUPPORTED_ACTION "オブジェクトはこの操作をサポートしていません" @@ -43,8 +44,9 @@ STRINGTABLE IDS_OBJECT_EXPECTED "オブジェクトを期待していました" IDS_ILLEGAL_ASSIGN "不正な割り当て" IDS_UNDEFINED "'|'は定義されていません" - IDS_NOT_BOOL "論理オブジェクトを期待していました" - IDS_JSCRIPT_EXPECTED "JScriptオブジェクトを期待していました" + IDS_NOT_BOOL "Boolean オブジェクトを期待していました" + IDS_NOT_VBARRAY "VBArray オブジェクトを期待していました" + IDS_JSCRIPT_EXPECTED "JScript オブジェクトを期待していました" IDS_REGEXP_SYNTAX_ERROR "正規表現に文法誤りがあります" IDS_URI_INVALID_CHAR "エンコードされるURIに無効な文字が含まれています" IDS_INVALID_LENGTH "配列の長さは有限の正整数でなければなりません"

1 0

Maarten Lankhorst : qedit: Try all possible splitter filters instead of only the first one.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: b769a266cfc4ac2ccf178094a264be29ec4ac5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b769a266cfc4ac2ccf178094a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 26 00:04:13 2010 +0100 qedit: Try all possible splitter filters instead of only the first one. --- dlls/qedit/mediadet.c | 78 +++++++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 9aeb9c0..5ccccd6 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -378,52 +378,56 @@ static HRESULT GetSplitter(MediaDetImpl *This) if (FAILED(hr)) return hr; - hr = IEnumMoniker_Next(filters, 1, &mon, NULL); - IEnumMoniker_Release(filters); - if (hr != S_OK) /* No matches, what do we do? */ - return E_NOINTERFACE; + hr = E_NOINTERFACE; + while (IEnumMoniker_Next(filters, 1, &mon, NULL) == S_OK) + { + hr = GetFilterInfo(mon, &clsid, &var); + IMoniker_Release(mon); + if (FAILED(hr)) + continue; - hr = GetFilterInfo(mon, &clsid, &var); - IMoniker_Release(mon); - if (FAILED(hr)) - return hr; + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **) &splitter); + if (FAILED(hr)) + { + VariantClear(&var); + goto retry; + } - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (void **) &splitter); - if (FAILED(hr)) - { + hr = IGraphBuilder_AddFilter(This->graph, splitter, + V_UNION(&var, bstrVal)); VariantClear(&var); - return hr; - } + This->splitter = splitter; + if (FAILED(hr)) + goto retry; - hr = IGraphBuilder_AddFilter(This->graph, splitter, - V_UNION(&var, bstrVal)); - VariantClear(&var); - if (FAILED(hr)) - { - IBaseFilter_Release(splitter); - return hr; - } - This->splitter = splitter; + hr = IBaseFilter_EnumPins(This->source, &pins); + if (FAILED(hr)) + goto retry; + IEnumPins_Next(pins, 1, &source_pin, NULL); + IEnumPins_Release(pins); - hr = IBaseFilter_EnumPins(This->source, &pins); - if (FAILED(hr)) - return hr; - IEnumPins_Next(pins, 1, &source_pin, NULL); - IEnumPins_Release(pins); + hr = IBaseFilter_EnumPins(splitter, &pins); + if (FAILED(hr)) + { + IPin_Release(source_pin); + goto retry; + } + IEnumPins_Next(pins, 1, &splitter_pin, NULL); + IEnumPins_Release(pins); - hr = IBaseFilter_EnumPins(splitter, &pins); - if (FAILED(hr)) - { + hr = IPin_Connect(source_pin, splitter_pin, NULL); IPin_Release(source_pin); - return hr; + IPin_Release(splitter_pin); + if (SUCCEEDED(hr)) + break; + +retry: + IBaseFilter_Release(splitter); + This->splitter = NULL; } - IEnumPins_Next(pins, 1, &splitter_pin, NULL); - IEnumPins_Release(pins); - hr = IPin_Connect(source_pin, splitter_pin, NULL); - IPin_Release(source_pin); - IPin_Release(splitter_pin); + IEnumMoniker_Release(filters); if (FAILED(hr)) return hr;

1 0

Austin English : regedit: Add a manpage.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: 76725fbb68606acf40d6e15d7942996749771407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76725fbb68606acf40d6e15d7… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 09:55:21 2010 -0800 regedit: Add a manpage. --- .gitignore | 1 + programs/regedit/Makefile.in | 12 ++++++++++++ programs/regedit/regedit.man.in | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 834f256..783294d 100644 --- a/.gitignore +++ b/.gitignore @@ -262,6 +262,7 @@ loader/wine64 programs/Makeprog.rules programs/msiexec/msiexec.man programs/notepad/notepad.man +programs/regedit/regedit.man programs/regsvr32/regsvr32.man programs/rpcss/epm.h programs/rpcss/epm_s.c diff --git a/programs/regedit/Makefile.in b/programs/regedit/Makefile.in index a388be3..360575d 100644 --- a/programs/regedit/Makefile.in +++ b/programs/regedit/Makefile.in @@ -45,6 +45,18 @@ RC_SRCS = \ Zh.rc \ rsrc.rc +MANPAGES = regedit.man + SVG_SRCS = regedit.svg @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) regedit.man $(DESTDIR)$(mandir)/man$(prog_manext)/regedit.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/regedit.$(prog_manext) diff --git a/programs/regedit/regedit.man.in b/programs/regedit/regedit.man.in new file mode 100644 index 0000000..963adc2 --- /dev/null +++ b/programs/regedit/regedit.man.in @@ -0,0 +1,32 @@ +.TH REGEDIT 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +regedit \- Wine registry editor +.SH SYNOPSIS +.BR "regedit "\fI[text file]\fR " +.SH DESCRIPTION +.B regedit +is the Wine registry editor, designed to be compatible with its Microsoft Windows counterpart. +If called without any options, it will start the full GUI editor. + +The switches are case\-insensitive and can be prefixed either by '\-' or '/'. +.SH "OPTIONS" +.TP +\fB\-E\fR \fIfile\fR [\fIregpath\fR] +Exports the content of the specified registry key to the specified \fIfile\fR. It exports +the whole registry if no key is specified. +.IP "\-D " regpath +Deletes the specified registry key. +.IP \-S +Run regedit silently (ignored, CLI mode is always silent). This exists for compatability with Windows regedit. +.IP \-V +Run regedit in advanced mode (ignored). This exists for compatability with Windows regedit. +.IP "\-L " location +Specifies the location of the system.dat registry file (ignored). This exists for compatability with Windows regedit. +.IP "\-R " location +Specifies the location of the user.dat registry file (ignored). This exists for compatability with Windows regedit. +.IP \-? +Prints a help message. Any other options are ignored. +.IP \-C \fIfile.reg\fR +Create registry from \fIfile\fR (unimplemented). +.SH "SEE ALSO" +.BR wine(1)

1 0

Juan Lang : msisip: Determine whether a file is an MSI file based on its CLSID rather than its extension .
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: ef4560e51fe760fefafd002b31975b96438b0ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4560e51fe760fefafd002b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 24 14:35:57 2010 -0800 msisip: Determine whether a file is an MSI file based on its CLSID rather than its extension. --- dlls/msisip/main.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index cea0398..98a5743 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -24,6 +24,7 @@ #include "mssip.h" #define COBJMACROS #include "objbase.h" +#include "initguid.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msisip); @@ -217,34 +218,39 @@ end: return ret; } +DEFINE_GUID(CLSID_MsiTransform, 0x000c1082,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_MsiDatabase, 0x000c1084,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_MsiPatch, 0x000c1086,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); + /*********************************************************************** * MsiSIPIsMyTypeOfFile (MSISIP.@) */ BOOL WINAPI MsiSIPIsMyTypeOfFile(WCHAR *name, GUID *subject) { - static const WCHAR msi[] = { '.','m','s','i',0 }; - static const WCHAR msp[] = { '.','m','s','p',0 }; BOOL ret = FALSE; + IStorage *stg = NULL; + HRESULT r; TRACE("(%s, %p)\n", debugstr_w(name), subject); - if (lstrlenW(name) < lstrlenW(msi)) - return FALSE; - else if (lstrcmpiW(name + lstrlenW(name) - lstrlenW(msi), msi) && - lstrcmpiW(name + lstrlenW(name) - lstrlenW(msp), msp)) - return FALSE; - else + r = StgOpenStorage(name, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, + NULL, 0, &stg); + if (SUCCEEDED(r)) { - IStorage *stg = NULL; - HRESULT r = StgOpenStorage(name, NULL, - STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + STATSTG stat; + r = IStorage_Stat(stg, &stat, STATFLAG_NONAME); if (SUCCEEDED(r)) { - IStorage_Release(stg); - *subject = mySubject; - ret = TRUE; + if (IsEqualGUID(&stat.clsid, &CLSID_MsiDatabase) || + IsEqualGUID(&stat.clsid, &CLSID_MsiPatch) || + IsEqualGUID(&stat.clsid, &CLSID_MsiTransform)) + { + ret = TRUE; + *subject = mySubject; + } } + IStorage_Release(stg); } return ret; }

1 0

Michael Stefaniuc : clock: Add the Hindi translation.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: 09849ed929723be9190e2d341fb7769e7c28d1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=09849ed929723be9190e2d341… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 25 21:58:56 2010 +0100 clock: Add the Hindi translation. Translation by Rajesh Ranjan. --- programs/clock/Hi.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ programs/clock/Makefile.in | 1 + 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/clock/Hi.rc b/programs/clock/Hi.rc new file mode 100644 index 0000000..5753134 --- /dev/null +++ b/programs/clock/Hi.rc @@ -0,0 +1,51 @@ +/* + * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2010 Rajesh Ranjan + * Michael Stefaniuc + * + * 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 + */ + +#include "clock_res.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HINDI, SUBLANG_NEUTRAL + +MAIN_MENU MENU +{ + POPUP "सूचना (&o)" { + MENUITEM "एनालॉग (&l)", IDM_ANALOG + MENUITEM "डिज़िटल (&t)", IDM_DIGITAL + MENUITEM SEPARATOR + MENUITEM "फ़ॉन्ट (&F)...", IDM_FONT + MENUITEM SEPARATOR + MENUITEM "बिना शीर्षकपट्टी के (&W)", IDM_NOTITLE + MENUITEM SEPARATOR + MENUITEM "सेकेंड (&S)", IDM_SECONDS + MENUITEM "दिनांक (&D)", IDM_DATE + MENUITEM SEPARATOR + MENUITEM "हमेशा शीर्ष पर (&A)", IDM_ONTOP + } + POPUP "सूचना (&o)" { + MENUITEM "क्लॉक के बारे में (&A)...", IDM_ABOUT + } +} + +STRINGTABLE +{ + IDS_CLOCK, "क्लॉक" +} diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index f77c831..757b304 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ Fi.rc \ Fr.rc \ He.rc \ + Hi.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Austin English : winepath: Add a manpage.
by Alexandre Julliard Nov. 26, 2010

Nov. 26, 2010

Module: wine Branch: master Commit: 78a1df139ee2cd41c04d1cd8c1f04df0361639a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78a1df139ee2cd41c04d1cd8c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 25 10:28:05 2010 -0800 winepath: Add a manpage. --- .gitignore | 1 + programs/winepath/Makefile.in | 12 ++++++++++++ programs/winepath/winepath.man.in | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 783294d..c2b88f7 100644 --- a/.gitignore +++ b/.gitignore @@ -279,6 +279,7 @@ programs/winedbg/debug.yy.c programs/winedbg/winedbg.man programs/winefile/winefile.man programs/winemine/winemine.man +programs/winepath/winepath.man programs/winetest/*_test.exe programs/winetest/*_test.rc programs/winetest/build.nfo diff --git a/programs/winepath/Makefile.in b/programs/winepath/Makefile.in index e90e9ea..dd3d013 100644 --- a/programs/winepath/Makefile.in +++ b/programs/winepath/Makefile.in @@ -4,4 +4,16 @@ APPMODE = -mconsole -municode C_SRCS = winepath.c +MANPAGES = winepath.man + @MAKE_PROG_RULES@ + +all: $(MANPAGES) + +install-man-pages:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) + $(INSTALL_DATA) winepath.man $(DESTDIR)$(mandir)/man$(prog_manext)/winepath.$(prog_manext) + +(a)WOW64_DISABLE@ install install-lib:: install-man-pages + +uninstall:: + $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winepath.$(prog_manext) diff --git a/programs/winepath/winepath.man.in b/programs/winepath/winepath.man.in new file mode 100644 index 0000000..c27b7ee --- /dev/null +++ b/programs/winepath/winepath.man.in @@ -0,0 +1,32 @@ +.TH WINEPATH 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.SH NAME +winepath \- Tool to convert Unix paths to/from Win32 paths +.SH SYNOPSIS +.BR "winepath "\fIoption\fR " \fI{path}\fR" +.SH DESCRIPTION +.B winepath +is a tool to convert a Unix path to/from a Win32 (short/long) path. +compatible with its Microsoft Windows counterpart. + +If more than one option is given then the input paths are output in +all formats specified, in the order long, short, Unix, Windows. +If no option is given the default output is Unix format. +.SH OPTIONS +.IP \-u,\ \-\-unix +converts a Windows path to a Unix path. +.IP \-w,\ \\-\-windows +converts a Unix path to a long Windows path. +.IP \-l,\ \\-\-long +converts the short Windows path of an existing file or directory to the long +format. +.IP \-s,\ \\-\-short +converts the long Windows path of an existing file or directory to the short +format. +.IP \-0 +separate output with \\0 character, instead of a newline. +.IP \-h,\ \\-\-help +shows winepath help message and exit. +.IP \-v,\ \\-\-version +shows version information and exit. +.SH "SEE ALSO" +.BR wine (1)

1 0