wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Anders Jonsson : winmm: Fix typo in English, Slovak resources.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 2ebe732453a6477dd8e5fcc209b297c7e2cf5b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ebe732453a6477dd8e5fcc20… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:25:48 2010 +0200 winmm: Fix typo in English, Slovak resources. --- dlls/winmm/winmm_En.rc | 2 +- dlls/winmm/winmm_Sk.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index cc20333..f529dff 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -121,7 +121,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device." diff --git a/dlls/winmm/winmm_Sk.rc b/dlls/winmm/winmm_Sk.rc index 3706f44..1d7bc77 100644 --- a/dlls/winmm/winmm_Sk.rc +++ b/dlls/winmm/winmm_Sk.rc @@ -121,7 +121,7 @@ MCIERR_FILE_READ, "Cannot read the specified file. Make sure the file is still MCIERR_FILE_WRITE, "Cannot write to the specified file. Make sure you have enough disk space or are still connected to the network." MCIERR_SEQ_DIV_INCOMPATIBLE, "The time formats of the ""song pointer"" and SMPTE are mutually exclusive. You can't use them together." MCIERR_SEQ_NOMIDIPRESENT, "The system has no installed MIDI devices. Use the Drivers option from the Control Panel to install a MIDI driver." -MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; the try again." +MCIERR_SEQ_PORT_INUSE, "The specified MIDI port is already in use. Wait until it is free; then try again." MCIERR_SEQ_PORT_MAPNODEVICE, "The current MIDI Mapper setup refers to a MIDI device that is not installed on the system. Use the MIDI Mapper option from the Control Panel to edit the setup." MCIERR_SEQ_PORT_MISCERROR, "An error occurred with the specified port." MCIERR_SEQ_PORT_NONEXISTENT, "The specified MIDI device is not installed on the system. Use the Drivers option from the Control Panel to install a MIDI device."

1 0

Anders Jonsson : cryptui: Fix typos in English resources.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: e8994599dcebb948d5c219bf7dda13546e70a0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8994599dcebb948d5c219bf7… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Aug 3 08:24:12 2010 +0200 cryptui: Fix typos in English resources. --- dlls/cryptui/cryptui_En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index a608210..bd158d2 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -118,10 +118,10 @@ STRINGTABLE IDS_WARN_REMOVE_PLURAL_DEFAULT "Are you sure you want to remove these certificates?" IDS_CERT_MGR "Certificates" IDS_FRIENDLY_NAME_NONE "<None>" - IDS_PURPOSE_SERVER_AUTH "Ensures the identify of a remote computer" + IDS_PURPOSE_SERVER_AUTH "Ensures the identity of a remote computer" IDS_PURPOSE_CLIENT_AUTH "Proves your identity to a remote computer" IDS_PURPOSE_CODE_SIGNING "Ensures software came from software publisher\nProtects software from alteration after publication" - IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messges" + IDS_PURPOSE_EMAIL_PROTECTION "Protects e-mail messages" IDS_PURPOSE_IPSEC "Allows secure communication over the Internet" IDS_PURPOSE_TIMESTAMP_SIGNING "Allows data to be signed with the current time" IDS_PURPOSE_CTL_USAGE_SIGNING "Allows you to digitally sign a certificate trust list"

1 0

Detlef Riekenberg : shdocvw: Do not trim the last character, when using the iexplore open menu.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: a4e01951579da52b7facc245aad5d5f869ba4aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e01951579da52b7facc245a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 3 05:32:29 2010 +0200 shdocvw: Do not trim the last character, when using the iexplore open menu. --- dlls/shdocvw/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index bef25ab..b794a8b 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -251,7 +251,7 @@ static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocStringLen(NULL, len); - GetWindowTextW(hwndurl, V_BSTR(&url), len); + GetWindowTextW(hwndurl, V_BSTR(&url), len + 1); IWebBrowser2_Navigate2(WEBBROWSER2(This), &url, NULL, NULL, NULL, NULL); SysFreeString(V_BSTR(&url));

1 0

Detlef Riekenberg : include: Add a closing bracket.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 51aef89beafd3e22b0cb0acf0b464ea213c43df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51aef89beafd3e22b0cb0acf0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Aug 3 05:25:10 2010 +0200 include: Add a closing bracket. --- include/winsock2.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winsock2.h b/include/winsock2.h index ea20ceb..5d5bd60 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -550,7 +550,7 @@ typedef int (WINAPI *LPFN_GETSOCKOPT)(SOCKET,int,int,char*,int*); typedef ULONG (WINAPI *LPFN_HTONL)(ULONG); typedef WS(u_short) (WINAPI *LPFN_HTONS)(WS(u_short)); typedef ULONG (WINAPI *LPFN_INET_ADDR)(const char*); -typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr); +typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr)); typedef int (WINAPI *LPFN_IOCTLSOCKET)(SOCKET,LONG,ULONG*); typedef int (WINAPI *LPFN_LISTEN)(SOCKET,int); typedef ULONG (WINAPI *LPFN_NTOHL)(ULONG);

1 0

Frédéric Delanoy : shdocvw: Update French translation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 82d8c52e39661952d1eab3ea3ef789c95dd6584b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d8c52e39661952d1eab3ea3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 3 02:16:52 2010 +0200 shdocvw: Update French translation. --- dlls/shdocvw/Fr.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Fr.rc b/dlls/shdocvw/Fr.rc index 94b4a7e..b7326bb 100644 --- a/dlls/shdocvw/Fr.rc +++ b/dlls/shdocvw/Fr.rc @@ -55,6 +55,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Propriétés...", ID_BROWSE_PROPERTIES } + POPUP "&Favoris" + { + MENUITEM "&Ajouter aux favoris..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Aide" { MENUITEM "À &propos d'Internet Explorer...", ID_BROWSE_ABOUT

1 0

Sven Baars : shdocvw: Update the Dutch translation.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: c510a13db515b44bf1cdce12381714a63a253d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c510a13db515b44bf1cdce123… Author: Sven Baars <sven.wine(a)gmail.com> Date: Mon Aug 2 23:53:59 2010 +0200 shdocvw: Update the Dutch translation. --- dlls/shdocvw/Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Nl.rc b/dlls/shdocvw/Nl.rc index d01c579..2237c5f 100644 --- a/dlls/shdocvw/Nl.rc +++ b/dlls/shdocvw/Nl.rc @@ -50,6 +50,11 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Eigenschappen...", ID_BROWSE_PROPERTIES } + POPUP "&Favorieten" + { + MENUITEM "&Toevoegen aan Favorieten..." ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } POPUP "&Help" { MENUITEM "&Over Internet Explorer...", ID_BROWSE_ABOUT

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetExtension.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 07e7a117ca119e629d784b0b2b98eb8e9bf7f0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e7a117ca119e629d784b0b2… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 18:36:49 2010 -0400 urlmon: Implemented IUri_GetExtension. --- dlls/urlmon/tests/uri.c | 230 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 33 ++++++-- 2 files changed, 141 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07e7a117ca119e629d784…

1 0

Thomas Mullaly : urlmon: Implemented function to the file extension of a file in a URI path.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: eb6e23e1de0c05f10288a1493b5c98fda9f87d8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb6e23e1de0c05f10288a1493… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 18:19:48 2010 -0400 urlmon: Implemented function to the file extension of a file in a URI path. --- dlls/urlmon/uri.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 07e9944..20a2d87 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -61,6 +61,7 @@ typedef struct { INT path_start; DWORD path_len; + INT extension_offset; } Uri; typedef struct { @@ -535,6 +536,18 @@ static DWORD remove_dot_segments(WCHAR *path, DWORD path_len) { return len; } +/* Attempts to find the file extension in a given path. */ +static INT find_file_extension(const WCHAR *path, DWORD path_len) { + const WCHAR *end; + + for(end = path+path_len-1; end >= path && *end != '/' && *end != '\\'; --end) { + if(*end == '.') + return end-path; + } + + return -1; +} + /* Computes the location where the elision should occur in the IPv6 * address using the numerical values of each component stored in * 'values'. If the address shouldn't contain an elision then 'index' @@ -2576,6 +2589,12 @@ static BOOL canonicalize_hierpart(const parse_data *data, Uri *uri, DWORD flags, return FALSE; } + if(uri->path_start > -1 && !computeOnly) + /* Finding file extensions happens for both types of URIs. */ + uri->extension_offset = find_file_extension(uri->canon_uri+uri->path_start, uri->path_len); + else + uri->extension_offset = -1; + return TRUE; }

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetPath.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 1e09e44510dcc56007ed7f91913666601eb52b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e09e44510dcc56007ed7f919… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 16:21:05 2010 -0400 urlmon: Implemented IUri_GetPath. --- dlls/urlmon/tests/uri.c | 188 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 26 +++++-- 2 files changed, 113 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e09e44510dcc56007ed7…

1 0

Thomas Mullaly : urlmon: Implemented canonicalization function for paths in opaque URIs.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 42e8af7a4a33591fe0bd5231a45a7b7350f89982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e8af7a4a33591fe0bd5231a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 25 16:00:50 2010 -0400 urlmon: Implemented canonicalization function for paths in opaque URIs. --- dlls/urlmon/tests/uri.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 83 +++++++++++++++++++- 2 files changed, 284 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e8af7a4a33591fe0bd5…

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010