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

Vitaliy Margolen : localspl: Add Russian translation.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 1a02268a05df1a68e9c993bb42bc85e59f94722b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a02268a05df1a68e9c993bb4… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Mar 31 22:38:33 2008 -0600 localspl: Add Russian translation. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Ru.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 3aeeb2c..752a0c0 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -44,4 +44,5 @@ #include "spl_No.rc" #include "spl_Pl.rc" #include "spl_Ro.rc" +#include "spl_Ru.rc" #include "spl_Sv.rc" diff --git a/dlls/localspl/spl_Ru.rc b/dlls/localspl/spl_Ru.rc new file mode 100644 index 0000000..1ee1e2f --- /dev/null +++ b/dlls/localspl/spl_Ru.rc @@ -0,0 +1,27 @@ +/* + * Russian resources for localspl + * + * Copyright 2008 Vitaliy Margolen + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "�� " + IDS_LOCALMONITOR "�� " +}

1 0

Piotr Caban : msxml3: Added SAXXMLReader registration.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: c1f3339557b5291b6ca29a1695c0d8289c5651aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f3339557b5291b6ca29a169… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Apr 1 01:44:49 2008 +0200 msxml3: Added SAXXMLReader registration. --- dlls/msxml3/regsvr.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 1f08150..05bf74d 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -555,6 +555,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.XMLSchemaCache", "3.0" }, + { &CLSID_SAXXMLReader, + "SAX XML Reader", + NULL, + "msxml3.dll", + "Both", + "Msxml2.SAXXMLReader", + "3.0" + }, { NULL } /* list terminator */ };

1 0

Rob Shearman : Remove superfluous semicolons from IDL files.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 80d67e33b957a68d882a7d5e2e4e2653c74facfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d67e33b957a68d882a7d5e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 31 22:00:09 2008 +0100 Remove superfluous semicolons from IDL files. --- dlls/atl/atliface.idl | 6 +++--- include/hlink.idl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atliface.idl b/dlls/atl/atliface.idl index bb5cb2e..ef3e5e5 100644 --- a/dlls/atl/atliface.idl +++ b/dlls/atl/atliface.idl @@ -74,6 +74,6 @@ cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**) cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);") cpp_quote("BOOL WINAPI AtlAxWinInit(void);") -cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);"); -cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);"); -cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog"); +cpp_quote("HWND WINAPI AtlAxCreateDialogW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("HWND WINAPI AtlAxCreateDialogA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM);") +cpp_quote("#define AtlAxCreateDialog WINELIB_NAME_AW(AtlAxCreateDialog") diff --git a/include/hlink.idl b/include/hlink.idl index 0eef883..c59cd32 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -35,7 +35,7 @@ cpp_quote("HRESULT WINAPI HlinkNavigate(IHlink*, IHlinkFrame*, DWORD, LPBC, IBin cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DWORD, IMoniker*, LPCWSTR, LPCWSTR, ULONG*);") cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") -cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);"); +cpp_quote("HRESULT WINAPI HlinkParseDisplayName(LPBC,LPCWSTR,BOOL,ULONG*,IMoniker**);") cpp_quote("HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER,DWORD,LPBC,ULONG,FORMATETC*,IBindStatusCallback*,LPMONIKER);") typedef enum _HLSR_NOREDEF10 {

1 0

Roderick Colenbrander : wgl: Fix ChoosePixelFormat behavior.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 616ac380f9a1ed4e83f0159f4cc9768bad8b4a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=616ac380f9a1ed4e83f0159f4… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 31 22:18:14 2008 +0000 wgl: Fix ChoosePixelFormat behavior. --- dlls/opengl32/tests/opengl.c | 75 +++++++++++++++++++ dlls/winex11.drv/opengl.c | 165 +++++++++++++++++++++++------------------- 2 files changed, 164 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=616ac380f9a1ed4e83f01…

1 0

Hans Leidekker : wininet: Use INTERNET_MAX_URL_LENGTH to size buffers we intend to store a URL in.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 612f3c1414bfe13ac116d7eb720e3692f80e5b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=612f3c1414bfe13ac116d7eb7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 31 20:26:16 2008 +0200 wininet: Use INTERNET_MAX_URL_LENGTH to size buffers we intend to store a URL in. --- dlls/wininet/http.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 912a07f..1bb3893 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -870,7 +870,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_STATUS_CODE,&dwCode,&dwCodeLength,NULL) && (dwCode==302 || dwCode==301)) { - WCHAR szNewLocation[2048]; + WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); if(HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { @@ -1233,7 +1233,7 @@ static BOOL HTTP_InsertAuthorization( LPWININETHTTPREQW lpwhr, struct HttpAuthIn static WCHAR *HTTP_BuildProxyRequestUrl(WININETHTTPREQW *req) { - WCHAR new_location[2048], *url; + WCHAR new_location[INTERNET_MAX_URL_LENGTH], *url; DWORD size; size = sizeof(new_location); @@ -2865,12 +2865,12 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl) LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; LPWININETAPPINFOW hIC = lpwhs->lpAppInfo; BOOL using_proxy = hIC->lpszProxy && hIC->lpszProxy[0]; - WCHAR path[2048]; + WCHAR path[INTERNET_MAX_URL_LENGTH]; if(lpszUrl[0]=='/') { /* if it's an absolute path, keep the same session info */ - lstrcpynW(path, lpszUrl, 2048); + lstrcpynW(path, lpszUrl, INTERNET_MAX_URL_LENGTH); } else { @@ -3272,7 +3272,7 @@ BOOL WINAPI HTTP_HttpSendRequestW(LPWININETHTTPREQW lpwhr, LPCWSTR lpszHeaders, if (!(lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && bSuccess) { - WCHAR szNewLocation[2048]; + WCHAR szNewLocation[INTERNET_MAX_URL_LENGTH]; dwBufferSize=sizeof(szNewLocation); if ((dwStatusCode==HTTP_STATUS_REDIRECT || dwStatusCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL))

1 0

Roderick Colenbrander : wgl: Add missing WGL_STEREO_ARB to ConvertAttribWGLtoGLX.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 8a5838274b5250c4c426b32ab02e44c3229c1a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5838274b5250c4c426b32ab… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Mar 31 22:59:11 2008 +0000 wgl: Add missing WGL_STEREO_ARB to ConvertAttribWGLtoGLX. --- dlls/winex11.drv/opengl.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a0469c..1a0a52f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -664,6 +664,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf TRACE("pAttr[%d] = GLX_DOUBLEBUFFER: %d\n", cur, pop); doublebuf = pop; break; + case WGL_STEREO_ARB: + pop = iWGLAttr[++cur]; + PUSH2(oGLXAttr, GLX_STEREO, pop); + TRACE("pAttr[%d] = GLX_STEREO: %d\n", cur, pop); + break; case WGL_PIXEL_TYPE_ARB: pop = iWGLAttr[++cur];

1 0

Andrew Talbot : mshtml: Remove superfluous semicolon.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: c25e5d642a823e43b1f7e60b91eec112905435eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c25e5d642a823e43b1f7e60b9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 20:42:14 2008 +0100 mshtml: Remove superfluous semicolon. --- dlls/mshtml/nsevents.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index eda1b54..7e428ce 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -195,7 +195,7 @@ static nsresult NSAPI handle_node_insert(nsIDOMEventListener *iface, nsIDOMEvent nsDOMEventListener_AddRef, \ nsDOMEventListener_Release, \ handler, \ - }; + } static const nsIDOMEventListenerVtbl blur_vtbl = EVENTLISTENER_VTBL(handle_blur); static const nsIDOMEventListenerVtbl focus_vtbl = EVENTLISTENER_VTBL(handle_focus);

1 0

Andrew Talbot : ntdll: Remove superfluous semicolon.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 08ae56545e677988f254dab5ad4283cb412a112d URL: http://source.winehq.org/git/wine.git/?a=commit;h=08ae56545e677988f254dab5a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 21:41:19 2008 +0100 ntdll: Remove superfluous semicolon. --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1115ca7..65283e0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -356,7 +356,7 @@ __ASM_GLOBAL_FUNC(call_thread_entry_point, "movl 8(%ebp),%eax\n\t" "call *%eax\n\t" "leave\n\t" - "ret" ); + "ret" ) #else static inline DWORD call_thread_entry_point( PRTL_THREAD_START_ROUTINE entry, void *arg ) {

1 0

Andrew Talbot : msxml3: Remove superfluous semicolon.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: 7142fc1634a9c4f8820d22e2b04fdb2abe8f3fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7142fc1634a9c4f8820d22e2b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 31 20:42:18 2008 +0100 msxml3: Remove superfluous semicolon. --- dlls/msxml3/saxreader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 4bece7f..0b36cac 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -54,7 +54,7 @@ typedef struct _saxreader static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) { return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVtbl)); -}; +} /*** IUnknown methods ***/ static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID riid, void **ppvObject)

1 0

Rob Shearman : widl: Parse typedefs of function pointers.
by Alexandre Julliard April 1, 2008

April 1, 2008

Module: wine Branch: master Commit: a110cffd9541523372c45b428d0c418a55a37253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a110cffd9541523372c45b428… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 31 21:59:47 2008 +0100 widl: Parse typedefs of function pointers. --- tools/widl/parser.y | 40 ++++++++++++++++++---------------------- tools/widl/widltypes.h | 2 ++ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a4f383f..7ddae74 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -100,7 +100,7 @@ static var_t *make_var(char *name); static pident_list_t *append_pident(pident_list_t *list, pident_t *p); static pident_t *make_pident(var_t *var); static func_list_t *append_func(func_list_t *list, func_t *func); -static func_t *make_func(var_t *def, var_list_t *args); +static func_t *make_func(var_t *def); static type_t *make_class(char *name); static type_t *make_safearray(type_t *type); static type_t *make_builtin(char *name); @@ -259,7 +259,7 @@ static void check_all_user_types(ifref_list_t *ifaces); %type <var> arg field s_field case enum constdef externdef %type <var_list> m_args no_args args fields cases enums enum_list dispint_props %type <var> m_ident t_ident ident -%type <pident> p_ident pident +%type <pident> pident func_ident direct_ident %type <pident_list> pident_list %type <func> funcdef %type <func_list> int_statements dispint_meths @@ -394,17 +394,6 @@ arg: attributes type pident array { $$ = $3->var; set_type($$, $1, $2->ptr_level, $3, TRUE); free($2); } - | attributes type pident '(' m_args ')' { $$ = $3->var; - $$->attrs = $1; - set_type($$, $2, $3->ptr_level - 1, NULL, TRUE); - free($3); - $$->args = $5; - } - | type pident '(' m_args ')' { $$ = $2->var; - set_type($$, $1, $2->ptr_level - 1, NULL, TRUE); - free($2); - $$->args = $4; - } ; array: { $$ = NULL; } @@ -654,12 +643,11 @@ s_field: m_attributes type pident array { $$ = $3->var; ; funcdef: - m_attributes type callconv pident - '(' m_args ')' { var_t *v = $4->var; + m_attributes type callconv pident { var_t *v = $4->var; v->attrs = $1; set_type(v, $2, $4->ptr_level, NULL, FALSE); free($4); - $$ = make_func(v, $6); + $$ = make_func(v); if (is_attr(v->attrs, ATTR_IN)) { error_loc("inapplicable attribute [in] for function '%s'\n",$$->def->name); } @@ -859,13 +847,19 @@ moduledef: modulehdr '{' int_statements '}' { $$ = $1; } ; -p_ident: '*' pident %prec PPTR { $$ = $2; $$->ptr_level++; } - | tCONST p_ident { $$ = $2; /* FIXME */ } +pident: '*' pident %prec PPTR { $$ = $2; $$->ptr_level++; } + | tCONST pident { $$ = $2; /* FIXME */ } + | direct_ident ; -pident: ident { $$ = make_pident($1); } - | p_ident +func_ident: direct_ident '(' m_args ')' { $$ = $1; $1->var->args = $3; } + +direct_ident: ident { $$ = make_pident($1); } | '(' pident ')' { $$ = $2; } + | func_ident { $$ = $1; + $$->func_ptr_level = $$->ptr_level; + $$->ptr_level = 0; + } ; pident_list: @@ -1521,6 +1515,7 @@ static pident_t *make_pident(var_t *var) pident_t *p = xmalloc(sizeof(*p)); p->var = var; p->ptr_level = 0; + p->func_ptr_level = 0; return p; } @@ -1536,11 +1531,12 @@ static func_list_t *append_func(func_list_t *list, func_t *func) return list; } -static func_t *make_func(var_t *def, var_list_t *args) +static func_t *make_func(var_t *def) { func_t *f = xmalloc(sizeof(func_t)); f->def = def; - f->args = args; + f->args = def->args; + def->args = NULL; f->ignore = parse_only; f->idx = -1; return f; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7eaacd1..7ddb449 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -244,6 +244,8 @@ struct _var_t { struct _pident_t { var_t *var; int ptr_level; + /* levels of indirection for function pointers */ + int func_ptr_level; /* parser-internal */ struct list entry;

1 0