August 2009 - Wine-commits - list.winehq.org

Juan Lang : wine.inf: Add a fake DLL entry for windowscodecs.dll.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 1b5ea4a9540edefb88a775f27ede1bea513d981b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5ea4a9540edefb88a775f27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 17 12:15:42 2009 -0700 wine.inf: Add a fake DLL entry for windowscodecs.dll. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 184a967..28baf76 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2519,6 +2519,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,urlmon.dll 11,,user32.dll 11,,version.dll +11,,windowscodecs.dll 11,,winebrowser.exe 11,,winhlp32.exe 11,,wininet.dll

1 0

Frédéric Delanoy : wineconsole: Fix French translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: c566c719fb61d380b6336a94b99965a1ea857d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c566c719fb61d380b6336a94b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 17 19:55:24 2009 +0200 wineconsole: Fix French translation. --- programs/wineconsole/wineconsole_Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc index 330436b..99aace4 100644 --- a/programs/wineconsole/wineconsole_Fr.rc +++ b/programs/wineconsole/wineconsole_Fr.rc @@ -38,7 +38,7 @@ IDS_SCROLL, "&Défiler" IDS_SEARCH, "C&hercher" IDS_FNT_DISPLAY, "Chaque caractère a %ld pixels de largeur et %ld pixels de hauteur" IDS_FNT_PREVIEW_1, "Ceci est un test" -IDS_FNT_PREVIEW_2, "éèàôë" +IDS_FNT_PREVIEW_2, "" IDS_DLG_TIT_DEFAULT, "Configuration par défaut" IDS_DLG_TIT_CURRENT, "Configuration courante" IDS_DLG_TIT_ERROR, "Erreur de configuration"

1 0

Frédéric Delanoy : winecfg: Update French translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 2cee5c73bcb5bbed9ed3e5d4470ba1b7719aa2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cee5c73bcb5bbed9ed3e5d44… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 17 19:49:06 2009 +0200 winecfg: Update French translation. --- programs/winecfg/Fr.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 52c9888..a9184f9 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -126,6 +126,16 @@ BEGIN PUSHBUTTON "Annuler",IDCANCEL,72,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Sélectionnez la lettre du lecteur" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Annuler",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 266 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg"

1 0

André Hentschel : winecfg: Update German translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 53a74cdd42b393b64c3485e6f2847a49e30a0a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a74cdd42b393b64c3485e6f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 17 19:21:35 2009 +0200 winecfg: Update German translation. --- programs/winecfg/De.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index dda4d98..aadd21e 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -124,6 +124,16 @@ BEGIN PUSHBUTTON "Abbrechen",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 185, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Laufwerksbuchstaben wählen" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,115,10,45,14,WS_GROUP + PUSHBUTTON "Abbrechen",IDCANCEL,115,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg"

1 0

Vladimir Pankratov : wininet: Update Russian translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 6ec190e55ca7f25723d68bcfb041ec0256ab78b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec190e55ca7f25723d68bcfb… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Aug 18 13:21:20 2009 +0500 wininet: Update Russian translation. --- dlls/wininet/wininet_Ru.rc | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/wininet_Ru.rc b/dlls/wininet/wininet_Ru.rc index 0e09f84..8d35fe4 100644 --- a/dlls/wininet/wininet_Ru.rc +++ b/dlls/wininet/wininet_Ru.rc @@ -45,6 +45,26 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Отмена", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } +IDD_AUTHDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Требуется идентификация" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Введите имя пользователя и пароль:", -1, 40, 6, 150, 15 + LTEXT "Сервер", -1, 40, 26, 50, 10 + LTEXT "Домен", -1, 40, 46, 50, 10 + LTEXT "Пользователь", -1, 40, 66, 50, 10 + LTEXT "Пароль", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Сохранить этот пароль (небезопасно)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Отмена", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + STRINGTABLE DISCARDABLE { IDS_LANCONNECTION "Сетевое подключение"

1 0

Vladimir Pankratov : winecfg: Update Russian translation.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: ab3b0169f71b1514b7839ae4556937c01930d429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3b0169f71b1514b7839ae45… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Aug 18 13:15:10 2009 +0500 winecfg: Update Russian translation. --- programs/winecfg/Ru.rc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 7293cbc..38b4546 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -129,6 +129,16 @@ BEGIN PUSHBUTTON "Отмена",IDCANCEL,57,74,45,14,WS_GROUP END +IDD_DRIVECHOOSE DIALOG DISCARDABLE 60, 70, 170, 60 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Выберите букву диска" +FONT 8, "MS Shell Dlg" +BEGIN + COMBOBOX IDC_DRIVESA2Z,15,10,75,230,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,105,10,45,14,WS_GROUP + PUSHBUTTON "Отмена",IDCANCEL,105,30,45,14,WS_GROUP +END + IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg"

1 0

Vladimir Pankratov : mshtml: Add test for OmNavigator_get_appName.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 33fe602bcdfd0a2ef5702f3dfda59a9708ca545d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33fe602bcdfd0a2ef5702f3df… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Aug 18 13:15:41 2009 +0500 mshtml: Add test for OmNavigator_get_appName. --- dlls/mshtml/tests/dom.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 87581f1..8bf29a8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2446,6 +2446,12 @@ static void test_navigator(IHTMLDocument2 *doc) SysFreeString(bstr); bstr = NULL; + hres = IOmNavigator_get_appName(navigator, &bstr); + ok(hres == S_OK, "get_appName failed: %08x\n", hres); + ok(!strcmp_wa(bstr, "Microsoft Internet Explorer"), "Unexpected appCodeName %s\n", dbgstr_w(bstr)); + SysFreeString(bstr); + + bstr = NULL; hres = IOmNavigator_get_platform(navigator, &bstr); ok(hres == S_OK, "get_platform failed: %08x\n", hres); #ifdef _WIN64

1 0

Vladimir Pankratov : mshtml: Implement OmNavigator_get_appName.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: ecd7c11b5df65393e39796876f158679d302853d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd7c11b5df65393e39796876… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Aug 18 13:15:34 2009 +0500 mshtml: Implement OmNavigator_get_appName. --- dlls/mshtml/omnavigator.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e86537f..7479180 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -139,8 +139,19 @@ static HRESULT WINAPI OmNavigator_get_appCodeName(IOmNavigator *iface, BSTR *p) static HRESULT WINAPI OmNavigator_get_appName(IOmNavigator *iface, BSTR *p) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const WCHAR app_nameW[] = + {'M','i','c','r','o','s','o','f','t',' ', + 'I','n','t','e','r','n','e','t',' ', + 'E','x','p','l','o','r','e','r',0}; + + TRACE("(%p)->(%p)\n", This, p); + + *p = SysAllocString(app_nameW); + if(!*p) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p)

1 0

Alexandre Julliard : wine.inf: Specify the source module for 16-bit fake dlls.
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: b392362fd5477935736267cf68004d3f5c5ae58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b392362fd5477935736267cf6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 11:38:36 2009 +0200 wine.inf: Specify the source module for 16-bit fake dlls. --- tools/wine.inf.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 6aff0b4..184a967 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2447,7 +2447,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,,notepad.exe 10,,regedit.exe 10,,twain_32.dll -10,,winhelp.exe +10,,winhelp.exe,winhelp.exe16 10,,winhlp32.exe 10,command,start.exe 11,,actxprxy.dll @@ -2463,7 +2463,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,d3d8.dll 11,,d3d9.dll 11,,dbghelp.dll -11,,ddeml.dll +11,,ddeml.dll,ddeml.dll16 11,,ddhelp.exe 11,,ddraw.dll 11,,dinput8.dll

1 0

Alexandre Julliard : setupapi: Copy the pre-compiled fake dll files instead of generating them if possible .
by Alexandre Julliard 18 Aug '09

18 Aug '09

Module: wine Branch: master Commit: 38fe0827a1f25597e5fe5ef5a2b13a663b469b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fe0827a1f25597e5fe5ef5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 18 11:38:22 2009 +0200 setupapi: Copy the pre-compiled fake dll files instead of generating them if possible. --- dlls/setupapi/fakedll.c | 123 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e6eddf1..51d7790 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -18,7 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> +#include <fcntl.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #define NONAMELESSSTRUCT #define NONAMELESSUNION @@ -30,6 +40,7 @@ #include "winnt.h" #include "winternl.h" #include "wine/unicode.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -297,14 +308,107 @@ static void create_directories( const WCHAR *name ) HeapFree(GetProcessHeap(), 0, path); } +static inline char *prepend( char *buffer, const char *str, size_t len ) +{ + return memcpy( buffer - len, str, len ); +} + +/* try to load a pre-compiled fake dll */ +static void *load_fake_dll( const WCHAR *name, unsigned int *size, void *buf, unsigned int buf_size ) +{ + const char *build_dir = wine_get_build_dir(); + const char *path; + struct stat st; + char *file, *ptr, *buffer = NULL; + unsigned int i, pos, len, namelen, maxlen = 0; + WCHAR *p; + int fd; + + if ((p = strrchrW( name, '\\' ))) name = p + 1; + + i = 0; + if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + strlenW(name); + while ((path = wine_dll_enum_load_path( i++ ))) maxlen = max( maxlen, strlen(path) ); + maxlen += sizeof("/fakedlls") + strlenW(name) + 2; + + if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen ))) return NULL; + + len = strlenW( name ); + pos = maxlen - len - sizeof(".fake"); + for (i = 0; i < len; i++) + { + /* we don't want to depend on the current codepage here */ + char c = name[i]; + if (name[i] > 127) goto done; + if (c >= 'A' && c <= 'Z') c += 'a' - 'A'; + file[pos + i] = c; + } + file[--pos] = '/'; + + if (build_dir) + { + strcpy( file + pos + len + 1, ".fake" ); + + /* try as a dll */ + ptr = file + pos; + namelen = len + 1; + if (namelen > 4 && !memcmp( ptr + namelen - 4, ".dll", 4 )) namelen -= 4; + ptr = prepend( ptr, ptr, namelen ); + ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); + ptr = prepend( ptr, build_dir, strlen(build_dir) ); + if ((fd = open( ptr, O_RDONLY | O_BINARY )) != -1) goto found; + + /* now as a program */ + ptr = file + pos; + namelen = len + 1; + if (namelen > 4 && !memcmp( ptr + namelen - 4, ".exe", 4 )) namelen -= 4; + ptr = prepend( ptr, ptr, namelen ); + ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); + ptr = prepend( ptr, build_dir, strlen(build_dir) ); + if ((fd = open( ptr, O_RDONLY | O_BINARY )) != -1) goto found; + } + + file[pos + len + 1] = 0; + for (i = 0; (path = wine_dll_enum_load_path( i )); i++) + { + ptr = prepend( file + pos, "/fakedlls", sizeof("/fakedlls") - 1 ); + ptr = prepend( ptr, path, strlen(path) ); + if ((fd = open( ptr, O_RDONLY | O_BINARY )) != -1) goto found; + } + +found: + if (!fstat( fd, &st )) + { + *size = st.st_size; + if (st.st_size <= buf_size) buffer = buf; + else buffer = HeapAlloc( GetProcessHeap(), 0, st.st_size ); + if (buffer) + { + if (read( fd, buffer, st.st_size ) != st.st_size) + { + if (buffer != buf) HeapFree( GetProcessHeap(), 0, buffer ); + buffer = NULL; + } + else TRACE( "found %s %u bytes\n", ptr, *size); + } + } + close( fd ); + +done: + HeapFree( GetProcessHeap(), 0, file ); + return buffer; +} + /*********************************************************************** * create_fake_dll */ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) { HANDLE h; - HMODULE module; BOOL ret; + unsigned int size = 0; + char *temp_buffer[4096]; + void *buffer; /* check for empty name which means to only create the directory */ if (name[strlenW(name) - 1] == '\\') @@ -339,12 +443,23 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) } } - module = LoadLibraryW( source ); + if ((buffer = load_fake_dll( source, &size, temp_buffer, sizeof(temp_buffer) ))) + { + DWORD written; - ret = build_fake_dll( h, module ); + ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size); + if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() ); + if (buffer != temp_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + } + else + { + HMODULE module = LoadLibraryW( source ); + WARN( "fake dll %s not found for %s\n", debugstr_w(source), debugstr_w(name) ); + ret = build_fake_dll( h, module ); + if (module) FreeLibrary( module ); + } CloseHandle( h ); - if (module) FreeLibrary( module ); if (!ret) DeleteFileW( name ); return ret; }

1 0