wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Erich Hoover : advapi32: Support service objects in GetNamedSecurityInfo.
by Alexandre Julliard 31 Jan '13

31 Jan '13

Module: wine Branch: master Commit: 08238b83b8282a60eef3b0fc5afcdb913505799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08238b83b8282a60eef3b0fc5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 30 12:59:12 2013 -0700 advapi32: Support service objects in GetNamedSecurityInfo. --- dlls/advapi32/advapi32_misc.h | 2 + dlls/advapi32/security.c | 53 +++++++++++++++++++++++++++----------- dlls/advapi32/service.c | 57 +++++++++++++++++++++++++---------------- 3 files changed, 75 insertions(+), 37 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index cb7f7ca..ace73f1 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -30,6 +30,8 @@ BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; WCHAR *SERV_dup(const char *str) DECLSPEC_HIDDEN; +DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; +DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; /* heap allocation helpers */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index d70fb63..f9727d7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -423,6 +423,19 @@ static inline DWORD get_security_file( LPWSTR full_file_name, DWORD access, HAND return RtlNtStatusToDosError( status ); } +/* helper function for SE_SERVICE objects in [Get|Set]NamedSecurityInfo */ +static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access, HANDLE *service ) +{ + SC_HANDLE manager = 0; + DWORD err; + + err = SERV_OpenSCManagerW( NULL, NULL, access, (SC_HANDLE *)&manager ); + if (err == ERROR_SUCCESS) + err = SERV_OpenServiceW( manager, full_service_name, access, (SC_HANDLE *)service ); + CloseServiceHandle( manager ); + return err; +} + #define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(sidWorld) - sizeof(DWORD)) static void GetWorldAccessACL(PACL pACL) @@ -5535,16 +5548,6 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, TRACE( "%s %d %d %p %p %p %p %p\n", debugstr_w(name), type, info, owner, group, dacl, sacl, descriptor ); - if (type != SE_FILE_OBJECT) - { - FIXME( "Object type %d is not currently supported.\n", type ); - if (owner) *owner = NULL; - if (group) *group = NULL; - if (dacl) *dacl = NULL; - if (sacl) *sacl = NULL; - if (descriptor) *descriptor = NULL; - return ERROR_SUCCESS; - } /* A NULL descriptor is allowed if any one of the other pointers is not NULL */ if (!name || !(owner||group||dacl||sacl||descriptor) ) return ERROR_INVALID_PARAMETER; @@ -5562,11 +5565,31 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, if (info & SACL_SECURITY_INFORMATION) access |= ACCESS_SYSTEM_SECURITY; - err = get_security_file( name, access, &handle); - if (err != ERROR_SUCCESS) - return err; - err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); - CloseHandle( handle ); + switch (type) + { + case SE_SERVICE: + if (!(err = get_security_service( name, access, &handle))) + { + err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); + CloseServiceHandle( handle ); + } + break; + case SE_FILE_OBJECT: + if (!(err = get_security_file( name, access, &handle))) + { + err = GetSecurityInfo( handle, type, info, owner, group, dacl, sacl, descriptor ); + CloseHandle( handle ); + } + break; + default: + FIXME( "Object type %d is not currently supported.\n", type ); + if (owner) *owner = NULL; + if (group) *group = NULL; + if (dacl) *dacl = NULL; + if (sacl) *sacl = NULL; + if (descriptor) *descriptor = NULL; + return ERROR_SUCCESS; + } return err; } diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 9a952e1..4c694b1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -777,18 +777,17 @@ SC_HANDLE WINAPI OpenSCManagerA( LPCSTR lpMachineName, LPCSTR lpDatabaseName, * * See OpenSCManagerA. */ -SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, - DWORD dwDesiredAccess ) +DWORD SERV_OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, + DWORD dwDesiredAccess, SC_HANDLE *handle ) { - SC_HANDLE handle = 0; - LONG r; + DWORD r; TRACE("(%s,%s,0x%08x)\n", debugstr_w(lpMachineName), debugstr_w(lpDatabaseName), dwDesiredAccess); __TRY { - r = svcctl_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, (SC_RPC_HANDLE *)&handle); + r = svcctl_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, (SC_RPC_HANDLE *)handle); } __EXCEPT(rpc_filter) { @@ -797,12 +796,21 @@ SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, __ENDTRY if (r!=ERROR_SUCCESS) - { - SetLastError( r ); - handle = 0; - } + *handle = 0; + + TRACE("returning %p\n", *handle); + return r; +} - TRACE("returning %p\n", handle); +SC_HANDLE WINAPI OpenSCManagerW( LPCWSTR lpMachineName, LPCWSTR lpDatabaseName, + DWORD dwDesiredAccess ) +{ + SC_HANDLE handle = 0; + DWORD r; + + r = SERV_OpenSCManagerW(lpMachineName, lpDatabaseName, dwDesiredAccess, &handle); + if (r!=ERROR_SUCCESS) + SetLastError(r); return handle; } @@ -921,23 +929,19 @@ SC_HANDLE WINAPI OpenServiceA( SC_HANDLE hSCManager, LPCSTR lpServiceName, * * See OpenServiceA. */ -SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, - DWORD dwDesiredAccess) +DWORD SERV_OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, + DWORD dwDesiredAccess, SC_HANDLE *handle ) { - SC_HANDLE handle = 0; DWORD err; TRACE("%p %s %d\n", hSCManager, debugstr_w(lpServiceName), dwDesiredAccess); if (!hSCManager) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } + return ERROR_INVALID_HANDLE; __TRY { - err = svcctl_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, (SC_RPC_HANDLE *)&handle); + err = svcctl_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, (SC_RPC_HANDLE *)handle); } __EXCEPT(rpc_filter) { @@ -946,12 +950,21 @@ SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, __ENDTRY if (err != ERROR_SUCCESS) - { - SetLastError(err); handle = 0; - } - TRACE("returning %p\n",handle); + TRACE("returning %p\n", *handle); + return err; +} + +SC_HANDLE WINAPI OpenServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, + DWORD dwDesiredAccess) +{ + SC_HANDLE handle = 0; + DWORD err; + + err = SERV_OpenServiceW(hSCManager, lpServiceName, dwDesiredAccess, &handle); + if (err != ERROR_SUCCESS) + SetLastError(err); return handle; }

1 0

Jeremy Newman : rename .cvsignore, to .gitignore
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: f24c6f1c8b0af80824e284748bd8bfc33b509b16 URL: http://source.winehq.org/git/website.git/?a=commit;h=f24c6f1c8b0af80824e284… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:17:23 2013 -0600 rename .cvsignore, to .gitignore --- templates/en/{.cvsignore => .gitignore} | 0 templates/he/.cvsignore | 2 -- 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/templates/en/.cvsignore b/templates/en/.gitignore similarity index 100% rename from templates/en/.cvsignore rename to templates/en/.gitignore diff --git a/templates/he/.cvsignore b/templates/he/.cvsignore deleted file mode 100644 index 0ba44f6..0000000 --- a/templates/he/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -docs -winapi_stats.template

1 0

Jeremy Newman : rename zh_CN to zh-cn
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: faa55d7055a855ed701958ba9cf8fdb55d4b68fb URL: http://source.winehq.org/git/website.git/?a=commit;h=faa55d7055a855ed701958… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:15:28 2013 -0600 rename zh_CN to zh-cn --- images/lang/{zh.png => zh-cn.png} | Bin 494 -> 494 bytes include/data.php | 8 ++++---- templates/{zh_CN => zh-cn}/about.template | 0 templates/{zh_CN => zh-cn}/download.template | 0 templates/{zh_CN => zh-cn}/global/404.template | 0 templates/{zh_CN => zh-cn}/help.template | 0 templates/{zh_CN => zh-cn}/home.template | 0 templates/{zh_CN => zh-cn}/lang.template | 0 templates/{zh_CN => zh-cn}/news.template | 0 templates/{zh_CN => zh-cn}/search.template | 0 10 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/lang/zh.png b/images/lang/zh-cn.png similarity index 100% rename from images/lang/zh.png rename to images/lang/zh-cn.png diff --git a/include/data.php b/include/data.php index 1422f4f..92cf10d 100644 --- a/include/data.php +++ b/include/data.php @@ -64,10 +64,10 @@ class data 'name' => 'Türkçe', 'change' => 'Lisan Değiştir' ), - 'zh_CN' => array( - 'name' => '简体中文', - 'change' => '选择语言' - ) + 'zh-cn' => array( + 'name' => '简体中文', + 'change' => '选择语言' + ) ); } } diff --git a/templates/zh_CN/about.template b/templates/zh-cn/about.template similarity index 100% rename from templates/zh_CN/about.template rename to templates/zh-cn/about.template diff --git a/templates/zh_CN/download.template b/templates/zh-cn/download.template similarity index 100% rename from templates/zh_CN/download.template rename to templates/zh-cn/download.template diff --git a/templates/zh_CN/global/404.template b/templates/zh-cn/global/404.template similarity index 100% rename from templates/zh_CN/global/404.template rename to templates/zh-cn/global/404.template diff --git a/templates/zh_CN/help.template b/templates/zh-cn/help.template similarity index 100% rename from templates/zh_CN/help.template rename to templates/zh-cn/help.template diff --git a/templates/zh_CN/home.template b/templates/zh-cn/home.template similarity index 100% rename from templates/zh_CN/home.template rename to templates/zh-cn/home.template diff --git a/templates/zh_CN/lang.template b/templates/zh-cn/lang.template similarity index 100% rename from templates/zh_CN/lang.template rename to templates/zh-cn/lang.template diff --git a/templates/zh_CN/news.template b/templates/zh-cn/news.template similarity index 100% rename from templates/zh_CN/news.template rename to templates/zh-cn/news.template diff --git a/templates/zh_CN/search.template b/templates/zh-cn/search.template similarity index 100% rename from templates/zh_CN/search.template rename to templates/zh-cn/search.template

1 0

Jeremy Newman : get_lang(): fix so language variations work, with fallback to parent
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: ea50e81793068139d5026f460cfa390b2c478c64 URL: http://source.winehq.org/git/website.git/?a=commit;h=ea50e81793068139d5026f… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:14:39 2013 -0600 get_lang(): fix so language variations work, with fallback to parent --- include/html.php | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-) diff --git a/include/html.php b/include/html.php index 9b2e83c..be3c02d 100644 --- a/include/html.php +++ b/include/html.php @@ -322,35 +322,49 @@ class html // default from config $lang = $GLOBALS['config']->lang; - // get lang + // load language from URL or cookie if (isset($_COOKIE['lang']) and in_array($_COOKIE['lang'], $GLOBALS['config']->languages)) { - // load language from URL or cookie debug("global", "lang from cookie: {$_COOKIE['lang']}"); $lang = $_COOKIE['lang']; + return $lang; } - else if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) + + // load from web browser environment + if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) { - // load from web browser environment $hal = preg_split("/\;/", $_SERVER["HTTP_ACCEPT_LANGUAGE"]); $avail = preg_split('/\,/', array_shift($hal)); - if (isset($avail[0])) + if (!empty($avail)) { - // if first language is a variation, use the parent language - if (strlen($avail[0]) > 2) - $avail[0] = substr($avail[0], 0, 2); - // check to make sure lang is defined in our config - if (in_array($avail[0], $GLOBALS['config']->languages)) + // loop through languages + $avail = array_map("strtolower", $avail); + foreach ($avail as $inLang) { - debug("global", "lang from browser: {$avail[0]}"); - $lang = $avail[0]; + // check to see if langage is available + if (in_array($inLang, $GLOBALS['config']->languages)) + { + debug("global", "lang from browser: {$inLang}"); + return $inLang; + } + + // check to see if variation of langage is available + if (strlen($inLang) > 2) + { + $inLangAlt = substr($inLang, 0, 2); + if (in_array($inLangAlt, $GLOBALS['config']->languages)) + { + debug("global", "lang from browser: {$inLangAlt}"); + return $inLangAlt; + } + } } } unset($hal, $avail); } - - // return language - debug("global", "lang: {$lang}"); + + // return default language + debug("global", "lang default: {$lang}"); return $lang; }

1 0

Jeremy Newman : adding zh-cn as availale language
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: b72bbd24e07b88892a87599502c33d9dc6655404 URL: http://source.winehq.org/git/website.git/?a=commit;h=b72bbd24e07b88892a8759… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 31 11:14:08 2013 -0600 adding zh-cn as availale language --- include/winehq.conf.sample | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample index 5a247c1..1eb97fb 100644 --- a/include/winehq.conf.sample +++ b/include/winehq.conf.sample @@ -22,7 +22,7 @@ theme: winehq lang: en # available languages -@languages: en, de, es, fr, he, pl, pt, tr +@languages: en, de, es, fr, he, pl, pt, tr, zh-cn # default base URLS (if you run the site, in a subdir, set base_root) base_root:

1 0

Jactry Zeng : Added Simplified Chinese translation
by Jeremy Newman 31 Jan '13

31 Jan '13

Module: website Branch: master Commit: 5054db446d69730e5290aee265bfd971ccb2f3e6 URL: http://source.winehq.org/git/website.git/?a=commit;h=5054db446d69730e5290ae… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Jan 31 11:34:57 2013 +0800 Added Simplified Chinese translation Hi folks, this is Simplified Chinese translation for Wine's website, it's my first patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. I appreciate for any comment. :-) -- Regards, Jactry Zeng <html> <head> <meta http-equiv="content-type" content="text/html; charset=GB2312"> </head> <body bgcolor="#FFFFFF" text="#000000"> Hi folks, this is Simplified Chinese translation for Wine's website, it's my first patch, thanks Qian Hong, Aron Xu, Jeremy and Hin-Tak for review. <meta charset="utf-8"> I appreciate for any comment. :-) <meta charset="utf-8"> <span style="color: rgb(34, 34, 34); font-family: arial, sans-serif; font-size: 14px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: 2; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); display: inline !important; float: none;">-- Regards, Jactry Zeng <meta charset="utf-8"> </body> </html> >From 55c688c3519eacf0a8506abfe645aa20ac21e11b Mon Sep 17 00:00:00 2001 From: Jactry Zeng <jactry92(a)gmail.com> Date: Thu, 31 Jan 2013 11:00:41 +0800 Subject: add Simplified Chinese translation for Wine's website To: wine-patches <wine-patches(a)winehq.org> Reply-To: wine-devel <wine-devel(a)winehq.org> --- include/data.php | 6 +- templates/zh_CN/about.template | 46 ++++++++ templates/zh_CN/download.template | 199 +++++++++++++++++++++++++++++++++++ templates/zh_CN/global/404.template | 16 +++ templates/zh_CN/help.template | 97 +++++++++++++++++ templates/zh_CN/home.template | 90 ++++++++++++++++ templates/zh_CN/lang.template | 12 ++ templates/zh_CN/news.template | 16 +++ templates/zh_CN/search.template | 26 +++++ 9 files changed, 507 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=5054db446d69730e52…

1 0

Charles Davis : winebuild: Use Clang to assemble if found.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: c14bdaf1ddb7d0e5587f63f1216b61c9ecb7a8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14bdaf1ddb7d0e5587f63f12… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Jan 28 13:42:12 2013 -0700 winebuild: Use Clang to assemble if found. --- tools/winebuild/utils.c | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 559e476..262ff3a 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -288,8 +288,6 @@ char *find_tool( const char *name, const char * const *names ) unsigned int i, len; struct stat st; - if (target_alias) return strmake( "%s-%s", target_alias, name ); - if (!dirs) { char *path; @@ -322,6 +320,8 @@ char *find_tool( const char *name, const char * const *names ) while (*names) { len = strlen(*names) + sizeof(EXEEXT) + 1; + if (target_alias) + len += strlen(target_alias) + 1; file = xmalloc( maxlen + len ); for (i = 0; i < count; i++) @@ -330,6 +330,12 @@ char *find_tool( const char *name, const char * const *names ) p = file + strlen(file); if (p == file) *p++ = '.'; if (p[-1] != '/') *p++ = '/'; + if (target_alias) + { + strcpy( p, target_alias ); + p += strlen(p); + *p++ = '-'; + } strcpy( p, *names ); strcat( p, EXEEXT ); @@ -338,21 +344,38 @@ char *find_tool( const char *name, const char * const *names ) free( file ); names++; } - return xstrdup( name ); + return NULL; } struct strarray *get_as_command(void) { + static int as_is_clang = 0; struct strarray *args = strarray_init(); if (!as_command) { + as_command = find_tool( "clang", NULL ); + if (as_command) as_is_clang = 1; + } + + if (!as_command) + { static const char * const commands[] = { "gas", "as", NULL }; as_command = find_tool( "as", commands ); } + + if (!as_command) + fatal_error( "cannot find suitable assembler\n" ); + strarray_add_one( args, as_command ); - if (force_pointer_size) + if (as_is_clang) + { + strarray_add( args, "-xassembler", "-c", NULL ); + if (force_pointer_size) + strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); + } + else if (force_pointer_size) { switch (target_platform) { @@ -386,6 +409,10 @@ struct strarray *get_ld_command(void) static const char * const commands[] = { "ld", "gld", NULL }; ld_command = find_tool( "ld", commands ); } + + if (!ld_command) + fatal_error( "cannot find suitable linker\n" ); + strarray_add_one( args, ld_command ); if (force_pointer_size) @@ -421,6 +448,9 @@ const char *get_nm_command(void) static const char * const commands[] = { "nm", "gnm", NULL }; nm_command = find_tool( "nm", commands ); } + + if (!nm_command) + fatal_error( "cannot find suitable name lister\n" ); return nm_command; }

1 0

Sergey Guralnik : winemenubuilder: Try to wait for creating icon files.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 79808429c16c9bec8026cbd57158dcff26691334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79808429c16c9bec8026cbd57… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 23 15:07:44 2013 +0200 winemenubuilder: Try to wait for creating icon files. --- programs/winemenubuilder/winemenubuilder.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5a5789f..c931363 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1055,10 +1055,19 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt hr = open_module_icon(filename, index, ppStream); if (FAILED(hr)) { - static const WCHAR dot_icoW[] = {'.','i','c','o',0}; - int len = strlenW(filename); - if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) - hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + if(bWait && hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) + { + WINE_WARN("Can't find file: %s, give a chance to parent process to create it\n", + wine_dbgstr_w(filename)); + return hr; + } + else + { + static const WCHAR dot_icoW[] = {'.','i','c','o',0}; + int len = strlenW(filename); + if (len >= 4 && strcmpiW(&filename[len - 4], dot_icoW) == 0) + hr = SHCreateStreamOnFileW(filename, STGM_READ, ppStream); + } } if (FAILED(hr)) hr = open_file_type_icon(filename, ppStream);

1 0

Maarten Lankhorst : dbghelp: Add support for zlib compressed debug sections .
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: 1dc3ef518854173e545b9ec2b71be1dba461895d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc3ef518854173e545b9ec2b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jan 29 13:01:10 2013 +0100 dbghelp: Add support for zlib compressed debug sections. Patch created with the assistance of Eric Pouech who helped diagnose the problem, wrote some parts of this patch and reviewed this patch. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/dwarf.c | 157 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 138 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index fcbe40f..7cb0544 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = dbghelp EXTRADEFS = -D_IMAGEHLP_SOURCE_ IMPORTS = psapi DELAYIMPORTS = version +EXTRALIBS = @ZLIB@ C_SRCS = \ coff.c \ diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2ce26fa..8ded268 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -42,7 +42,12 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_ZLIB +#include <zlib.h> +#endif + #include "windef.h" +#include "winternl.h" #include "winbase.h" #include "winuser.h" #include "ole2.h" @@ -157,6 +162,7 @@ typedef struct dwarf2_debug_info_s typedef struct dwarf2_section_s { + BOOL compressed; const unsigned char* address; unsigned size; DWORD_PTR rva; @@ -3282,29 +3288,134 @@ static void dwarf2_location_compute(struct process* pcs, } } -static void dwarf2_module_remove(struct process* pcs, struct module_format* modfmt) +#ifdef HAVE_ZLIB +static void *zalloc(void *priv, uInt items, uInt sz) { - HeapFree(GetProcessHeap(), 0, modfmt); + return HeapAlloc(GetProcessHeap(), 0, items * sz); +} + +static void zfree(void *priv, void *addr) +{ + HeapFree(GetProcessHeap(), 0, addr); +} + +static inline BOOL dwarf2_init_zsection(dwarf2_section_t* section, + const char* zsectname, + struct image_section_map* ism) +{ + z_stream z; + LARGE_INTEGER li; + int res; + BOOL ret = FALSE; + + BYTE *addr, *sect = (BYTE *)image_map_section(ism); + size_t sz = image_get_map_size(ism); + + if (sz <= 12 || memcmp(sect, "ZLIB", 4)) + { + ERR("invalid compressed section %s\n", zsectname); + goto out; + } + +#ifdef WORDS_BIGENDIAN + li.u.HighPart = *(DWORD*)&sect[4]; + li.u.LowPart = *(DWORD*)&sect[8]; +#else + li.u.HighPart = RtlUlongByteSwap(*(DWORD*)&sect[4]); + li.u.LowPart = RtlUlongByteSwap(*(DWORD*)&sect[8]); +#endif + + addr = HeapAlloc(GetProcessHeap(), 0, li.QuadPart); + if (!addr) + goto out; + + z.next_in = &sect[12]; + z.avail_in = sz - 12; + z.opaque = NULL; + z.zalloc = zalloc; + z.zfree = zfree; + + res = inflateInit(&z); + if (res != Z_OK) + { + FIXME("inflateInit failed with %i / %s\n", res, z.msg); + goto out_free; + } + + do { + z.next_out = addr + z.total_out; + z.avail_out = li.QuadPart - z.total_out; + res = inflate(&z, Z_FINISH); + } while (z.avail_in && res == Z_STREAM_END); + + if (res != Z_STREAM_END) + { + FIXME("Decompression failed with %i / %s\n", res, z.msg); + goto out_end; + } + + ret = TRUE; + section->compressed = TRUE; + section->address = addr; + section->rva = image_get_map_rva(ism); + section->size = z.total_out; + +out_end: + inflateEnd(&z); +out_free: + if (!ret) + HeapFree(GetProcessHeap(), 0, addr); +out: + image_unmap_section(ism); + return ret; } +#endif + static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_file_map* fmap, - const char* sectname, struct image_section_map* ism) + const char* sectname, const char* zsectname, + struct image_section_map* ism) { struct image_section_map local_ism; if (!ism) ism = &local_ism; - if (!image_find_section(fmap, sectname, ism)) + + section->compressed = FALSE; + if (image_find_section(fmap, sectname, ism)) { - section->address = NULL; - section->size = 0; - section->rva = 0; - return FALSE; + section->address = (const BYTE*)image_map_section(ism); + section->size = image_get_map_size(ism); + section->rva = image_get_map_rva(ism); + return TRUE; } - section->address = (const BYTE*)image_map_section(ism); - section->size = image_get_map_size(ism); - section->rva = image_get_map_rva(ism); - return TRUE; + section->address = NULL; + section->size = 0; + section->rva = 0; + + if (zsectname && image_find_section(fmap, zsectname, ism)) + { +#ifdef HAVE_ZLIB + return dwarf2_init_zsection(section, zsectname, ism); +#else + FIXME("dbghelp not built with zlib, but compressed section found\n" ); +#endif + } + + return FALSE; +} + +static inline void dwarf2_fini_section(dwarf2_section_t* section) +{ + if (section->compressed) + HeapFree(GetProcessHeap(), 0, (void*)section->address); +} + +static void dwarf2_module_remove(struct process* pcs, struct module_format* modfmt) +{ + dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_loc); + dwarf2_fini_section(&modfmt->u.dwarf2_info->debug_frame); + HeapFree(GetProcessHeap(), 0, modfmt); } BOOL dwarf2_parse(struct module* module, unsigned long load_offset, @@ -3318,12 +3429,12 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, BOOL ret = TRUE; struct module_format* dwarf2_modfmt; - dwarf2_init_section(&eh_frame, fmap, ".eh_frame", &eh_frame_sect); - dwarf2_init_section(&section[section_debug], fmap, ".debug_info", &debug_sect); - dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", &debug_abbrev_sect); - dwarf2_init_section(&section[section_string], fmap, ".debug_str", &debug_str_sect); - dwarf2_init_section(&section[section_line], fmap, ".debug_line", &debug_line_sect); - dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", &debug_ranges_sect); + dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect); + dwarf2_init_section(&section[section_debug], fmap, ".debug_info", ".zdebug_info", &debug_sect); + dwarf2_init_section(&section[section_abbrev], fmap, ".debug_abbrev", ".zdebug_abbrev", &debug_abbrev_sect); + dwarf2_init_section(&section[section_string], fmap, ".debug_str", ".zdebug_str", &debug_str_sect); + dwarf2_init_section(&section[section_line], fmap, ".debug_line", ".zdebug_line", &debug_line_sect); + dwarf2_init_section(&section[section_ranges], fmap, ".debug_ranges", ".zdebug_ranges", &debug_ranges_sect); /* to do anything useful we need either .eh_frame or .debug_info */ if ((!eh_frame.address || eh_frame.address == IMAGE_NO_MAP) && @@ -3365,8 +3476,8 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, /* As we'll need later some sections' content, we won't unmap these * sections upon existing this function */ - dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); - dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", ".zdebug_loc", NULL); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_frame, fmap, ".debug_frame", ".zdebug_frame", NULL); dwarf2_modfmt->u.dwarf2_info->eh_frame = eh_frame; while (mod_ctx.data < mod_ctx.end_data) @@ -3385,6 +3496,12 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_modfmt->u.dwarf2_info->word_size = fmap->addr_size / 8; leave: + dwarf2_fini_section(&section[section_debug]); + dwarf2_fini_section(&section[section_abbrev]); + dwarf2_fini_section(&section[section_string]); + dwarf2_fini_section(&section[section_line]); + dwarf2_fini_section(&section[section_ranges]); + image_unmap_section(&debug_sect); image_unmap_section(&debug_abbrev_sect); image_unmap_section(&debug_str_sect);

1 0

Dmitry Timoshkov : windowscodecs: Implement GetThumbnail in the ICO frame decoder.
by Alexandre Julliard 30 Jan '13

30 Jan '13

Module: wine Branch: master Commit: e6c88226ef89698fc6dcba708b0dfe203b4c32eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c88226ef89698fc6dcba708… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 31 00:48:05 2013 +0800 windowscodecs: Implement GetThumbnail in the ICO frame decoder. --- dlls/windowscodecs/icoformat.c | 4 ++-- dlls/windowscodecs/tests/icoformat.c | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 7aec245..ec09aa6 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -200,8 +200,8 @@ static HRESULT WINAPI IcoFrameDecode_GetColorContexts(IWICBitmapFrameDecode *ifa static HRESULT WINAPI IcoFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - FIXME("(%p,%p)\n", iface, ppIThumbnail); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIThumbnail); + return IWICBitmapFrameDecode_QueryInterface(iface, &IID_IWICBitmapSource, (void **)ppIThumbnail); } static const IWICBitmapFrameDecodeVtbl IcoFrameDecode_Vtbl = { diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index e9c0a48..c53739d 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -133,17 +133,24 @@ static void test_bad_icondirentry_size(void) if (SUCCEEDED(hr)) { - UINT width = 0, height = 0; - IWICBitmapSource *thumbnail = NULL; + UINT width, height; + IWICBitmapSource *thumbnail; + width = height = 0; hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); - todo_wine ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); - - if (thumbnail) IWICBitmapSource_Release(thumbnail); + ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); + if (hr == S_OK) + { + width = height = 0; + hr = IWICBitmapSource_GetSize(thumbnail, &width, &height); + ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); + ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + IWICBitmapSource_Release(thumbnail); + } IWICBitmapFrameDecode_Release(framedecode); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013