February 2008 - Wine-commits

Jacek Caban : urlmon: Use BindToStorage hack only for binding to IStream.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 746ffa651a381f5821649076f6f8f66b5606bc1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=746ffa651a381f5821649076f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:12:38 2008 +0100 urlmon: Use BindToStorage hack only for binding to IStream. --- dlls/urlmon/umon.c | 21 +++++++-------------- 1 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index cb276af..f6ea427 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -493,10 +493,7 @@ static HRESULT WINAPI URLMonikerImpl_BindToObject(IMoniker* iface, /****************************************************************************** * URLMoniker_BindToStorage ******************************************************************************/ -static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, - IBindCtx* pbc, - REFIID riid, - VOID** ppvObject) +static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, IBindCtx* pbc, VOID** ppvObject) { HRESULT hres; BINDINFO bi; @@ -505,12 +502,7 @@ static HRESULT URLMonikerImpl_BindToStorage_hack(LPCWSTR URLName, Binding *bind; int len; - WARN("(%s %p %s %p)\n", debugstr_w(URLName), pbc, debugstr_guid(riid), ppvObject); - - if(!IsEqualIID(&IID_IStream, riid)) { - FIXME("unsupported iid\n"); - return E_NOTIMPL; - } + WARN("(%s %p %p)\n", debugstr_w(URLName), pbc, ppvObject); bind = heap_alloc_zero(sizeof(Binding)); bind->lpVtbl = &BindingVtbl; @@ -741,10 +733,11 @@ static HRESULT WINAPI URLMonikerImpl_BindToStorage(IMoniker* iface, return E_FAIL; } - if(url.nScheme== INTERNET_SCHEME_HTTPS - || url.nScheme== INTERNET_SCHEME_FTP - || url.nScheme == INTERNET_SCHEME_GOPHER) - return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, riid, ppvObject); + if(IsEqualGUID(&IID_IStream, riid) && + ( url.nScheme == INTERNET_SCHEME_HTTPS + || url.nScheme == INTERNET_SCHEME_FTP + || url.nScheme == INTERNET_SCHEME_GOPHER)) + return URLMonikerImpl_BindToStorage_hack(This->URLName, pbc, ppvObject); TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject);

1 0

Jacek Caban : urlmon: Added audio/basic MIME filter.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 5321c7154aecc002439cfaf927686be84dce2861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5321c7154aecc002439cfaf92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:05:14 2008 +0100 urlmon: Added audio/basic MIME filter. --- dlls/urlmon/tests/misc.c | 11 ++++++++++- dlls/urlmon/urlmon_main.c | 9 ++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 85fbffe..50a40b1 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -421,6 +421,7 @@ static const WCHAR mimeAppPdf[] = {'a','p','p','l','i','c','a','t','i','o','n',' static const WCHAR mimeAppXMSDownload[] = {'a','p','p','l','i','c','a','t','i','o','n','/','x','-','m','s','d','o','w','n','l','o','a','d',0}; static const WCHAR mimeAudioWav[] = {'a','u','d','i','o','/','w','a','v',0}; +static const WCHAR mimeAudioBasic[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; static const struct { LPCWSTR url; @@ -517,6 +518,10 @@ static BYTE data78[] = {'R','I','F','F',0xff,0xff,0xff,0xff,'<','h','t','m','l', static BYTE data79[] = {'%','!',0xff}; static BYTE data80[] = {'%','!'}; static BYTE data81[] = {'%','!','P','S','<','h','t','m','l','>'}; +static BYTE data82[] = {'.','s','n','d',0}; +static BYTE data83[] = {'.','s','n','d'}; +static BYTE data84[] = {'.','s','n','d',0,'<','h','t','m','l','>',1,1}; +static BYTE data85[] = {'.','S','N','D',0}; static const struct { BYTE *data; @@ -603,7 +608,11 @@ static const struct { {data78, sizeof(data78), mimeTextHtml}, {data79, sizeof(data79), mimeAppPostscript}, {data80, sizeof(data80), mimeTextPlain}, - {data81, sizeof(data81), mimeTextHtml} + {data81, sizeof(data81), mimeTextHtml}, + {data82, sizeof(data82), mimeAudioBasic}, + {data83, sizeof(data83), mimeTextPlain}, + {data84, sizeof(data84), mimeTextHtml}, + {data85, sizeof(data85), mimeTextPlain} }; static void test_FindMimeFromData(void) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 92d137a..07a9e89 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -469,6 +469,12 @@ static BOOL text_html_filter(const BYTE *b, DWORD size) return FALSE; } +static BOOL audio_basic_filter(const BYTE *b, DWORD size) +{ + return size > 4 + && b[0] == '.' && b[1] == 's' && b[2] == 'n' && b[3] == 'd'; +} + static BOOL audio_wav_filter(const BYTE *b, DWORD size) { return size > 12 @@ -613,6 +619,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR wszTextRichtext[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; + static const WCHAR wszAudioBasic[] = {'a','u','d','i','o','/','b','a','s','i','c',0}; static const WCHAR wszAudioWav[] = {'a','u','d','i','o','/','w','a','v',0}; static const WCHAR wszImageGif[] = {'i','m','a','g','e','/','g','i','f',0}; static const WCHAR wszImagePjpeg[] = {'i','m','a','g','e','/','p','j','p','e','g',0}; @@ -644,7 +651,7 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, {wszTextHtml, text_html_filter}, {wszTextRichtext, text_richtext_filter}, /* {wszAudioXAiff, audio_xaiff_filter}, */ - /* {wszAudioBasic, audio_basic_filter}, */ + {wszAudioBasic, audio_basic_filter}, {wszAudioWav, audio_wav_filter}, {wszImageGif, image_gif_filter}, {wszImagePjpeg, image_pjpeg_filter},

1 0

Jacek Caban : urlmon: E_PENGING returned by Start is not an error.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 374007985a1e79f56e31ed20bda21220620a5c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=374007985a1e79f56e31ed20b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:04:53 2008 +0100 urlmon: E_PENGING returned by Start is not an error. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index b564651..a966f2e 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1665,7 +1665,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I TRACE("start ret %08x\n", hres); - if(FAILED(hres)) { + if(FAILED(hres) && hres != E_PENDING) { stop_binding(binding, hres, NULL); IBinding_Release(BINDING(binding));

1 0

Jacek Caban : urlmon: Reimplement URLDownloadToFileW on top of URL moniker.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 5ca20089c4a5acd192175cb7d5819ea2b1a996aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca20089c4a5acd192175cb7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:03:24 2008 +0100 urlmon: Reimplement URLDownloadToFileW on top of URL moniker. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/download.c | 370 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/umon.c | 167 --------------------- 3 files changed, 371 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ca20089c4a5acd192175…

1 0

Jacek Caban : urlmon: URLDownloadToFileA code clean up.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: d2243989cab85a5c25b5e9aaffea30caa5d95460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2243989cab85a5c25b5e9aaf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:03:54 2008 +0100 urlmon: URLDownloadToFileA code clean up. --- dlls/urlmon/download.c | 35 +++++++++++++++++++++++++++++++++ dlls/urlmon/umon.c | 47 --------------------------------------------- dlls/urlmon/urlmon_main.h | 13 ++++++++++++ 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index a3ac35c..3082dd1 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -368,3 +368,38 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller, LPCWSTR szURL, LPCWSTR szFi return hres == MK_S_ASYNCHRONOUS ? S_OK : hres; } + +/*********************************************************************** + * URLDownloadToFileA (URLMON.@) + * + * Downloads URL szURL to rile szFileName and call lpfnCB callback to + * report progress. + * + * PARAMS + * pCaller [I] controlling IUnknown interface. + * szURL [I] URL of the file to download + * szFileName [I] file name to store the content of the URL + * dwReserved [I] reserved - set to 0 + * lpfnCB [I] callback for progress report + * + * RETURNS + * S_OK on success + */ +HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller, LPCSTR szURL, LPCSTR szFileName, DWORD dwReserved, + LPBINDSTATUSCALLBACK lpfnCB) +{ + LPWSTR urlW, file_nameW; + HRESULT hres; + + TRACE("(%p %s %s %d %p)\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB); + + urlW = heap_strdupAtoW(szURL); + file_nameW = heap_strdupAtoW(szFileName); + + hres = URLDownloadToFileW(pCaller, urlW, file_nameW, dwReserved, lpfnCB); + + heap_free(urlW); + heap_free(file_nameW); + + return hres; +} diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index abfce91..cb276af 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1207,53 +1207,6 @@ HRESULT WINAPI MkParseDisplayNameEx(IBindCtx *pbc, LPCWSTR szDisplayName, ULONG /*********************************************************************** - * URLDownloadToFileA (URLMON.@) - * - * Downloads URL szURL to rile szFileName and call lpfnCB callback to - * report progress. - * - * PARAMS - * pCaller [I] controlling IUnknown interface. - * szURL [I] URL of the file to download - * szFileName [I] file name to store the content of the URL - * dwReserved [I] reserved - set to 0 - * lpfnCB [I] callback for progress report - * - * RETURNS - * S_OK on success - * E_OUTOFMEMORY when going out of memory - */ -HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller, - LPCSTR szURL, - LPCSTR szFileName, - DWORD dwReserved, - LPBINDSTATUSCALLBACK lpfnCB) -{ - UNICODE_STRING szURL_w, szFileName_w; - - if ((szURL == NULL) || (szFileName == NULL)) { - FIXME("(%p,%s,%s,%08x,%p) cannot accept NULL strings !\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB); - return E_INVALIDARG; /* The error code is not specified in this case... */ - } - - if (RtlCreateUnicodeStringFromAsciiz(&szURL_w, szURL)) { - if (RtlCreateUnicodeStringFromAsciiz(&szFileName_w, szFileName)) { - HRESULT ret = URLDownloadToFileW(pCaller, szURL_w.Buffer, szFileName_w.Buffer, dwReserved, lpfnCB); - - RtlFreeUnicodeString(&szURL_w); - RtlFreeUnicodeString(&szFileName_w); - - return ret; - } else { - RtlFreeUnicodeString(&szURL_w); - } - } - - FIXME("(%p,%s,%s,%08x,%p) could not allocate W strings !\n", pCaller, szURL, szFileName, dwReserved, lpfnCB); - return E_OUTOFMEMORY; -} - -/*********************************************************************** * URLDownloadToCacheFileA (URLMON.@) */ HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPSTR szFileName, diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 87e74f9..0e5ebff 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -110,4 +110,17 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) return ret; } +static inline LPWSTR heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + #endif /* __WINE_URLMON_MAIN_H */

1 0

Jacek Caban : urlmon: Added TYMED_FILE support to CopyStgMedium.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 74b0897cf09810b37a6dbcb90287367cf7b216dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b0897cf09810b37a6dbcb90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:04:10 2008 +0100 urlmon: Added TYMED_FILE support to CopyStgMedium. --- dlls/urlmon/tests/misc.c | 13 +++++++++++++ dlls/urlmon/urlmon_main.c | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 1ed7614..85fbffe 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1183,6 +1183,8 @@ static void test_CopyStgMedium(void) STGMEDIUM src, dst; HRESULT hres; + static WCHAR fileW[] = {'f','i','l','e',0}; + memset(&src, 0xf0, sizeof(src)); memset(&dst, 0xe0, sizeof(dst)); src.tymed = TYMED_NULL; @@ -1203,6 +1205,17 @@ static void test_CopyStgMedium(void) ok(!dst.u.pstm, "pstm=%p\n", dst.u.pstm); ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); + memset(&dst, 0xe0, sizeof(dst)); + src.tymed = TYMED_FILE; + src.u.lpszFileName = fileW; + src.pUnkForRelease = NULL; + hres = CopyStgMedium(&src, &dst); + ok(hres == S_OK, "CopyStgMedium failed: %08x\n", hres); + ok(dst.tymed == TYMED_FILE, "tymed=%d\n", dst.tymed); + ok(dst.u.lpszFileName && dst.u.lpszFileName != fileW, "lpszFileName=%p\n", dst.u.lpszFileName); + ok(!lstrcmpW(dst.u.lpszFileName, fileW), "wrong file name\n"); + ok(!dst.pUnkForRelease, "pUnkForRelease=%p, expected NULL\n", dst.pUnkForRelease); + hres = CopyStgMedium(&src, NULL); ok(hres == E_POINTER, "CopyStgMedium failed: %08x, expected E_POINTER\n", hres); hres = CopyStgMedium(NULL, &dst); diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index ca52143..92d137a 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -398,7 +398,6 @@ void WINAPI ReleaseBindInfo(BINDINFO* pbindinfo) if(offsetof(BINDINFO, szExtraInfo) < size) CoTaskMemFree(pbindinfo->szCustomVerb); - if(pbindinfo->pUnk && offsetof(BINDINFO, pUnk) < size) IUnknown_Release(pbindinfo->pUnk); @@ -421,6 +420,13 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) switch(dst->tymed) { case TYMED_NULL: break; + case TYMED_FILE: + if(src->u.lpszFileName && !src->pUnkForRelease) { + DWORD size = (strlenW(src->u.lpszFileName)+1)*sizeof(WCHAR); + dst->u.lpszFileName = CoTaskMemAlloc(size); + memcpy(dst->u.lpszFileName, src->u.lpszFileName, size); + } + break; case TYMED_ISTREAM: if(dst->u.pstm) IStream_AddRef(dst->u.pstm);

1 0

Jacek Caban : urlmon: Added URLDownloadToFile tests.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 1b79f4dbee67c21a5ba348c7b8299d2bcd40c26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b79f4dbee67c21a5ba348c7b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 18 01:04:34 2008 +0100 urlmon: Added URLDownloadToFile tests. --- dlls/urlmon/tests/url.c | 196 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 154 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b79f4dbee67c21a5ba34…

1 0

Marcus Meissner : wintab32: Mark some signed entities as LONG.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: e94367cc5ecf466592fee355fe4c2c739dc71cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94367cc5ecf466592fee355f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Feb 17 13:31:59 2008 +0100 wintab32: Mark some signed entities as LONG. --- dlls/wintab32/context.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 609ec22..9c4c262 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -157,8 +157,7 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, return 0; } -static inline DWORD ScaleForContext(DWORD In, DWORD InOrg, DWORD InExt, DWORD - OutOrg, DWORD OutExt) +static inline DWORD ScaleForContext(DWORD In, LONG InOrg, LONG InExt, LONG OutOrg, LONG OutExt) { if (((InExt > 0 )&&(OutExt > 0)) || ((InExt<0) && (OutExt < 0))) return ((In - InOrg) * abs(OutExt) / abs(InExt)) + OutOrg;

1 0

James Hawkins : msi: Set the UserLanguageID property.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: 8412a1363bafd32c75411f98242a28ea14681c7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8412a1363bafd32c75411f982… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Feb 17 14:11:07 2008 -0600 msi: Set the UserLanguageID property. --- dlls/msi/package.c | 19 +++++++++++++------ dlls/msi/tests/package.c | 9 +++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a8d33e0..685a28d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -352,6 +352,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) LONG res; SYSTEM_INFO sys_info; SYSTEMTIME systemtime; + LANGID langid; static const WCHAR cszbs[]={'\\',0}; static const WCHAR CFF[] = @@ -420,7 +421,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szScreenX[] = {'S','c','r','e','e','n','X',0}; static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; - static const WCHAR szScreenFormat[] = {'%','d',0}; + static const WCHAR szIntFormat[] = {'%','d',0}; static const WCHAR szIntel[] = { 'I','n','t','e','l',0 }; static const WCHAR szAllUsers[] = { 'A','L','L','U','S','E','R','S',0 }; static const WCHAR szCurrentVersion[] = { @@ -437,6 +438,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szCOMPANYNAME[] = {'C','O','M','P','A','N','Y','N','A','M','E',0}; static const WCHAR szDate[] = {'D','a','t','e',0}; static const WCHAR szTime[] = {'T','i','m','e',0}; + static const WCHAR szUserLangID[] = {'U','s','e','r','L','a','n','g','u','a','g','e','I','D',0}; /* * Other things that probably should be set: @@ -523,7 +525,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) /* Physical Memory is specified in MB. Using total amount. */ msex.dwLength = sizeof(msex); GlobalMemoryStatusEx( &msex ); - sprintfW( bufstr, szScreenFormat, (int)(msex.ullTotalPhys/1024/1024)); + sprintfW( bufstr, szIntFormat, (int)(msex.ullTotalPhys/1024/1024)); MSI_SetPropertyW(package, szPhysicalMemory, bufstr); SHGetFolderPathW(NULL,CSIDL_WINDOWS,NULL,0,pth); @@ -570,17 +572,17 @@ static VOID set_installer_properties(MSIPACKAGE *package) GetSystemInfo( &sys_info ); if (sys_info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { - sprintfW( bufstr, szScreenFormat, sys_info.wProcessorLevel ); + sprintfW( bufstr, szIntFormat, sys_info.wProcessorLevel ); MSI_SetPropertyW( package, szIntel, bufstr ); } /* Screen properties. */ dc = GetDC(0); - sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, HORZRES ) ); + sprintfW( bufstr, szIntFormat, GetDeviceCaps( dc, HORZRES ) ); MSI_SetPropertyW( package, szScreenX, bufstr ); - sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, VERTRES )); + sprintfW( bufstr, szIntFormat, GetDeviceCaps( dc, VERTRES )); MSI_SetPropertyW( package, szScreenY, bufstr ); - sprintfW( bufstr, szScreenFormat, GetDeviceCaps( dc, BITSPIXEL )); + sprintfW( bufstr, szIntFormat, GetDeviceCaps( dc, BITSPIXEL )); MSI_SetPropertyW( package, szColorBits, bufstr ); ReleaseDC(0, dc); @@ -628,6 +630,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) set_msi_assembly_prop( package ); + langid = GetUserDefaultLangID(); + sprintfW(bufstr, szIntFormat, langid); + + MSI_SetPropertyW( package, szUserLangID, bufstr ); + msi_free( check ); CloseHandle( hkey ); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index dc0e31e..9d1f8b8 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4697,6 +4697,7 @@ static void test_installprops(void) CHAR path[MAX_PATH]; CHAR buf[MAX_PATH]; DWORD size, type; + LANGID langid; HKEY hkey; UINT r; @@ -4762,6 +4763,14 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("PackageCode = %s\n", buf); + langid = GetUserDefaultLangID(); + sprintf(path, "%d", langid); + + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UserLanguageID", buf, &size); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); + ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf); + CloseHandle(hkey); MsiCloseHandle(hpkg); DeleteFile(msifile);

1 0

James Hawkins : msi: Convert REG_DWORD properties to strings in MsiGetProductInfo.
by Alexandre Julliard 18 Feb '08

18 Feb '08

Module: wine Branch: master Commit: bbdf79bc8cfc6ef64ad04e65c1fd411d5baa94de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbdf79bc8cfc6ef64ad04e65c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Feb 16 23:39:16 2008 -0600 msi: Convert REG_DWORD properties to strings in MsiGetProductInfo. --- dlls/msi/msi.c | 33 ++++- dlls/msi/tests/msi.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 451 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbdf79bc8cfc6ef64ad04…

1 0