December 2008 - Wine-commits

Alexandre Julliard : secur32: Check for lack of fork() support.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 866240d4fd948598e06945a4327176403a736ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866240d4fd948598e06945a43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 18:04:39 2008 +0100 secur32: Check for lack of fork() support. --- dlls/secur32/dispatcher.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 5707e6a..91f425c 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, char* const argv[]) { +#ifdef HAVE_FORK int pipe_in[2]; int pipe_out[2]; int i; @@ -132,6 +133,10 @@ SECURITY_STATUS fork_helper(PNegoHelper *new_helper, const char *prog, } return SEC_E_OK; +#else + ERR( "no fork support on this platform\n" ); + return SEC_E_INTERNAL_ERROR; +#endif } static SECURITY_STATUS read_line(PNegoHelper helper, int *offset_len)

1 0

Alexandre Julliard : ws2_32: Added implementation for inet_ntop.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: bc85fb4cd3b091678b79e8416dfe573e98aee1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc85fb4cd3b091678b79e8416… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 19:40:08 2008 +0100 ws2_32: Added implementation for inet_ntop. --- configure | 2 ++ configure.ac | 1 + dlls/ws2_32/socket.c | 24 ++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/config.h.in | 3 +++ 5 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 43ea106..2cc3711 100755 --- a/configure +++ b/configure @@ -17792,6 +17792,7 @@ esac + for ac_func in \ _pclose \ _popen \ @@ -17824,6 +17825,7 @@ for ac_func in \ gettid \ gettimeofday \ getuid \ + inet_ntop \ inet_pton \ kqueue \ lstat \ diff --git a/configure.ac b/configure.ac index 400011c..8ace1cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1387,6 +1387,7 @@ AC_CHECK_FUNCS(\ gettid \ gettimeofday \ getuid \ + inet_ntop \ inet_pton \ kqueue \ lstat \ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 14f357f..5b748c8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4555,6 +4555,30 @@ int WINAPI WSARemoveServiceClass(LPGUID info) } /*********************************************************************** + * inet_ntop (WS2_32.@) + */ +PCSTR WINAPI WS_inet_ntop( INT family, PVOID addr, PSTR buffer, size_t len ) +{ +#ifdef HAVE_INET_NTOP + union generic_unix_sockaddr unix_addr; + + switch (family) + { + case WS_AF_INET: + ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in), &unix_addr ); + return inet_ntop( AF_INET, &unix_addr, buffer, len ); + case WS_AF_INET6: + ws_sockaddr_ws2u( addr, sizeof(struct WS_sockaddr_in6), &unix_addr ); + return inet_ntop( AF_INET6, &unix_addr, buffer, len ); + } +#else + FIXME( "not supported on this platform\n" ); +#endif + WSASetLastError( WSAEAFNOSUPPORT ); + return NULL; +} + +/*********************************************************************** * WSAStringToAddressA (WS2_32.80) */ INT WINAPI WSAStringToAddressA(LPSTR AddressString, diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index bbcafc0..74e71be 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -117,3 +117,4 @@ @ stdcall freeaddrinfo(ptr) WS_freeaddrinfo @ stdcall getaddrinfo(str str ptr ptr) WS_getaddrinfo @ stdcall getnameinfo(ptr long ptr long ptr long long) WS_getnameinfo +@ stdcall inet_ntop(long ptr ptr long) WS_inet_ntop diff --git a/include/config.h.in b/include/config.h.in index 4aafaed..1753e41 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -249,6 +249,9 @@ /* Define to 1 if you have the `inet_network' function. */ #undef HAVE_INET_NETWORK +/* Define to 1 if you have the `inet_ntop' function. */ +#undef HAVE_INET_NTOP + /* Define to 1 if you have the `inet_pton' function. */ #undef HAVE_INET_PTON

1 0

Alexandre Julliard : rpcrt4: Disable TCP/IP connection support if we don' t have socketpair.
by Alexandre Julliard 23 Dec '08

23 Dec '08

Module: wine Branch: master Commit: 8e1b59cb9abd7fc2c54bf02db35e90705f3051de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1b59cb9abd7fc2c54bf02db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 19:55:05 2008 +0100 rpcrt4: Disable TCP/IP connection support if we don't have socketpair. --- configure | 2 ++ configure.ac | 1 + dlls/rpcrt4/rpc_transport.c | 8 ++++++++ include/config.h.in | 3 +++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2cc3711..ab27b58 100755 --- a/configure +++ b/configure @@ -17793,6 +17793,7 @@ esac + for ac_func in \ _pclose \ _popen \ @@ -17848,6 +17849,7 @@ for ac_func in \ sigaltstack \ sigprocmask \ snprintf \ + socketpair \ spawnvp \ statfs \ statvfs \ diff --git a/configure.ac b/configure.ac index 8ace1cb..be295a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1410,6 +1410,7 @@ AC_CHECK_FUNCS(\ sigaltstack \ sigprocmask \ snprintf \ + socketpair \ spawnvp \ statfs \ statvfs \ diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 815ed64..d635d49 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -732,6 +732,8 @@ static RPC_STATUS rpcrt4_ncalrpc_parse_top_of_tower(const unsigned char *tower_d /**** ncacn_ip_tcp support ****/ +#ifdef HAVE_SOCKETPAIR + typedef struct _RpcConnection_tcp { RpcConnection common; @@ -1372,6 +1374,8 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq return 1; } +#endif /* HAVE_SOCKETPAIR */ + static const struct connection_ops conn_protseq_list[] = { { "ncacn_np", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_SMB }, @@ -1399,6 +1403,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncalrpc_get_top_of_tower, rpcrt4_ncalrpc_parse_top_of_tower, }, +#ifdef HAVE_SOCKETPAIR { "ncacn_ip_tcp", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP }, rpcrt4_conn_tcp_alloc, @@ -1412,6 +1417,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_ncacn_ip_tcp_get_top_of_tower, rpcrt4_ncacn_ip_tcp_parse_top_of_tower, } +#endif }; @@ -1435,6 +1441,7 @@ static const struct protseq_ops protseq_list[] = rpcrt4_protseq_np_wait_for_new_connection, rpcrt4_protseq_ncalrpc_open_endpoint, }, +#ifdef HAVE_SOCKETPAIR { "ncacn_ip_tcp", rpcrt4_protseq_sock_alloc, @@ -1444,6 +1451,7 @@ static const struct protseq_ops protseq_list[] = rpcrt4_protseq_sock_wait_for_new_connection, rpcrt4_protseq_ncacn_ip_tcp_open_endpoint, }, +#endif }; #define ARRAYSIZE(a) (sizeof((a)) / sizeof((a)[0])) diff --git a/include/config.h.in b/include/config.h.in index 1753e41..7f3b888 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -663,6 +663,9 @@ /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF +/* Define to 1 if you have the `socketpair' function. */ +#undef HAVE_SOCKETPAIR + /* Define to 1 if you have the <soundcard.h> header file. */ #undef HAVE_SOUNDCARD_H

1 0

Maik Schulz : more german translations for winehq.org
by Jeremy Newman 22 Dec '08

22 Dec '08

Module: website Branch: master Commit: fadc87a968f72bcbe602345332779c91b7a90aaa URL: http://source.winehq.org/git/website.git/?a=commit;h=fadc87a968f72bcbe60234… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Mon Dec 22 00:02:59 2008 +0100 more german translations for winehq.org Another patch... Cheers, -Maik >From 5bd96a2d3fbe3c80443810bcc8896375167c2592 Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Sun, 21 Dec 2008 23:57:38 +0100 Subject: german translations for winehq.org --- templates/de/developer-cheatsheet.template | 642 ++++++++++++++++++++++++++++ templates/de/download.template | 2 +- 2 files changed, 643 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=fadc87a968f72bcbe6…

1 0

Maik Schulz : more german translations for winhq.org
by Jeremy Newman 22 Dec '08

22 Dec '08

Module: website Branch: master Commit: 2e6a77ff771a8dbab31c2a137f646c2ad4541650 URL: http://source.winehq.org/git/website.git/?a=commit;h=2e6a77ff771a8dbab31c2a… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Dec 20 13:33:42 2008 +0100 more german translations for winhq.org Have fun, -Maik >From c5d5f363c6300f1f85dfc28c088993f2e3a83a67 Mon Sep 17 00:00:00 2001 From: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat, 20 Dec 2008 13:30:54 +0100 Subject: german translation --- templates/de/devel.template | 144 +++++++++++++++++++++++++++++++++++++++++++ templates/de/help.template | 107 ++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+), 0 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template new file mode 100644 index 0000000..e4c7e19 --- /dev/null +++ b/templates/de/devel.template @@ -0,0 +1,144 @@ + + + +<h1 class="title">Entwickler-Links</h1> + +<p>Willkommen in der Wine-Entwicklung. Auf dieser Seite findest Du Links auf +Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF" style="margin-left: 20px;"> + + <tr> + <td bgcolor="black"><b style="color: #FFFFFF">Option</b></td> + <td bgcolor="black"><b style="color: #FFFFFF">Über diese Option</b></td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/contributing">Zu Wine beitragen</a> + </td> + <td valign="top"> + Informationen für beginnende Mitarbeiter. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/developer-cheatsheet">Entwickler-Spickzettel</a> + </td> + <td valign="top"> + Fünf-Minuten Einführung in die Wine-Entwicklung + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/docs/winedev-guide/index">Entwicklerhandbuch</a> + </td> + <td valign="top"> + Online verfügbares Handbuch für die Wine-Entwicklung. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/forums">Mailing Listen</a> + </td> + <td valign="top"> + Die meisten unserer Entwickler kommunizieren mittels der verschiedenen Mailing Listen. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="http://wiki.winehq.org/GitWine">GIT</a> + </td> + <td valign="top"> + Wir nutzen Git zur Quellcodeverwaltung. Auf dieser Seite findest Du Informationen über den Umgang damit. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/sending_patches">Patches schicken</a> + </td> + <td valign="top"> + Anleitungen zur Formatierung und zum Senden Deiner Patches. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="http://wiki.winehq.org/TodoList">Aufgabenlisten</a> + </td> + <td valign="top"> + Was getan werden muss. Ein guter Einstieg, um Projekte zu finden, die zu Ende gebracht werden müssen. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/fun_projects">Spaß-Projekte</a> + </td> + <td valign="top"> + Ein weiterer Aufgabenbereich. Diese haben eine niedrigere Priorität und sollten eher als Nebenprojekte + durchgeführt werden. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="http://wiki.winehq.org/JanitorialProjects">Aufräumarbeiten</a> + </td> + <td valign="top"> + Quellcode-Aufräum- und Organisationsprojekte. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/winelib">Winelib</a> + </td> + <td valign="top"> + Dokumentation zur Entwicklung mit Winelib, unseren Werkzeugen zur Anwendungsportierung. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/status">Status</a> + </td> + <td valign="top"> + Status des Wine-Projekts. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/license">Wine-Lizenz</a> + </td> + <td valign="top"> + Wine verwendet die GNU Lesser General Public License 2.1 + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="{$root}/resources">Hilfsmittel</a> + </td> + <td valign="top"> + Weitere Entwicklerhilfsmittel. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td> + <a href="http://wiki.winehq.org/WineConf">WineConf</a> + </td> + <td valign="top"> + Wir halten eine jährliche Konferenz. Informationen zum Wo und Wann findest Du hier. + </td> + </tr> + +</table> + diff --git a/templates/de/help.template b/templates/de/help.template new file mode 100644 index 0000000..cd2d333 --- /dev/null +++ b/templates/de/help.template @@ -0,0 +1,107 @@ + + + +<h1 class="title">Unterstützung</h1> + +<p>Es gibt viele Möglichkeiten, Unterstützung für Wine zu erhalten.</p> + +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> + + <tr> + <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Option</b></td> + <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Mehr zu dieser Option</b></td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://www.codeweavers.com"><img src="{$root}/images/paid.png" /><br />Bezahlt</a> + </td> + <td valign="top"> + <a href="http://www.codeweavers.com">CodeWeavers</a> bietet bezahlte Unterstützung für Wine an. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/FAQ"><img src="{$root}/images/faq.png" /><br />FAQ</a> + </td> + <td valign="top"> + Die meisten Fragen können schnell beantwortet werden, wenn Du unsere + <a href="http://wiki.winehq.org/FAQ">FAQ (en)</a> durchsiehst. Dort solltest Du als + allererstes nachschauen, ob Deine Frage schon beantwortet wurde. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="{$root}/documentation"><img src="{$root}/images/docs.png" /><br />Docs</a> + </td> + <td valign="top"> + Wir empfehlen, dass Du unsere online verfügbare + <a href="{$root}/site/documentation">Dokumentation</a> liest, um die Antwort auf deine + Frage zu finden. Von weiterem Interesse ist unser + <a href="http://wiki.winehq.org/HowTo">HowTo (en)</a>, das nützliche + Informationen für den noch am Anfang stehenden Benutzer bereithält. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png" /><br />Wiki</a> + </td> + <td valign="top"> + Du kannst auch in unserem <a href="http://wiki.winehq.org/">Wiki</a> nachschauen, ob du + eine Antwort auf Deine Frage findest. + </td> + </tr> + +<tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://forums.winehq.org/"><img src="{$root}/images/forum.png" /><br />Forum</a> + </td> + <td valign="top"> + Wir haben eine <a href="http://forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email-basierte (en)</a> + Gemeinschaft von Wine-Anwendern, in der Anwender Fragen stellen und miteinander netzwerken können. Es gibt + mehrere Möglichkeiten, dieser Gemeinschaft beizutreten. Eine Alternative, auf unsere Foren zuzugreifen, ist + die Google Groups Website unter <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine"> + comp.emulators.ms-windows.wine</a>. Des weiteren gibt es die <a href="{$root}/site/forums">Mailing Lists</a>, die + Teil der gleichen Gemeinschaft sind. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="{$root}/irc"><img src="{$root}/images/irc.png" /><br />IRC</a> + </td> + <td valign="top"> + Du kannst mit der Wine Gemeinschaft via Live Chat auf unserem <a href="{$root}/irc">IRC Kanal</a> in Verbindung + treten. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://appdb.winehq.org/"><img src="{$root}/images/appdb.png" /><br />AppDB</a> + </td> + <td valign="top"> + Falls Du Unterstützung für eine bestimmte Anwendung suchst, ist unsere Anwendungsdatenbank + <a href="http://appdb.winehq.org/">AppDB (en)</a> ein guter Anlaufpunkt. + </td> + </tr> + + <tr bgcolor="#ffffff"> + <td align="center" class="small"> + <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png" /><br />Bugzilla</a> + </td> + <td valign="top"> + Unser Bug Tracking-System <a href="http://bugs.winehq.org/">Bugzilla (en)</a> enthält Informationen + zu allen Problemen, an denen wir jemals gearbeitet haben oder gerade arbeiten. + </td> + </tr> + +</table> + +<p>Gibt es Probleme mit unserer Website oder hast Du einen Tippfehler gefunden? Benachrichtige unser +<a href="mailto:web-admin(a)winehq.org">Web Team</a>.</p> + +<p> </p>

1 0

Austin English : website: change party fund to development fund
by Jeremy Newman 22 Dec '08

22 Dec '08

Module: website Branch: master Commit: 6b9b6539b81f356136047c7ae53ee4537de18a6d URL: http://source.winehq.org/git/website.git/?a=commit;h=6b9b6539b81f356136047c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 18 15:03:16 2008 -0600 website: change party fund to development fund We discussed this at WineConf, but apparently it didn't make it into the redesign... -- -Austin --- templates/en/contributing.template | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 5329e43..b2b15d9 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -361,11 +361,11 @@ <li>Contacts to the press preferred, but by no means required</li> </ul> -<h3 id="wpf">Wine Party Fund</h3> +<h3 id="wpf">Wine Development Fund</h3> -<p>The purpose of the Wine Party Fund is to show appreciation to Wine -developers by collecting funds for developer meetings, such as future -Wine Conferences, or in some cases to purchase documentation.</p> +<p>The purpose of the Wine Development Fund is to show appreciation to Wine +developers by collecting funds for developer meetings, such as Wine +Conferences, or in some cases to purchase documentation.</p> <p>The organization that currently manages our donations is the <a href="http://conservancy.softwarefreedom.org/">Software Freedom

1 0

ByeongSik Jeon : gdi32, winex11: Add support for subpixel font rendering.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 028617b90ba586bdb30723c700eea888c159ada7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=028617b90ba586bdb30723c70… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Dec 10 23:50:44 2008 +0900 gdi32, winex11: Add support for subpixel font rendering. --- configure | 1 + configure.ac | 1 + dlls/gdi32/freetype.c | 149 +++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/xrender.c | 76 ++++++++++++++++++---- include/config.h.in | 3 + include/wingdi.h | 7 ++- 6 files changed, 219 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=028617b90ba586bdb3072…

1 0

Alexandre Julliard : winedevice: Make sure that all dependencies of the driver are relocated too.
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 0115fdb6f4f148346769f3c84439271bedd9ed0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0115fdb6f4f148346769f3c84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 22 15:51:25 2008 +0100 winedevice: Make sure that all dependencies of the driver are relocated too. --- programs/winedevice/device.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 5677e19..bd65654 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -64,9 +64,11 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { - const IMAGE_NT_HEADERS *nt; + IMAGE_NT_HEADERS *nt; + const IMAGE_IMPORT_DESCRIPTOR *imports; size_t page_size = getpagesize(); - int delta; + int i, delta; + ULONG size; HMODULE module = LoadLibraryW( name ); if (!module) return NULL; @@ -80,7 +82,6 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < page_size || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - ULONG size; DWORD old; IMAGE_BASE_RELOCATION *rel, *end; @@ -98,8 +99,25 @@ static HMODULE load_driver_module( const WCHAR *name ) if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, page_size, old, NULL ); if (!rel) goto error; } + /* make sure we don't try again */ + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; } } + + /* make sure imports are relocated too */ + + if ((imports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) + { + for (i = 0; imports[i].Name && imports[i].FirstThunk; i++) + { + char *name = (char *)module + imports[i].Name; + WCHAR buffer[32], *p = buffer; + + while (p < buffer + 32) if (!(*p++ = *name++)) break; + if (p <= buffer + 32) FreeLibrary( load_driver_module( buffer ) ); + } + } + return module; error:

1 0

Hervé Chanal : shell32: A nicer icon for "folder".
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: a32a45179972bdc32bffc32267774e8003a77c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32a45179972bdc32bffc3226… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Fri Dec 12 17:31:51 2008 +0100 shell32: A nicer icon for "folder". --- dlls/shell32/folder.ico | Bin 15086 -> 15086 bytes dlls/shell32/folder.svg | 323 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 266 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a32a45179972bdc32bffc…

1 0

Hervé Chanal : shell32: A nicer icon for "open folder" .
by Alexandre Julliard 22 Dec '08

22 Dec '08

Module: wine Branch: master Commit: 33f6b46fd23ce0bc4a03daf895d3804fe3935989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33f6b46fd23ce0bc4a03daf89… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Fri Dec 12 17:32:33 2008 +0100 shell32: A nicer icon for "open folder". --- dlls/shell32/folder_open.ico | Bin 15086 -> 15086 bytes dlls/shell32/folder_open.svg | 365 +++++++++++++++++++++++++++++++++++------- 2 files changed, 303 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33f6b46fd23ce0bc4a03d…

1 0