January 2009 - Wine-Commits

Alexandre Julliard : Update copyright info for 2009.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 14da6fa83457b603750a6e00a4e819d3598c6641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14da6fa83457b603750a6e00a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 16:50:54 2009 +0100 Update copyright info for 2009. --- LICENSE | 2 +- include/wine/wine_common_ver.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 597f4c5..d6844a6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2008 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2009 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index f1a4644..6d6cf92 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -104,7 +104,7 @@ FILESUBTYPE WINE_FILESUBTYPE VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME - VALUE "LegalCopyright", "Copyright (c) 1993-2008 the Wine project authors (see the file AUTHORS for a complete list)" + VALUE "LegalCopyright", "Copyright (c) 1993-2009 the Wine project authors (see the file AUTHORS for a complete list)" VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR VALUE "ProductVersion", WINE_PRODUCTVERSION_STR

1 0

Tag wine-1.1.12 : Alexandre Julliard : Release 1.1.12
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: refs/tags/wine-1.1.12 Tag: 7000e9aec5cf07fd650c9529764d65e040425dc6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=7000e9aec5cf07fd650c9529764d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 17:24:10 2009 +0100 Release 1.1.12

1 0

Frans Kool : crypt32: Updated Dutch translations.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: cf47755f2b8913e3006a93828ca75a7a054ffceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf47755f2b8913e3006a93828… Author: Frans Kool <Frans.Kool(a)Gmail.com> Date: Fri Jan 2 13:54:51 2009 +0100 crypt32: Updated Dutch translations. --- dlls/crypt32/crypt32_Nl.rc | 62 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index b98f213..c9857f8 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -172,3 +172,65 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Certificatie Tussen-Autoriteiten" IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" } +STRINGTABLE DISCARDABLE +{ + IDS_KEY_ID "SleutelID=" + IDS_CERT_ISSUER "Certificaat verstrekker" + IDS_CERT_SERIAL_NUMBER "Certificaat serienummer=" + IDS_ALT_NAME_OTHER_NAME "Andere naam=" + IDS_ALT_NAME_RFC822_NAME "Email Adres=" + IDS_ALT_NAME_DNS_NAME "DNS naam=" + IDS_ALT_NAME_DIRECTORY_NAME "Directory adres" + IDS_ALT_NAME_URL "URL=" + IDS_ALT_NAME_IP_ADDRESS "IP adres=" + IDS_ALT_NAME_MASK "Masker=" + IDS_ALT_NAME_REGISTERED_ID "Geregistreerd ID=" + IDS_USAGE_UNKNOWN "Onbekend gebruik van sleutel" + IDS_SUBJECT_TYPE "Onderwerp type=" + IDS_SUBJECT_TYPE_CA "CA" + IDS_SUBJECT_TYPE_END_CERT "Eind Entiteit" + IDS_PATH_LENGTH "Lengte van pad beperking=" + IDS_PATH_LENGTH_NONE "Geen" + IDS_INFO_NOT_AVAILABLE "Informatie niet beschikbaar" + IDS_AIA "Authoriteit Informatie Toegang" + IDS_ACCESS_METHOD "Toegang methode=" + IDS_ACCESS_METHOD_OCSP "OCSP" + IDS_ACCESS_METHOD_CA_ISSUERS "CA verstrekkers" + IDS_ACCESS_METHOD_UNKNOWN "Onbekende toegangsmethode" + IDS_ACCESS_LOCATION "Alternatieve Naam" + IDS_CRL_DIST_POINT "CRL Distributie Punt" + IDS_CRL_DIST_POINT_NAME "Naam distributiepunt" + IDS_CRL_DIST_POINT_FULL_NAME "Volledige naam" + IDS_CRL_DIST_POINT_RDN_NAME "RDN naam" + IDS_CRL_DIST_POINT_REASON "CRL reden=" + IDS_CRL_DIST_POINT_ISSUER "CRL verstrekker" + IDS_REASON_KEY_COMPROMISE "Key Compromie" + IDS_REASON_CA_COMPROMISE "CA Compromie" + IDS_REASON_AFFILIATION_CHANGED "Samenwerking gewijzigd" + IDS_REASON_SUPERSEDED "Verouderd" + IDS_REASON_CESSATION_OF_OPERATION "Werkzaamheden gestaakt" + IDS_REASON_CERTIFICATE_HOLD "Certificaat bevroren" + IDS_FINANCIAL_CRITERIA "Financiele informatie=" + IDS_FINANCIAL_CRITERIA_AVAILABLE "Beschikbaar" + IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE "Niet beschikbaar" + IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Past bij criteria=" + IDS_YES "Ja" + IDS_NO "Nee" + IDS_DIGITAL_SIGNATURE "Digitale handtekening" + IDS_NON_REPUDIATION "Non-Repudiatie" + IDS_KEY_ENCIPHERMENT "sleutel codering" + IDS_DATA_ENCIPHERMENT "Data codering" + IDS_KEY_AGREEMENT "Sleutel overeenkomst" + IDS_CERT_SIGN "Certificaat tekenen" + IDS_OFFLINE_CRL_SIGN "Off-line CRL Certificeren" + IDS_CRL_SIGN "CRL Certificeren" + IDS_ENCIPHER_ONLY "Codeer alleen" + IDS_DECIPHER_ONLY "Decodeer alleen" + IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentificatie" + IDS_NETSCAPE_SSL_SERVER "SSL Server Authentificatie" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Handtekening" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Handtekening CA" +}

1 0

Andrew Talbot : comdlg32: Declare a function static.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 8a1a2a95117da62c44b8dcc0c53c50a5e45dd779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1a2a95117da62c44b8dcc0c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 2 13:12:28 2009 +0000 comdlg32: Declare a function static. --- dlls/comdlg32/cdlg.h | 2 -- dlls/comdlg32/colordlg.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index c85f877..5417423 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -193,8 +193,6 @@ BOOL CC_HookCallChk( const CHOOSECOLORW *lpcc ); int CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam ); LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam ); LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam ); -LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD - notifyCode, HWND hwndCtl ); LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ); LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ); void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect ); diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index d4a43af..52439d3 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -955,7 +955,7 @@ static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam ) /*********************************************************************** * CC_WMCommand [internal] */ -LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) +static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) { int r, g, b, i, xx; UINT cokmsg;

1 0

Andrew Talbot : cabinet: Declare a function static.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 184dbe7e63c7ed6f15381c6681899cbe731d81aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=184dbe7e63c7ed6f15381c668… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 2 12:54:42 2009 +0000 cabinet: Declare a function static. --- dlls/cabinet/cabinet.h | 1 - dlls/cabinet/fdi.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h index e786c1f..8b38f9b 100644 --- a/dlls/cabinet/cabinet.h +++ b/dlls/cabinet/cabinet.h @@ -656,6 +656,5 @@ typedef struct { /* from fdi.c */ void QTMupdatemodel(struct QTMmodel *model, int sym); int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, cab_UWORD *table); -cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum); #endif /* __WINE_CABINET_H */ diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 2248b9e..e36066d 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -293,7 +293,7 @@ int make_decode_table(cab_ULONG nsyms, cab_ULONG nbits, const cab_UBYTE *length, /************************************************************************* * checksum (internal) */ -cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { +static cab_ULONG checksum(const cab_UBYTE *data, cab_UWORD bytes, cab_ULONG csum) { int len; cab_ULONG ul = 0;

1 0

Andrew Talbot : comctl32: Declare some variables static.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: c8cf4211869ea3de5bbc9b06c23e8b37ce27f319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8cf4211869ea3de5bbc9b06c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jan 2 12:54:46 2009 +0000 comctl32: Declare some variables static. --- dlls/comctl32/commctrl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 4e447af..949b62a 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -125,9 +125,9 @@ static const char manifest_filename[] = ARCH "_" NAME "_" PUBLIC_KEY "_" VERSION static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -LPWSTR COMCTL32_wSubclass = NULL; +static LPWSTR COMCTL32_wSubclass = NULL; HMODULE COMCTL32_hModule = 0; -LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL); +static LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL); HBRUSH COMCTL32_hPattern55AABrush = NULL; COMCTL32_SysColor comctl32_color;

1 0

Rob Shearman : widl: Use is_string_type instead of is_attr(..., ATTR_STRING ) for detecting strings.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 10a422ae1455574fd21f92135a2b5c2a9a287664 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a422ae1455574fd21f92135… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 12:14:50 2009 +0000 widl: Use is_string_type instead of is_attr(..., ATTR_STRING) for detecting strings. Detecting strings is a bit harder than just looking for the string attribute, so make sure to use the function which has the purpose of doing just that. Fixes compilation of generated server/proxy code when a parameter has both the [out] and [string] attributes. --- tools/widl/typegen.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8852ca0..7810f80 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2025,7 +2025,7 @@ static size_t write_struct_tfs(FILE *file, type_t *type, array = find_array_or_string_in_struct(type); if (array && !processed(array->type)) array_offset - = is_attr(array->attrs, ATTR_STRING) + = is_string_type(array->attrs, array->type) ? write_string_tfs(file, array->attrs, array->type, array->name, tfsoff) : write_array_tfs(file, array->attrs, array->type, array->name, tfsoff); @@ -3291,7 +3291,7 @@ void declare_stub_args( FILE *file, int indent, const func_t *func ) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) { - int is_string = is_attr(var->attrs, ATTR_STRING); + int is_string = is_string_type(var->attrs, var->type); in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); @@ -3338,7 +3338,7 @@ void assign_stub_out_args( FILE *file, int indent, const func_t *func, const cha LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) { - int is_string = is_attr(var->attrs, ATTR_STRING); + int is_string = is_string_type(var->attrs, var->type); in_attr = is_attr(var->attrs, ATTR_IN); out_attr = is_attr(var->attrs, ATTR_OUT); if (!out_attr && !in_attr)

1 0

Alexandre Julliard : winecoreaudio: Fix a redefinition warning.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: ab1040b35d595a395140d7013fc053ee5de327d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1040b35d595a395140d7013… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 2 13:54:49 2009 +0100 winecoreaudio: Fix a redefinition warning. --- dlls/winecoreaudio.drv/audiounit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 7654454..08e2607 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -25,6 +25,7 @@ #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> +#undef DPRINTF #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wave);

1 0

Christian Costa : mciavi: Implement MCI_DGV_PUT_WINDOW in MCIAVI_mciPut.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: 2f913efa830bece55aa90641dc2e5236f4ccba15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f913efa830bece55aa90641d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 2 12:17:10 2009 +0100 mciavi: Implement MCI_DGV_PUT_WINDOW in MCIAVI_mciPut. --- dlls/mciavi32/wnd.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index f447798..682a311 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -187,9 +187,8 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) return MCIERR_UNRECOGNIZED_COMMAND; } if (dwFlags & MCI_DGV_PUT_WINDOW) { - FIXME("PUT_WINDOW %s\n", wine_dbgstr_rect(&rc)); - LeaveCriticalSection(&wma->cs); - return MCIERR_UNRECOGNIZED_COMMAND; + TRACE("PUT_WINDOW %s\n", wine_dbgstr_rect(&rc)); + SetWindowPos(wma->hWndPaint, NULL, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER); } LeaveCriticalSection(&wma->cs); return 0;

1 0

Rob Shearman : configure.ac: Fix test for libresolv on Mac OS 10.4.x.
by Alexandre Julliard Jan. 2, 2009

Jan. 2, 2009

Module: wine Branch: master Commit: ba349210345accf4026c8db65d9fe9ed0341cee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba349210345accf4026c8db65… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Jan 2 12:12:06 2009 +0000 configure.ac: Fix test for libresolv on Mac OS 10.4.x. The resolv.h header file won't compile without netinet/in.h being included first. --- configure | 3 +++ configure.ac | 5 ++++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 98115be..6fd413f 100755 --- a/configure +++ b/configure @@ -14285,6 +14285,9 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif #include <resolv.h> int main () diff --git a/configure.ac b/configure.ac index 784107e..8d45409 100644 --- a/configure.ac +++ b/configure.ac @@ -1011,7 +1011,10 @@ if test "$ac_cv_header_resolv_h" = "yes" then ac_save_LIBS="$LIBS" LIBS="$LIBS -lresolv" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <resolv.h>]],[[res_init();]])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#include <resolv.h>]],[[res_init();]])], [AC_DEFINE(HAVE_RESOLV, 1, [Define if you have the resolver library and header]) RESOLVLIBS="-lresolv"]) LIBS="$ac_save_LIBS"

1 0