February 2006 - Wine-Commits

Francois Gouget : textserv.h: Add missing CreateTextServices() prototype.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 81ba96379b034c15b2c75c9f409e7aced2d40cf7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81ba96379b034c15b2c75c9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 7 21:18:02 2006 +0100 textserv.h: Add missing CreateTextServices() prototype. --- include/textserv.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/textserv.h b/include/textserv.h index ffd9581..2d0876b 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -420,6 +420,10 @@ DECLARE_INTERFACE_(ITextHost,IUnknown) #undef INTERFACE +HRESULT WINAPI CreateTextServices(IUnknown*,ITextHost*,IUnknown**); + +typedef HRESULT (WINAPI *PCreateTextServices)(IUnknown*,ITextHost*,IUnknown**); + #ifdef __cplusplus } #endif

1 0

Francois Gouget : ntdll: Protect sys/stat.h inclusion.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: f8ed165609df0ed8b358611c148fb0008520aad7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8ed165609df0ed8b358611… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 7 21:17:45 2006 +0100 ntdll: Protect sys/stat.h inclusion. --- dlls/ntdll/virtual.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e74b3e0..c33dce6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -35,9 +35,11 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#include <sys/stat.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> +# include <sys/mman.h> #endif #define NONAMELESSUNION

1 0

Francois Gouget : winapi: Update win32.api to match the current sources.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 8ff21ff88f73d1c2c8d7940d4011e3a0e86d3001 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ff21ff88f73d1c2c8d7940… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 7 21:17:32 2006 +0100 winapi: Update win32.api to match the current sources. --- tools/winapi/win32.api | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index e5a7df8..c0ad8c3 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -637,13 +637,16 @@ PCCTL_CONTEXT PCCTL_CONTEXT * PCERT_EXTENSION PCERT_INFO +PCERT_NAME_BLOB PCERT_NAME_INFO PCERT_PUBLIC_KEY_INFO PCERT_RDN_ATTR +PCERT_RDN_VALUE_BLOB PCRYPT_ALGORITHM_IDENTIFIER PCRYPT_ATTRIBUTE PCRYPT_DECODE_PARA PCRYPT_ENCODE_PARA +PFN_CRYPT_ENUM_OID_INFO PVOID SIP_ADD_NEWPROVIDER * SIP_DISPATCH_INFO * @@ -2205,6 +2208,7 @@ LANGID MSICOLINFO MSICONDITION MSIDBERROR +MSIDBSTATE MSIHANDLE MSIMODIFY MSIRUNMODE @@ -2352,6 +2356,7 @@ WORD ** char ** char *** cxx_exception_type * +double * exception * free_func_t int (*)(void *, void *) @@ -2398,7 +2403,6 @@ void %wstr MSVCRT_wchar_t * -WCHAR * %%msvcrt20.dll @@ -3113,6 +3117,7 @@ LPDWORD LPFONTDESC LPOCPFIPARAMS LPPICTDESC +LPSAFEARRAY * LPSTREAM LPSYSTEMTIME LPUNKNOWN @@ -3467,9 +3472,9 @@ WPARAM %ptr +ITextHost * IUnknown * IUnknown ** -void * %%riched32.dll @@ -3546,6 +3551,8 @@ RPC_MGR_EPV * RPC_STATUS * UUID * UUID_VECTOR * +struct IRpcChannelBuffer * +struct IRpcStubBuffer * unsigned char * unsigned char ** unsigned long * @@ -4288,6 +4295,7 @@ POINT %ptr +BLENDFUNCTION * BOOL * COLORREF * DESKTOPENUMPROCA @@ -4366,6 +4374,7 @@ RECT * SCROLLINFO * SECURITY_QUALITY_OF_SERVICE * SENDASYNCPROC +SIZE * TIMERPROC TRACKMOUSEEVENT * UINT *

1 0

Dmitry Timoshkov : wine.inf: Add a default handler for https to the registry.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: ae6187455e8c920e95ed921a516236b9749c730b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae6187455e8c920e95ed921… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 7 21:17:17 2006 +0100 wine.inf: Add a default handler for https to the registry. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index cd1f625..d5c4112 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -110,6 +110,7 @@ HKCR,Msi.Package\shell\Uninstall\command HKCR,txtfile\shell\open\command,,,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,,"%11%\notepad.exe /p %1" HKCR,http\shell\open\command,,,"winebrowser" +HKCR,https\shell\open\command,,,"winebrowser" HKCR,mailto\shell\open\command,,,"winebrowser %1" ; FIXME: the following should be done by the dll registration HKCR,AVIFile\Compressors\auds,,,"{0002000F-0000-0000-C000-000000000046}"

1 0

Dmitry Timoshkov : kernel32: Implement EnumUILanguages.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: e6a734a9795d623c459ed461ef46524005aa64ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6a734a9795d623c459ed46… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 7 21:17:06 2006 +0100 kernel32: Implement EnumUILanguages. --- dlls/kernel/locale.c | 71 ++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 57 insertions(+), 14 deletions(-) diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c index cf65b4a..80293ac 100644 --- a/dlls/kernel/locale.c +++ b/dlls/kernel/locale.c @@ -1784,7 +1784,7 @@ BOOL WINAPI IsValidLocale( LCID lcid, DW static BOOL CALLBACK enum_lang_proc_a( HMODULE hModule, LPCSTR type, - LPCSTR name, WORD LangID, LONG lParam ) + LPCSTR name, WORD LangID, LONG_PTR lParam ) { LOCALE_ENUMPROCA lpfnLocaleEnum = (LOCALE_ENUMPROCA)lParam; char buf[20]; @@ -1794,7 +1794,7 @@ static BOOL CALLBACK enum_lang_proc_a( H } static BOOL CALLBACK enum_lang_proc_w( HMODULE hModule, LPCWSTR type, - LPCWSTR name, WORD LangID, LONG lParam ) + LPCWSTR name, WORD LangID, LONG_PTR lParam ) { static const WCHAR formatW[] = {'%','0','8','x',0}; LOCALE_ENUMPROCW lpfnLocaleEnum = (LOCALE_ENUMPROCW)lParam; @@ -3184,12 +3184,46 @@ BOOL WINAPI SetUserGeoID( GEOID GeoID ) return FALSE; } +typedef struct +{ + union + { + UILANGUAGE_ENUMPROCA procA; + UILANGUAGE_ENUMPROCW procW; + } u; + DWORD flags; + LONG_PTR param; +} ENUM_UILANG_CALLBACK; + +static BOOL CALLBACK enum_uilang_proc_a( HMODULE hModule, LPCSTR type, + LPCSTR name, WORD LangID, LONG_PTR lParam ) +{ + ENUM_UILANG_CALLBACK *enum_uilang = (ENUM_UILANG_CALLBACK *)lParam; + char buf[20]; + + sprintf(buf, "%08x", (UINT)LangID); + return enum_uilang->u.procA( buf, enum_uilang->param ); +} + +static BOOL CALLBACK enum_uilang_proc_w( HMODULE hModule, LPCWSTR type, + LPCWSTR name, WORD LangID, LONG_PTR lParam ) +{ + static const WCHAR formatW[] = {'%','0','8','x',0}; + ENUM_UILANG_CALLBACK *enum_uilang = (ENUM_UILANG_CALLBACK *)lParam; + WCHAR buf[20]; + + sprintfW( buf, formatW, (UINT)LangID ); + return enum_uilang->u.procW( buf, enum_uilang->param ); +} + /****************************************************************************** * EnumUILanguagesA (KERNEL32.@) */ BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ENUMPROCA pUILangEnumProc, DWORD dwFlags, LONG_PTR lParam) { - static char value[] = "0409"; + ENUM_UILANG_CALLBACK enum_uilang; + + TRACE("%p, %lx, %lx\n", pUILangEnumProc, dwFlags, lParam); if(!pUILangEnumProc) { SetLastError(ERROR_INVALID_PARAMETER); @@ -3200,11 +3234,14 @@ BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ return FALSE; } - FIXME("%p, %lx, %lx calling pUILangEnumProc with %s\n", - pUILangEnumProc, dwFlags, lParam, debugstr_a(value)); - - pUILangEnumProc( value, lParam ); - return(TRUE); + enum_uilang.u.procA = pUILangEnumProc; + enum_uilang.flags = dwFlags; + enum_uilang.param = lParam; + + EnumResourceLanguagesA( kernel32_handle, (LPCSTR)RT_STRING, + (LPCSTR)LOCALE_ILANGUAGE, enum_uilang_proc_a, + (LONG_PTR)&enum_uilang); + return TRUE; } /****************************************************************************** @@ -3212,7 +3249,10 @@ BOOL WINAPI EnumUILanguagesA(UILANGUAGE_ */ BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ENUMPROCW pUILangEnumProc, DWORD dwFlags, LONG_PTR lParam) { - static WCHAR value[] = {'0','4','0','9',0}; + ENUM_UILANG_CALLBACK enum_uilang; + + TRACE("%p, %lx, %lx\n", pUILangEnumProc, dwFlags, lParam); + if(!pUILangEnumProc) { SetLastError(ERROR_INVALID_PARAMETER); @@ -3223,11 +3263,14 @@ BOOL WINAPI EnumUILanguagesW(UILANGUAGE_ return FALSE; } - FIXME("%p, %lx, %lx calling pUILangEnumProc with %s\n", - pUILangEnumProc, dwFlags, lParam, debugstr_w(value)); - - pUILangEnumProc( value, lParam ); - return(TRUE); + enum_uilang.u.procW = pUILangEnumProc; + enum_uilang.flags = dwFlags; + enum_uilang.param = lParam; + + EnumResourceLanguagesW( kernel32_handle, (LPCWSTR)RT_STRING, + (LPCWSTR)LOCALE_ILANGUAGE, enum_uilang_proc_w, + (LONG_PTR)&enum_uilang); + return TRUE; } INT WINAPI GetGeoInfoW(GEOID GeoId, GEOTYPE GeoType, LPWSTR lpGeoData,

1 0

Dmitry Timoshkov : x11drv: Copy the whole image at once if appropriate.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 729eaa6920a672acc0d8b682bcc9336b8575a364 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=729eaa6920a672acc0d8b68… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 7 21:16:56 2006 +0100 x11drv: Copy the whole image at once if appropriate. --- dlls/x11drv/dib_convert.c | 30 +++++++++++++++++++++++++++--- 1 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/dib_convert.c b/dlls/x11drv/dib_convert.c index 185d64e..b504843 100644 --- a/dlls/x11drv/dib_convert.c +++ b/dlls/x11drv/dib_convert.c @@ -75,8 +75,16 @@ static void convert_5x5_asis(int width, { int y; + width *= 2; + + if (srclinebytes == dstlinebytes && srclinebytes == width) + { + memcpy(dstbits, srcbits, height * width); + return; + } + for (y=0; y<height; y++) { - memcpy(dstbits, srcbits, width*2); + memcpy(dstbits, srcbits, width); srcbits = (const char*)srcbits + srclinebytes; dstbits = (char*)dstbits + dstlinebytes; } @@ -563,8 +571,16 @@ static void convert_888_asis(int width, { int y; + width *= 3; + + if (srclinebytes == dstlinebytes && srclinebytes == width) + { + memcpy(dstbits, srcbits, height * width); + return; + } + for (y=0; y<height; y++) { - memcpy(dstbits, srcbits, width*3); + memcpy(dstbits, srcbits, width); srcbits = (const char*)srcbits + srclinebytes; dstbits = (char*)dstbits + dstlinebytes; } @@ -953,8 +969,16 @@ static void convert_0888_asis(int width, { int y; + width *= 4; + + if (srclinebytes == dstlinebytes && srclinebytes == width) + { + memcpy(dstbits, srcbits, height * width); + return; + } + for (y=0; y<height; y++) { - memcpy(dstbits, srcbits, width*4); + memcpy(dstbits, srcbits, width); srcbits = (const char*)srcbits + srclinebytes; dstbits = (char*)dstbits + dstlinebytes; }

1 0

Fatih Aşıcı : x11drv: Fix Turkish keyboard layouts.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 2cba6e32a87fe8683804483c801d18e9cc9dc299 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2cba6e32a87fe8683804483… Author: Fatih Aşıcı <fasici(a)linux-sevenler.org> Date: Tue Feb 7 21:16:42 2006 +0100 x11drv: Fix Turkish keyboard layouts. --- dlls/x11drv/keyboard.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index f645b70..92ae311 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -793,8 +793,8 @@ static const char main_key_TK[MAIN_LEN][ static const char main_key_TR[MAIN_LEN][4] = { "\"\\","1!","2'","3^","4+","5%","6&","7/","8(","9)","0=","*?","-_", -"qQ","wW","eE","rR","tT","yY","uU","�I","oO","pP","��","��", -"aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","i�",",;", +"qQ","wW","eE","rR","tT","yY","uU","\xb9I","oO","pP","\xbb\xab","��", +"aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xba\xaa","i\0",",;", "zZ","xX","cC","vV","bB","nN","mM","��","��",".:", "<>" }; @@ -803,8 +803,8 @@ static const char main_key_TR[MAIN_LEN][ static const char main_key_TR_F[MAIN_LEN][4] = { "+*","1!","2\"","3^#","4$","5%","6&","7'","8(","9)","0=","/?","-_", -"fF","gG","��","�I","oO","dD","rR","nN","hH","pP","qQ","wW", -"uU","i�","eE","aA","��","tT","kK","mM","lL","yY","��","xX", +"fF","gG","\xbb\xab","\xb9I","oO","dD","rR","nN","hH","pP","qQ","wW", +"uU","i\0","eE","aA","��","tT","kK","mM","lL","yY","\xba\xaa","xX", "jJ","��","vV","cC","��","zZ","sS","bB",".:",",;", "<>" };

1 0

Alexandre Julliard : ntdll: Support loading a builtin dll by specifying an explicit path to
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: a458f3e538f925b60e2668efb2b3db7e1c8bf027 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a458f3e538f925b60e2668e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 7 21:16:25 2006 +0100 ntdll: Support loading a builtin dll by specifying an explicit path to the .so file. --- dlls/ntdll/loader.c | 141 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 107 insertions(+), 34 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c2e2f36..c72646a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -77,6 +77,7 @@ typedef struct _wine_modref struct builtin_load_info { const WCHAR *load_path; + const WCHAR *filename; NTSTATUS status; WINE_MODREF *wm; }; @@ -1194,6 +1195,48 @@ NTSTATUS WINAPI LdrGetProcedureAddress(H /*********************************************************************** + * get_builtin_fullname + * + * Build the full pathname for a builtin dll. + */ +static WCHAR *get_builtin_fullname( const WCHAR *path, const char *filename ) +{ + static const WCHAR soW[] = {'.','s','o',0}; + WCHAR *p, *fullname; + size_t i, len = strlen(filename); + + /* check if path can correspond to the dll we have */ + if (path && (p = strrchrW( path, '\\' ))) + { + p++; + for (i = 0; i < len; i++) + if (tolowerW(p[i]) != tolowerW( (WCHAR)filename[i]) ) break; + if (i == len && (!p[len] || !strcmpiW( p + len, soW ))) + { + /* the filename matches, use path as the full path */ + len += p - path; + if ((fullname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + { + memcpy( fullname, path, len * sizeof(WCHAR) ); + fullname[len] = 0; + } + return fullname; + } + } + + if ((fullname = RtlAllocateHeap( GetProcessHeap(), 0, + system_dir.MaximumLength + (len + 1) * sizeof(WCHAR) ))) + { + memcpy( fullname, system_dir.Buffer, system_dir.Length ); + p = fullname + system_dir.Length / sizeof(WCHAR); + if (p > fullname && p[-1] != '\\') *p++ = '\\'; + ascii_to_unicode( p, filename, len + 1 ); + } + return fullname; +} + + +/*********************************************************************** * load_builtin_callback * * Load a library in memory; callback function for wine_dll_register @@ -1204,7 +1247,7 @@ static void load_builtin_callback( void void *addr; IMAGE_NT_HEADERS *nt; WINE_MODREF *wm; - WCHAR *fullname, *p; + WCHAR *fullname; const WCHAR *load_path; if (!module) @@ -1233,17 +1276,12 @@ static void load_builtin_callback( void /* create the MODREF */ - if (!(fullname = RtlAllocateHeap( GetProcessHeap(), 0, - system_dir.MaximumLength + (strlen(filename) + 1) * sizeof(WCHAR) ))) + if (!(fullname = get_builtin_fullname( builtin_load_info->filename, filename ))) { ERR( "can't load %s\n", filename ); builtin_load_info->status = STATUS_NO_MEMORY; return; } - memcpy( fullname, system_dir.Buffer, system_dir.Length ); - p = fullname + system_dir.Length / sizeof(WCHAR); - if (p > fullname && p[-1] != '\\') *p++ = '\\'; - ascii_to_unicode( p, filename, strlen(filename) + 1 ); wm = alloc_module( module, fullname ); RtlFreeHeap( GetProcessHeap(), 0, fullname ); @@ -1385,13 +1423,14 @@ static NTSTATUS load_native_dll( LPCWSTR /*********************************************************************** * load_builtin_dll */ -static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, DWORD flags, WINE_MODREF** pwm ) +static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file, + DWORD flags, WINE_MODREF** pwm ) { char error[256], dllname[MAX_PATH]; int file_exists; const WCHAR *name, *p; DWORD len, i; - void *handle; + void *handle = NULL; struct builtin_load_info info, *prev_info; /* Fix the name in case we have a full path and extension */ @@ -1399,28 +1438,53 @@ static NTSTATUS load_builtin_dll( LPCWST if ((p = strrchrW( name, '\\' ))) name = p + 1; if ((p = strrchrW( name, '/' ))) name = p + 1; - /* we don't want to depend on the current codepage here */ - len = strlenW( name ) + 1; - if (len >= sizeof(dllname)) return STATUS_NAME_TOO_LONG; - for (i = 0; i < len; i++) - { - if (name[i] > 127) return STATUS_DLL_NOT_FOUND; - dllname[i] = (char)name[i]; - if (dllname[i] >= 'A' && dllname[i] <= 'Z') dllname[i] += 'a' - 'A'; - } - /* load_library will modify info.status. Note also that load_library can be * called several times, if the .so file we're loading has dependencies. * info.status will gather all the errors we may get while loading all these * libraries */ info.load_path = load_path; + info.filename = NULL; info.status = STATUS_SUCCESS; info.wm = NULL; - prev_info = builtin_load_info; - builtin_load_info = &info; - handle = wine_dll_load( dllname, error, sizeof(error), &file_exists ); - builtin_load_info = prev_info; + + if (file) /* we have a real file, try to load it */ + { + UNICODE_STRING nt_name; + ANSI_STRING unix_name; + + if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) + return STATUS_DLL_NOT_FOUND; + + if (!wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE )) + { + file_exists = 1; + prev_info = builtin_load_info; + info.filename = nt_name.Buffer + 4; /* skip \??\ */ + builtin_load_info = &info; + handle = wine_dlopen( unix_name.Buffer, RTLD_NOW, error, sizeof(error) ); + builtin_load_info = prev_info; + RtlFreeHeap( GetProcessHeap(), 0, unix_name.Buffer ); + } + RtlFreeUnicodeString( &nt_name ); + } + else + { + /* we don't want to depend on the current codepage here */ + len = strlenW( name ) + 1; + if (len >= sizeof(dllname)) return STATUS_NAME_TOO_LONG; + for (i = 0; i < len; i++) + { + if (name[i] > 127) return STATUS_DLL_NOT_FOUND; + dllname[i] = (char)name[i]; + if (dllname[i] >= 'A' && dllname[i] <= 'Z') dllname[i] += 'a' - 'A'; + } + + prev_info = builtin_load_info; + builtin_load_info = &info; + handle = wine_dll_load( dllname, error, sizeof(error), &file_exists ); + builtin_load_info = prev_info; + } if (!handle) { @@ -1449,10 +1513,16 @@ static NTSTATUS load_builtin_dll( LPCWST info.wm->ldr.SectionHandle = handle; if (strcmpiW( info.wm->ldr.BaseDllName.Buffer, name )) { - ERR( "loaded .so for %s but got %s instead - probably 16-bit dll\n", - debugstr_w(name), debugstr_w(info.wm->ldr.BaseDllName.Buffer) ); - /* wine_dll_unload( handle );*/ - return STATUS_INVALID_IMAGE_FORMAT; + /* check without .so extension */ + static const WCHAR soW[] = {'.','s','o',0}; + DWORD len = info.wm->ldr.BaseDllName.Length / sizeof(WCHAR); + if (strncmpiW( info.wm->ldr.BaseDllName.Buffer, name, len ) || strcmpiW( name + len, soW )) + { + ERR( "loaded .so for %s but got %s instead - probably 16-bit dll\n", + debugstr_w(name), debugstr_w(info.wm->ldr.BaseDllName.Buffer) ); + /* wine_dll_unload( handle );*/ + return STATUS_INVALID_IMAGE_FORMAT; + } } *pwm = info.wm; return STATUS_SUCCESS; @@ -1576,7 +1646,6 @@ static NTSTATUS load_dll( LPCWSTR load_p WCHAR buffer[32]; WCHAR *filename; ULONG size; - const char *filetype = ""; WINE_MODREF *main_exe; HANDLE handle = 0; NTSTATUS nts; @@ -1626,12 +1695,15 @@ static NTSTATUS load_dll( LPCWSTR load_p TRACE("Trying native dll %s\n", debugstr_w(filename)); if (!handle) continue; /* it cannot possibly be loaded */ nts = load_native_dll( load_path, filename, handle, flags, pwm ); - filetype = "native"; + if (nts == STATUS_INVALID_FILE_FOR_SECTION) + { + /* not in PE format, maybe it's a builtin */ + nts = load_builtin_dll( load_path, filename, handle, flags, pwm ); + } break; case LOADORDER_BI: TRACE("Trying built-in %s\n", debugstr_w(filename)); - nts = load_builtin_dll( load_path, filename, flags, pwm ); - filetype = "builtin"; + nts = load_builtin_dll( load_path, filename, 0, flags, pwm ); break; default: nts = STATUS_INTERNAL_ERROR; @@ -1641,8 +1713,9 @@ static NTSTATUS load_dll( LPCWSTR load_p if (nts == STATUS_SUCCESS) { /* Initialize DLL just loaded */ - TRACE("Loaded module %s (%s) at %p\n", - debugstr_w(filename), filetype, (*pwm)->ldr.BaseAddress); + TRACE("Loaded module %s (%s) at %p\n", debugstr_w(filename), + ((*pwm)->ldr.Flags & LDR_WINE_INTERNAL) ? "builtin" : "native", + (*pwm)->ldr.BaseAddress); /* Set the ldr.LoadCount here so that an attach failure will */ /* decrement the dependencies through the MODULE_FreeLibrary call. */ (*pwm)->ldr.LoadCount = 1; @@ -2169,7 +2242,7 @@ void __wine_process_init( int argc, char /* setup the load callback and create ntdll modref */ wine_dll_set_callback( load_builtin_callback ); - if ((status = load_builtin_dll( NULL, kernel32W, 0, &wm )) != STATUS_SUCCESS) + if ((status = load_builtin_dll( NULL, kernel32W, 0, 0, &wm )) != STATUS_SUCCESS) { MESSAGE( "wine: could not load kernel32.dll, status %lx\n", status ); exit(1);

1 0

Mike McCormack : notepad: Move license text to resources.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 5d5695a2cc9ea04ade937e218bc682ac0a92dc52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d5695a2cc9ea04ade937e2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 7 16:55:01 2006 +0100 notepad: Move license text to resources. --- programs/notepad/En.rc | 24 ++++++++++++++++++ programs/notepad/License_En.c | 28 ---------------------- programs/notepad/Makefile.in | 2 -- programs/notepad/dialog.c | 11 ++++++-- programs/notepad/license.c | 41 -------------------------------- programs/notepad/license.h | 52 ---------------------------------------- programs/notepad/notepad_res.h | 5 ++++ 7 files changed, 37 insertions(+), 126 deletions(-) delete mode 100644 programs/notepad/License_En.c delete mode 100644 programs/notepad/license.c delete mode 100644 programs/notepad/license.h diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index b31e59c..0fd434a 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -127,3 +127,27 @@ task. \nClose one or more applications t memory." } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "LICENSE" +IDS_LICENSE, +"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.\n\ +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.\n\ +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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + +IDS_WARRANTY_CAPTION, "NO WARRANTY" +IDS_WARRANTY, +"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." +} diff --git a/programs/notepad/License_En.c b/programs/notepad/License_En.c deleted file mode 100644 index f8ffe14..0000000 --- a/programs/notepad/License_En.c +++ /dev/null @@ -1,28 +0,0 @@ -#include <windows.h> -#include "license.h" - -static const CHAR LicenseCaption_En[] = "LICENSE"; -static const CHAR License_En[] = -"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.\n" - -"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.\n" - -"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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA"; - -static const CHAR NoWarrantyCaption_En[] = "NO WARRANTY"; -static const CHAR NoWarranty_En[] = -"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."; - -LICENSE WineLicense_En = {License_En, LicenseCaption_En, - NoWarranty_En, NoWarrantyCaption_En}; diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index fc43d36..67026d3 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -10,9 +10,7 @@ MODCFLAGS = @BUILTINFLAG@ EXTRADEFS = -DNO_LIBWINE_PORT C_SRCS = \ - License_En.c \ dialog.c \ - license.c \ main.c RC_SRCS = rsrc.rc diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 28d1b6d..c45a73c 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -28,7 +28,6 @@ #include <commdlg.h> #include "main.h" -#include "license.h" #include "dialog.h" static const WCHAR helpfileW[] = { 'n','o','t','e','p','a','d','.','h','l','p',0 }; @@ -684,12 +683,18 @@ VOID DIALOG_HelpHelp(VOID) VOID DIALOG_HelpLicense(VOID) { - WineLicense(Globals.hMainWnd); + TCHAR cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_LICENSE, text, 1024); + LoadString(Globals.hInstance, IDS_LICENSE_CAPTION, cap, 20); + MessageBox(Globals.hMainWnd, text, cap, MB_ICONINFORMATION | MB_OK); } VOID DIALOG_HelpNoWarranty(VOID) { - WineWarranty(Globals.hMainWnd); + TCHAR cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_WARRANTY, text, 1024); + LoadString(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, 20); + MessageBox(Globals.hMainWnd, text, cap, MB_ICONEXCLAMATION | MB_OK); } VOID DIALOG_HelpAboutWine(VOID) diff --git a/programs/notepad/license.c b/programs/notepad/license.c deleted file mode 100644 index 3c90ca3..0000000 --- a/programs/notepad/license.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Notepad (license.h) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include "license.h" - -VOID WineLicense(HWND Wnd) -{ - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->License, License->LicenseCaption, - MB_ICONINFORMATION | MB_OK); -} - - -VOID WineWarranty(HWND Wnd) -{ - /* FIXME: should load strings from resources */ - LICENSE *License = &WineLicense_En; - MessageBox(Wnd, License->Warranty, License->WarrantyCaption, - MB_ICONEXCLAMATION | MB_OK); -} - diff --git a/programs/notepad/license.h b/programs/notepad/license.h deleted file mode 100644 index 418bb66..0000000 --- a/programs/notepad/license.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Notepad (license.h) - * - * Copyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch> - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -VOID WineLicense(HWND hWnd); -VOID WineWarranty(HWND hWnd); - -typedef struct -{ - LPCSTR License, LicenseCaption; - LPCSTR Warranty, WarrantyCaption; -} LICENSE; - -/* -extern LICENSE WineLicense_Ca; -extern LICENSE WineLicense_Cz; -extern LICENSE WineLicense_Da; -extern LICENSE WineLicense_De; -*/ - -extern LICENSE WineLicense_En; - -/* -extern LICENSE WineLicense_Eo; -extern LICENSE WineLicense_Es; -extern LICENSE WineLicense_Fi; -extern LICENSE WineLicense_Fr; -extern LICENSE WineLicense_Hu; -extern LICENSE WineLicense_It; -extern LICENSE WineLicense_Ko; -extern LICENSE WineLicense_No; -extern LICENSE WineLicense_Pl; -extern LICENSE WineLicense_Po; -extern LICENSE WineLicense_Sw; -extern LICENSE WineLicense_Va; -*/ diff --git a/programs/notepad/notepad_res.h b/programs/notepad/notepad_res.h index e9ad744..11e7551 100644 --- a/programs/notepad/notepad_res.h +++ b/programs/notepad/notepad_res.h @@ -76,3 +76,8 @@ #define STRING_NOTFOUND 0x17B #define STRING_OUT_OF_MEMORY 0x17C + +#define IDS_LICENSE_CAPTION 0x180 +#define IDS_LICENSE 0x181 +#define IDS_WARRANTY_CAPTION 0x182 +#define IDS_WARRANTY 0x183

1 0

Sergei Butakov : ntdll: Added Urals time.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 4f53d5a5b38b82a30cd1c54d8288f139c8a02fe2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f53d5a5b38b82a30cd1c54… Author: Sergei Butakov <butsergej(a)yandex.ru> Date: Tue Feb 7 16:51:51 2006 +0100 ntdll: Added Urals time. --- dlls/ntdll/time.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index d39afdb..79a1967 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -269,9 +269,12 @@ static const struct tagTZ_INFO TZ_INFO[] {"SAMT", {'S','a','m','a','r','a',' ','S','t','a','n','d','a','r','d',' ','T','i', 'm','e','\0'}, -270, 1}, + {"YEKT", + {'U','r','a','l','s',' ','S','t','a','n','d','a','r','d', + ' ','T','i','m','e',' ','(','W','i','n','t','e','r',')','\0'}, -300, 0}, {"YEKST", - {'E','k','a','t','e','r','i','n','b','u','r','g',' ','S','t','a','n','d', - 'a','r','d',' ','T','i','m','e','\0'}, -360, 1}, + {'U','r','a','l','s',' ','D','a','y','l','i','g','h','t', + ' ','T','i','m','e',' ','(','S','u','m','m','e','r',')','\0'}, -360, 1}, {"PKT", {'W','e','s','t',' ','A','s','i','a',' ','S','t','a','n','d','a','r','d', ' ','T','i','m','e','\0'}, -300, 0},

1 0