July 2008 - Wine-Commits - list.winehq.org

Jeremy Newman : adding google ads to front page right sidebar
by Jeremy Newman July 16, 2008

July 16, 2008

Module: website Branch: master Commit: c66d8eb13bedd4e93a345807d08b00d99275481a URL: http://source.winehq.org/git/website.git/?a=commit;h=c66d8eb13bedd4e93a3458… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 16 14:51:58 2008 -0500 adding google ads to front page right sidebar chaning google search to use google ads and output in site --- include/themes/winehq/home_page.template | 1 + include/themes/winehq/menu_search_row.template | 22 ++++++++++++---------- site | 4 ++++ templates/en/ads.template | 13 +++++++++++++ templates/en/search.template | 14 ++++++++++++++ 5 files changed, 44 insertions(+), 10 deletions(-) diff --git a/include/themes/winehq/home_page.template b/include/themes/winehq/home_page.template index 58bb25e..493fcd3 100644 --- a/include/themes/winehq/home_page.template +++ b/include/themes/winehq/home_page.template @@ -10,6 +10,7 @@ <td width="30%"> {$latest_box} {$quote_box} + {$ad_box} {$wwn_box} {$sponsor_box} </td> diff --git a/include/themes/winehq/menu_search_row.template b/include/themes/winehq/menu_search_row.template index 405b9b2..09d119b 100644 --- a/include/themes/winehq/menu_search_row.template +++ b/include/themes/winehq/menu_search_row.template @@ -2,16 +2,18 @@ <td> <table width="145" class="sideBorder" style="padding-bottom: 2px; padding-top: 2px;"> <tr><td align="center"> -  - <FORM method=GET action="http://www.google.com/search" style="margin: 0px;"> - <input type="text" name="q" value="{$name}" - onBlur="if (value == '') {value = '{$name}'}" - onFocus="if (value == '{$name}') {value =''}" - size=12 maxlength=80 class="searchInput"> - <input type=hidden name=domains value="www.winehq.org"> - <input type=hidden name=sitesearch value="www.winehq.org"> - </FORM> -  + +<form action="http://www.winehq.org/site/search" id="cse-search-box" style="margin: 0; padding: 0;"> + <div> + <input type="hidden" name="cx" value="partner-pub-0971840239976722:w9sqbcsxtyf" /> + <input type="hidden" name="cof" value="FORID:10" /> + <input type="hidden" name="ie" value="UTF-8" /> + <input type="text" name="q" size="14" /> +  + </div> +</form> +<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en"></script> + </td></tr> </table> </td> diff --git a/site b/site index 67d6d27..c59bd5f 100644 --- a/site +++ b/site @@ -106,6 +106,9 @@ function home_page () // get random quote $quote_box = $html->theme_box($config->theme, "box_title", "Quote", "99%", view_quote(), '10', 'white', 'topMenu'); + // get google ad + $ad_box = $html->theme_box($config->theme, "box_title", "Ads by Google", "99%", $html->template("base", 'ads'), '10', 'white', 'topMenu'); + // get wwn news $wwn = new wwn(); $issues = $wwn->get_list(); @@ -120,6 +123,7 @@ function home_page () 'news_box' => $news_box, 'latest_box' => $latest_box, 'quote_box' => $quote_box, + 'ad_box' => $ad_box, 'wwn_box' => $wwn_box, 'sponsor_box' => $sponsor_box ); diff --git a/templates/en/ads.template b/templates/en/ads.template new file mode 100644 index 0000000..2ce6509 --- /dev/null +++ b/templates/en/ads.template @@ -0,0 +1,13 @@ +<script type="text/javascript"> +</script> +<script type="text/javascript" +src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> +</script> +<p style="font-size: 10px; text-align: right">Google Ads Help Sponsor <a href="http://wiki.winehq.org/WineConf">WineConf</a></p> + diff --git a/templates/en/search.template b/templates/en/search.template new file mode 100644 index 0000000..f500e82 --- /dev/null +++ b/templates/en/search.template @@ -0,0 +1,14 @@ + + +<h1>Search Results</h1> + +<div id="cse-search-results"></div> +<script type="text/javascript"> + var googleSearchIframeName = "cse-search-results"; + var googleSearchFormName = "cse-search-box"; + var googleSearchFrameWidth = 800; + var googleSearchDomain = "www.google.com"; + var googleSearchPath = "/cse"; +</script> +<script type="text/javascript" src="http://www.google.com/afsonline/show_afs_search.js"></script> +

1 0

Hwang YunSong(황윤성) : winhlp32: Updated Korean resource.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: fb0e728a7479dba68847e279d5f10e373c866c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0e728a7479dba68847e279d… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jul 14 10:02:05 2008 +0900 winhlp32: Updated Korean resource. --- programs/winhlp32/Ko.rc | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/Ko.rc b/programs/winhlp32/Ko.rc index 18c59ab..7839bac 100644 --- a/programs/winhlp32/Ko.rc +++ b/programs/winhlp32/Ko.rc @@ -77,6 +77,13 @@ CAPTION " PUSHBUTTON "��(&C)", IDCANCEL, 120, 170, 50, 12 } +IDD_SEARCH DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ã��" +{ + LTEXT "�� ", -1, 10, 10, 180, 150 +} /* Strings */

1 0

Roy Shea : mstask: Skeleton implementation of Task Scheduler Service.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 80ee225f23ea8093f57f1e7b29b7fb60e6f6cdda URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ee225f23ea8093f57f1e7b2… Author: Roy Shea <royshea(a)gmail.com> Date: Mon Jul 14 17:12:47 2008 -0700 mstask: Skeleton implementation of Task Scheduler Service. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/mstask/Makefile.in | 13 +++++++++++++ dlls/mstask/mstask.spec | 13 +++++++++++++ dlls/mstask/mstask_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 76 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1b35079..6d54f68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -349,6 +349,7 @@ ALL_MAKEFILES = \ dlls/msnet32/Makefile \ dlls/msrle32/Makefile \ dlls/mssip32/Makefile \ + dlls/mstask/Makefile \ dlls/msvcirt/Makefile \ dlls/msvcr71/Makefile \ dlls/msvcrt/Makefile \ @@ -778,6 +779,7 @@ dlls/msisys.ocx/Makefile: dlls/msisys.ocx/Makefile.in dlls/Makedll.rules dlls/msnet32/Makefile: dlls/msnet32/Makefile.in dlls/Makedll.rules dlls/msrle32/Makefile: dlls/msrle32/Makefile.in dlls/Makedll.rules dlls/mssip32/Makefile: dlls/mssip32/Makefile.in dlls/Makedll.rules +dlls/mstask/Makefile: dlls/mstask/Makefile.in dlls/Makedll.rules dlls/msvcirt/Makefile: dlls/msvcirt/Makefile.in dlls/Makedll.rules dlls/msvcr71/Makefile: dlls/msvcr71/Makefile.in dlls/Makedll.rules dlls/msvcrt/Makefile: dlls/msvcrt/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index be80629..56eb2c9 100755 --- a/configure +++ b/configure @@ -22124,6 +22124,8 @@ ac_config_files="$ac_config_files dlls/msrle32/Makefile" ac_config_files="$ac_config_files dlls/mssip32/Makefile" +ac_config_files="$ac_config_files dlls/mstask/Makefile" + ac_config_files="$ac_config_files dlls/msvcirt/Makefile" ac_config_files="$ac_config_files dlls/msvcr71/Makefile" @@ -23335,6 +23337,7 @@ do "dlls/msnet32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msnet32/Makefile" ;; "dlls/msrle32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msrle32/Makefile" ;; "dlls/mssip32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mssip32/Makefile" ;; + "dlls/mstask/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mstask/Makefile" ;; "dlls/msvcirt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcirt/Makefile" ;; "dlls/msvcr71/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcr71/Makefile" ;; "dlls/msvcrt/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msvcrt/Makefile" ;; diff --git a/configure.ac b/configure.ac index 400152f..bef895b 100644 --- a/configure.ac +++ b/configure.ac @@ -1891,6 +1891,7 @@ AC_CONFIG_FILES([dlls/msisys.ocx/Makefile]) AC_CONFIG_FILES([dlls/msnet32/Makefile]) AC_CONFIG_FILES([dlls/msrle32/Makefile]) AC_CONFIG_FILES([dlls/mssip32/Makefile]) +AC_CONFIG_FILES([dlls/mstask/Makefile]) AC_CONFIG_FILES([dlls/msvcirt/Makefile]) AC_CONFIG_FILES([dlls/msvcr71/Makefile]) AC_CONFIG_FILES([dlls/msvcrt/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d130f35..add8d40 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -156,6 +156,7 @@ BASEDIRS = \ msnet32 \ msrle32 \ mssip32 \ + mstask \ msvcirt \ msvcr71 \ msvcrt \ diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in new file mode 100644 index 0000000..2fd0a66 --- /dev/null +++ b/dlls/mstask/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mstask.dll +IMPORTS = kernel32 + +C_SRCS = \ + mstask_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec new file mode 100644 index 0000000..c09f7f1 --- /dev/null +++ b/dlls/mstask/mstask.spec @@ -0,0 +1,13 @@ +@ stub ConvertAtJobsToTasks +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub GetNetScheduleAccountInformation +@ stub NetrJobAdd +@ stub NetrJobDel +@ stub NetrJobEnum +@ stub NetrJobGetInfo +@ stub SAGetAccountInformation +@ stub SAGetNSAccountInformation +@ stub SASetAccountInformation +@ stub SASetNSAccountInformation +@ stub SetNetScheduleAccountInformation diff --git a/dlls/mstask/mstask_main.c b/dlls/mstask/mstask_main.c new file mode 100644 index 0000000..c373d66 --- /dev/null +++ b/dlls/mstask/mstask_main.c @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2008 Google (Roy Shea) + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mstask); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +}

1 0

Gerald Pfeifer : comctl32: rebar: Simplify by shedding off unused parameters.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 17f28f85d8d87cbe68bd3a19e09afb01b7eebd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f28f85d8d87cbe68bd3a19e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jul 13 13:15:36 2008 +0200 comctl32: rebar: Simplify by shedding off unused parameters. --- dlls/comctl32/rebar.c | 130 ++++++++++++++++++++++++------------------------ 1 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17f28f85d8d87cbe68bd3…

1 0

Jon Griffiths : mswsock: Implement 3 functions by calling through SIO_GET_EXTENSION_FUNCTION_POINTER .
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 2da98052d90591474c65bed853ca75e1da714823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da98052d90591474c65bed85… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 13 12:22:33 2008 -0700 mswsock: Implement 3 functions by calling through SIO_GET_EXTENSION_FUNCTION_POINTER. --- dlls/mswsock/mswsock.c | 168 ++++++++++++++++++++++++++++------------------- 1 files changed, 100 insertions(+), 68 deletions(-) diff --git a/dlls/mswsock/mswsock.c b/dlls/mswsock/mswsock.c index bdf4d30..e82f2e3 100644 --- a/dlls/mswsock/mswsock.c +++ b/dlls/mswsock/mswsock.c @@ -31,95 +31,127 @@ WINE_DEFAULT_DEBUG_CHANNEL(mswsock); +static LPFN_ACCEPTEX acceptex_fn; +static LPFN_GETACCEPTEXSOCKADDRS acceptexsockaddrs_fn; +static LPFN_TRANSMITFILE transmitfile_fn; +static BOOL initialised; + +/* Get pointers to the ws2_32 implementations. + * NOTE: This assumes that ws2_32 contains only one implementation + * of these functions, i.e. that you cannot get different functions + * back by passing another socket in. If that ever changes, we'll need + * to think about associating the functions with the socket and + * exposing that information to this dll somehow. + */ +static void get_fn(SOCKET s, GUID* guid, FARPROC* fn) +{ + FARPROC func; + DWORD len; + if (!WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, guid, sizeof(*guid), + &func, sizeof(func), &len, NULL, NULL)) + *fn = func; +} + +static void get_fn_pointers(SOCKET s) +{ + GUID acceptex_guid = WSAID_ACCEPTEX; + GUID acceptexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; + GUID transmitfile_guid = WSAID_TRANSMITFILE; + + get_fn(s, &acceptex_guid, (FARPROC*)&acceptex_fn); + get_fn(s, &acceptexsockaddrs_guid, (FARPROC*)&acceptexsockaddrs_fn); + get_fn(s, &transmitfile_guid, (FARPROC*)&transmitfile_fn); + initialised = TRUE; +} + /*********************************************************************** * AcceptEx (MSWSOCK.@) * - * This function is used to accept a new connection, get the local and remote - * address, and receive the initial block of data sent by the client. + * Accept a new connection, retrieving the connected addresses and initial data. * - * TODO - * This function is currently implemented as a stub. + * listener [I] Listening socket + * acceptor [I] Socket to accept on + * dest [O] Destination for inital data + * dest_len [I] Size of dest in bytes + * local_addr_len [I] Number of bytes reserved in dest for local addrress + * rem_addr_len [I] Number of bytes reserved in dest for remote addrress + * received [O] Destination for number of bytes of initial data + * overlapped [I] For asynchronous execution + * + * RETURNS + * Success: TRUE + * Failure: FALSE. Use WSAGetLastError() for details of the error. */ - -BOOL WINAPI AcceptEx( - SOCKET sListenSocket, /* [in] Descriptor identifying a socket that - has already been called with the listen - function */ - SOCKET sAcceptSocket, /* [in] Descriptor identifying a socket on - which to accept an incoming connection */ - PVOID lpOutputBuffer, /* [in] Pointer to a buffer */ - DWORD dwReceiveDataLength, /* [in] Number of bytes in lpOutputBuffer - that will be used for actual receive data - at the beginning of the buffer */ - DWORD dwLocalAddressLength, /* [in] Number of bytes reserved for the - local address information */ - DWORD dwRemoteAddressLength, /* [in] Number of bytes reserved for the - remote address information */ - LPDWORD lpdwBytesReceived, /* [out] Pointer to a DWORD that receives - the count of bytes received */ - LPOVERLAPPED lpOverlapped) /* [in] Specify in order to achieve an - overlapped (asynchronous) I/O - operation */ +BOOL WINAPI AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, + DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, + LPOVERLAPPED overlapped) { - FIXME("(listen=%ld, accept=%ld, %p, %d, %d, %d, %p, %p), not implemented\n", - sListenSocket,sAcceptSocket,lpOutputBuffer,dwReceiveDataLength, - dwLocalAddressLength,dwRemoteAddressLength,lpdwBytesReceived,lpOverlapped - ); - return FALSE; + if (!initialised) + get_fn_pointers(acceptor); + + if (!acceptex_fn) + return FALSE; + + return acceptex_fn(listener, acceptor, dest, dest_len, local_addr_len, + rem_addr_len, received, overlapped); } /*********************************************************************** * GetAcceptExSockaddrs (MSWSOCK.@) + * + * Get infomation about an accepted socket. + * + * data [O] Destination for the first block of data from AcceptEx() + * data_len [I] length of data in bytes + * local_len [I] Bytes reserved for local addrinfo + * rem_len [I] Bytes reserved for remote addrinfo + * local_addr [O] Destination for local sockaddr + * local_addr_len [I] Size of local_addr + * rem_addr [O] Destination for remote sockaddr + * rem_addr_len [I] Size of rem_addr + * + * RETURNS + * Nothing. */ -VOID WINAPI GetAcceptExSockaddrs( - PVOID lpOutputBuffer, /* [in] Pointer to a buffer */ - DWORD dwReceiveDataLength, /* [in] Number of bytes in the buffer used - for receiving the first data */ - DWORD dwLocalAddressLength, /* [in] Number of bytes reserved for the - local address information */ - DWORD dwRemoteAddressLength, /* [in] Number of bytes reserved for the - remote address information */ - struct sockaddr **LocalSockaddr, /* [out] Pointer to the sockaddr - structure that receives the local - address of the connection */ - LPINT LocalSockaddrLength, /* [out] Size in bytes of the local - address */ - struct sockaddr **RemoteSockaddr, /* [out] Pointer to the sockaddr - structure that receives the remote - address of the connection */ - LPINT RemoteSockaddrLength) /* [out] Size in bytes of the remote address */ +VOID WINAPI GetAcceptExSockaddrs(PVOID data, DWORD data_len, DWORD local_len, DWORD rem_len, + struct sockaddr **local_addr, LPINT local_addr_len, + struct sockaddr **rem_addr, LPINT rem_addr_len) { - FIXME("not implemented\n"); + if (acceptexsockaddrs_fn) + acceptexsockaddrs_fn(data, data_len, local_len, rem_len, + local_addr, local_addr_len, rem_addr, rem_addr_len); } + /*********************************************************************** * TransmitFile (MSWSOCK.@) * - * This function is used to transmit a file over socket. + * Transmit a file over a socket. + * + * PARAMS + * s [I] Handle to a connected socket + * file [I] Opened file handle for file to send + * total_len [I] Total number of file bytes to send + * chunk_len [I] Chunk size to send file in (0=default) + * overlapped [I] For asynchronous operation + * buffers [I] Head/tail data, or NULL if none + * flags [I] TF_ Flags from mswsock.h * - * TODO - * This function is currently implemented as a stub. + * RETURNS + * Success: TRUE + * Failure: FALSE. Use WSAGetLastError() for details of the error. */ - -BOOL WINAPI TransmitFile( - SOCKET hSocket, /* [in] Handle to a connected socket */ - HANDLE hFile, /* [in] Handle to the open file that should be - transmitted */ - DWORD nNumberOfBytesToWrite, /* [in] Number of file bytes to - transmit */ - DWORD nNumberOfBytesPerSend, /* [in] Size in bytes of each block of - data sent in each send operation */ - LPOVERLAPPED lpOverlapped, /* [in] Specify in order to achieve an - overlapped (asynchronous) I/O - operation */ - LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers, - /* [in] Contains pointers to data to send before and after - the file data is sent */ - DWORD dwFlags) /* [in] Flags */ +BOOL WINAPI TransmitFile(SOCKET s, HANDLE file, DWORD total_len, + DWORD chunk_len, LPOVERLAPPED overlapped, + LPTRANSMIT_FILE_BUFFERS buffers, DWORD flags) { - FIXME("not implemented\n"); + if (!initialised) + get_fn_pointers(s); + + if (!transmitfile_fn) + return FALSE; - return FALSE; + return transmitfile_fn(s, file, total_len, chunk_len, overlapped, buffers, flags); } /***********************************************************************

1 0

Jon Griffiths : msvcrt: Fix exponents in *printf family.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 8e86162be59d999b35a5d8664bee22ceda5b75a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e86162be59d999b35a5d8664… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Sun Jul 13 10:35:37 2008 -0700 msvcrt: Fix exponents in *printf family. --- dlls/msvcrt/tests/printf.c | 26 +++++++++++++++++--------- dlls/msvcrt/wcs.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 846b844..d7abacd 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -39,11 +39,24 @@ static void test_sprintf( void ) format = "%+#23.15e"; r = sprintf(buffer,format,pnumber); - todo_wine { - ok(!strcmp(buffer,"+7.894561230000000e+008"),"exponent format incorrect\n"); - } + ok(!strcmp(buffer,"+7.894561230000000e+008"),"+#23.15e failed: '%s'\n", buffer); + ok( r==23, "return count wrong\n"); + + format = "%-#23.15e"; + r = sprintf(buffer,format,pnumber); + ok(!strcmp(buffer,"7.894561230000000e+008 "),"-#23.15e failed: '%s'\n", buffer); + ok( r==23, "return count wrong\n"); + + format = "%#23.15e"; + r = sprintf(buffer,format,pnumber); + ok(!strcmp(buffer," 7.894561230000000e+008"),"#23.15e failed: '%s'\n", buffer); ok( r==23, "return count wrong\n"); + format = "%#1.1g"; + r = sprintf(buffer,format,pnumber); + ok(!strcmp(buffer,"8.e+008"),"#1.1g failed: '%s'\n", buffer); + ok( r==7, "return count wrong\n"); + format = "%I64d"; r = sprintf(buffer,format,((ULONGLONG)0xffffffff)*0xffffffff); ok(!strcmp(buffer,"-8589934591"),"Problem with long long\n"); @@ -401,12 +414,10 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"1"), "failed\n"); ok( r==1, "return count wrong\n"); - todo_wine { format = "%2.4e"; r = sprintf(buffer, format,8.6); ok(!strcmp(buffer,"8.6000e+000"), "failed\n"); ok( r==11, "return count wrong\n"); - } format = "%2.4g"; r = sprintf(buffer, format,8.6); @@ -507,10 +518,7 @@ static void test_swprintf( void ) const wchar_t hs[] = {'%', 'h', 's', 0}; swprintf(buffer,TwentyThreePoint15e,pnumber); - todo_wine - { - ok(wcsstr(buffer,e008) != 0,"Sprintf different\n"); - } + ok(wcsstr(buffer,e008) != 0,"Sprintf different\n"); swprintf(buffer,I64d,((ULONGLONG)0xffffffff)*0xffffffff); ok(wcslen(buffer) == 11,"Problem with long long\n"); swprintf(buffer,S,string); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 14daf90..8eccb39 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -481,6 +481,45 @@ static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, return; } +/* pf_fixup_exponent: convert a string containing a 2 digit exponent + to 3 digits, accounting for padding, in place. Needed to match + the native printf's which always use 3 digits. */ +static void pf_fixup_exponent( char *buf ) +{ + char* tmp = buf; + + while (tmp[0] && toupper(tmp[0]) != 'E') + tmp++; + + if (tmp[0] && (tmp[1] == '+' || tmp[1] == '-') && + isdigit(tmp[2]) && isdigit(tmp[3])) + { + char final; + + if (isdigit(tmp[4])) + return; /* Exponent already 3 digits */ + + /* We have a 2 digit exponent. Prepend '0' to make it 3 */ + tmp += 2; + final = tmp[2]; + tmp[2] = tmp[1]; + tmp[1] = tmp[0]; + tmp[0] = '0'; + if (final == '\0') + { + /* We didn't expand into trailing space, so this string isn't left + * justified. Terminate the string and strip a ' ' at the start of + * the string if there is one (as there may be if the string is + * right justified). + */ + tmp[3] = '\0'; + if (buf[0] == ' ') + memmove(buf, buf + 1, (tmp - buf) + 3); + } + /* Otherwise, we expanded into trailing space -> nothing to do */ + } +} + /********************************************************************* * pf_vsnprintf (INTERNAL) * @@ -693,7 +732,11 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, va_list valist ) pf_rebuild_format_string( fmt, &flags ); if( pf_is_double_format( flags.Format ) ) + { sprintf( x, fmt, va_arg(valist, double) ); + if (toupper(flags.Format) == 'E' || toupper(flags.Format) == 'G') + pf_fixup_exponent( x ); + } else sprintf( x, fmt, va_arg(valist, int) );

1 0

Gerald Pfeifer : ntdll/tests: Use NTSTATUS instead of DWORD for status variables.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: a44771c92500ebd319e6279f2c5bd5f9e0c8d5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44771c92500ebd319e6279f2… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jul 13 13:49:22 2008 +0200 ntdll/tests: Use NTSTATUS instead of DWORD for status variables. --- dlls/ntdll/tests/info.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 8e1e836..6b726d4 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -57,7 +57,7 @@ static BOOL InitFunctionPtrs(void) static void test_query_basic(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; SYSTEM_BASIC_INFORMATION sbi; @@ -118,7 +118,7 @@ static void test_query_cpu(void) static void test_query_performance(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; SYSTEM_PERFORMANCE_INFORMATION spi; @@ -138,7 +138,7 @@ static void test_query_performance(void) static void test_query_timeofday(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; /* Copy of our winternl.h structure turned into a private one */ @@ -215,7 +215,7 @@ static void test_query_timeofday(void) static void test_query_process(void) { - DWORD status; + NTSTATUS status; DWORD last_pid; ULONG ReturnLength; int i = 0, k = 0; @@ -325,7 +325,7 @@ static void test_query_process(void) static void test_query_procperf(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; ULONG NeededLength; SYSTEM_BASIC_INFORMATION sbi; @@ -363,7 +363,7 @@ static void test_query_procperf(void) static void test_query_module(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; ULONG ModuleCount, i; @@ -398,7 +398,7 @@ static void test_query_module(void) static void test_query_handle(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; ULONG SystemInformationLength = sizeof(SYSTEM_HANDLE_INFORMATION); SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); @@ -431,7 +431,7 @@ static void test_query_handle(void) static void test_query_cache(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; SYSTEM_CACHE_INFORMATION sci; @@ -449,7 +449,7 @@ static void test_query_cache(void) static void test_query_interrupt(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; ULONG NeededLength; SYSTEM_BASIC_INFORMATION sbi; @@ -477,7 +477,7 @@ static void test_query_interrupt(void) static void test_query_kerndebug(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; SYSTEM_KERNEL_DEBUGGER_INFORMATION skdi; @@ -495,7 +495,7 @@ static void test_query_kerndebug(void) static void test_query_regquota(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; SYSTEM_REGISTRY_QUOTA_INFORMATION srqi; @@ -513,7 +513,7 @@ static void test_query_regquota(void) static void test_query_process_basic(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; typedef struct _PROCESS_BASIC_INFORMATION_PRIVATE { @@ -581,7 +581,7 @@ static void test_query_process_basic(void) static void test_query_process_vm(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; VM_COUNTERS pvi; @@ -619,7 +619,7 @@ static void test_query_process_vm(void) static void test_query_process_io(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; IO_COUNTERS pii; @@ -659,7 +659,7 @@ static void test_query_process_io(void) static void test_query_process_times(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; HANDLE process; SYSTEMTIME UTC, Local; @@ -713,7 +713,7 @@ static void test_query_process_times(void) static void test_query_process_handlecount(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; DWORD handlecount; HANDLE process; @@ -757,7 +757,7 @@ static void test_query_process_handlecount(void) static void test_query_process_image_file_name(void) { - DWORD status; + NTSTATUS status; ULONG ReturnLength; UNICODE_STRING image_file_name; void *buffer; @@ -795,7 +795,7 @@ static void test_query_process_image_file_name(void) static void test_readvirtualmemory(void) { HANDLE process; - DWORD status; + NTSTATUS status; SIZE_T readcount; static const char teststring[] = "test string"; char buffer[12];

1 0

James Hawkins : fusion: Handle DWORD-sized string indices when loading the assembly name.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 2a51df3b7aa3070bbc4cad00eff36efa0fd20c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a51df3b7aa3070bbc4cad00e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 10:57:44 2008 -0500 fusion: Handle DWORD-sized string indices when loading the assembly name. --- dlls/fusion/assembly.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index b8b7719..9fcde8f 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -735,7 +735,7 @@ HRESULT assembly_release(ASSEMBLY *assembly) return S_OK; } -static LPSTR assembly_dup_str(ASSEMBLY *assembly, WORD index) +static LPSTR assembly_dup_str(ASSEMBLY *assembly, DWORD index) { LPSTR str = (LPSTR)&assembly->strings[index]; LPSTR cpy = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); @@ -746,18 +746,25 @@ static LPSTR assembly_dup_str(ASSEMBLY *assembly, WORD index) HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) { - ASSEMBLYTABLE *asmtbl; + BYTE *ptr; ULONG offset; + DWORD stridx; offset = assembly->tables[TableFromToken(mdtAssembly)].offset; if (offset == -1) return E_FAIL; - asmtbl = (ASSEMBLYTABLE *)assembly_data_offset(assembly, offset); - if (!asmtbl) + ptr = assembly_data_offset(assembly, offset); + if (!ptr) return E_FAIL; - *name = assembly_dup_str(assembly, asmtbl->Name); + ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey) + assembly->blobsz; + if (assembly->stringsz == sizeof(DWORD)) + stridx = *((DWORD *)ptr); + else + stridx = *((WORD *)ptr); + + *name = assembly_dup_str(assembly, stridx); if (!*name) return E_OUTOFMEMORY;

1 0

James Hawkins : fusion: Add handling for alternate-sized table indices in the metadata.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: 0edab123aa3e4114fded12ba7b3a66da41bea8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edab123aa3e4114fded12ba7… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 10:55:21 2008 -0500 fusion: Add handling for alternate-sized table indices in the metadata. --- dlls/fusion/assembly.c | 428 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 358 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0edab123aa3e4114fded1…

1 0

James Hawkins : fusion: Add the CorTokenType and use those constants in the assembly code.
by Alexandre Julliard July 16, 2008

July 16, 2008

Module: wine Branch: master Commit: b2888e1e561cd46e406f5ef4a6b8f311f13e350e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2888e1e561cd46e406f5ef4a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 10:54:28 2008 -0500 fusion: Add the CorTokenType and use those constants in the assembly code. --- dlls/fusion/assembly.c | 7 ++++- include/Makefile.in | 1 + include/corhdr.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 56ad060..c1acb1c 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -29,11 +29,14 @@ #include "dbghelp.h" #include "ole2.h" #include "fusion.h" +#include "corhdr.h" #include "fusionpriv.h" #include "wine/debug.h" #include "wine/unicode.h" +#define TableFromToken(tk) (TypeFromToken(tk) >> 24) + #define MAX_CLR_TABLES 64 typedef struct tagCLRTABLE @@ -458,7 +461,7 @@ HRESULT assembly_get_name(ASSEMBLY *assembly, LPSTR *name) ASSEMBLYTABLE *asmtbl; ULONG offset; - offset = assembly->tables[0x20].offset; /* FIXME: add constants */ + offset = assembly->tables[TableFromToken(mdtAssembly)].offset; if (offset == -1) return E_FAIL; @@ -572,7 +575,7 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPSTR *token) *token = NULL; - offset = assembly->tables[0x20].offset; /* FIXME: add constants */ + offset = assembly->tables[TableFromToken(mdtAssembly)].offset; if (offset == -1) return E_FAIL; diff --git a/include/Makefile.in b/include/Makefile.in index 56cc587..0adef3c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -106,6 +106,7 @@ SRCDIR_INCLUDES = \ compobj.h \ cor.h \ corerror.h \ + corhdr.h \ cpl.h \ cryptdlg.h \ cryptuiapi.h \ diff --git a/include/corhdr.h b/include/corhdr.h new file mode 100644 index 0000000..4064efd --- /dev/null +++ b/include/corhdr.h @@ -0,0 +1,58 @@ +/* + * Copyright 2008 James Hawkins + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_CORHDR_H +#define __WINE_CORHDR_H + +typedef enum CorTokenType +{ + mdtModule = 0x00000000, + mdtTypeRef = 0x01000000, + mdtTypeDef = 0x02000000, + mdtFieldDef = 0x04000000, + mdtMethodDef = 0x06000000, + mdtParamDef = 0x08000000, + mdtInterfaceImpl = 0x09000000, + mdtMemberRef = 0x0a000000, + mdtCustomAttribute = 0x0c000000, + mdtPermission = 0x0e000000, + mdtSignature = 0x11000000, + mdtEvent = 0x14000000, + mdtProperty = 0x17000000, + mdtModuleRef = 0x1a000000, + mdtTypeSpec = 0x1b000000, + mdtAssembly = 0x20000000, + mdtAssemblyRef = 0x23000000, + mdtFile = 0x26000000, + mdtExportedType = 0x27000000, + mdtManifestResource = 0x28000000, + mdtGenericParam = 0x2a000000, + mdtMethodSpec = 0x2b000000, + mdtGenericParamConstraint = 0x2c000000, + mdtString = 0x70000000, + mdtName = 0x71000000, + mdtBaseType = 0x72000000, +} CorTokenType; + +#define RidToToken(rid,tktype) ((rid) |= (tktype)) +#define TokenFromRid(rid,tktype) ((rid) | (tktype)) +#define RidFromToken(tk) ((RID)((tk) & 0x00ffffff)) +#define TypeFromToken(tk) ((ULONG32)((tk) & 0xff000000)) +#define IsNilToken(tk) ((RidFromToken(tk)) == 0) + +#endif /* __WINE_CORHDR_H */

1 0