December 2007 - Wine-commits

Dmitry Timoshkov : include: Add an initial version of oleacc.idl.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: eee2c4a4ab1ef5052ca282f7dc7f614b52a4667f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee2c4a4ab1ef5052ca282f7d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 5 13:35:31 2007 +0800 include: Add an initial version of oleacc.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/oleacc.idl | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 86bba92..a4378ad 100644 --- a/.gitignore +++ b/.gitignore @@ -602,6 +602,7 @@ include/objidl.h include/objsafe.h include/ocidl.h include/ocmm.h +include/oleacc.h include/oledb.h include/oleidl.h include/optary.h diff --git a/include/Makefile.in b/include/Makefile.in index c446810..c3e2582 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -44,6 +44,7 @@ IDL_H_SRCS = \ objsafe.idl \ ocidl.idl \ ocmm.idl \ + oleacc.idl \ oledb.idl \ oleidl.idl \ optary.idl \ diff --git a/include/oleacc.idl b/include/oleacc.idl new file mode 100644 index 0000000..239d2d5 --- /dev/null +++ b/include/oleacc.idl @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2005 Dmitry Timoshkov + * + * 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 + */ + +import "oaidl.idl"; + +cpp_quote("LRESULT WINAPI LresultFromObject(REFIID,WPARAM,LPUNKNOWN);") +cpp_quote("HRESULT WINAPI ObjectFromLresult(LRESULT,REFIID,WPARAM,void **);") +cpp_quote("HRESULT WINAPI WindowFromAccessibleObject(IAccessible *,HWND *);") +cpp_quote("HRESULT WINAPI AccessibleObjectFromWindow(HWND,DWORD,REFIID,void **);") +cpp_quote("HRESULT WINAPI AccessibleObjectFromEvent(HWND,DWORD,DWORD,IAccessible **,VARIANT *);") +cpp_quote("HRESULT WINAPI AccessibleObjectFromPoint(POINT,IAccessible **,VARIANT *);") +cpp_quote("HRESULT WINAPI AccessibleChildren(IAccessible *,LONG,LONG,VARIANT *,LONG *);") + +cpp_quote("void WINAPI GetOleaccVersionInfo(DWORD *,DWORD *);") +cpp_quote("HRESULT WINAPI CreateStdAccessibleObject(HWND,LONG,REFIID,void **);") +cpp_quote("HRESULT WINAPI CreateStdAccessibleProxyA(HWND,LPCSTR,LONG,REFIID,void **);") +cpp_quote("HRESULT WINAPI CreateStdAccessibleProxyW(HWND,LPCWSTR,LONG,REFIID,void **);") +cpp_quote("#define CreateStdAccessibleProxy WINELIB_NAME_AW(CreateStdAccessibleProxy)") + +cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xB5F8350B,0x0548,0x48B1,0xA6,0xEE,0x88,0xBD,0x00,0xB4,0xA5,0xE7);") +cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697FA,0x80E4,0x4560,0x80,0x2A,0xA1,0x3F,0x22,0xA6,0x47,0x09);")

1 0

Alexandre Julliard : kernel32: Remove the no-exec fault workaround, it shouldn't be needed anymore.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 0f6e826fe02611f7c033405041888d6e083512d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f6e826fe02611f7c03340504… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 5 12:35:47 2007 +0100 kernel32: Remove the no-exec fault workaround, it shouldn't be needed anymore. --- dlls/kernel32/except.c | 31 ------------------------------- 1 files changed, 0 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 0817d23..21d3584 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -419,33 +419,6 @@ static inline BOOL check_resource_write( void *addr ) /******************************************************************* - * check_no_exec - * - * Check for executing a protected area. - */ -static inline BOOL check_no_exec( void *addr ) -{ - MEMORY_BASIC_INFORMATION info; - - if (!VirtualQuery( addr, &info, sizeof(info) )) return FALSE; - if (info.State == MEM_FREE) return FALSE; - - /* prot |= PAGE_EXECUTE would be a lot easier, but MS developers - * apparently don't grasp the notion of protection bits */ - switch(info.Protect) - { - case PAGE_READONLY: info.Protect = PAGE_EXECUTE_READ; break; - case PAGE_READWRITE: info.Protect = PAGE_EXECUTE_READWRITE; break; - case PAGE_WRITECOPY: info.Protect = PAGE_EXECUTE_WRITECOPY; break; - default: return FALSE; - } - /* FIXME: we should probably have a per-app option, and maybe a message box */ - FIXME( "No-exec fault triggered at %p, enabling work-around\n", addr ); - return VirtualProtect( addr, 1, info.Protect, NULL ); -} - - -/******************************************************************* * UnhandledExceptionFilter (KERNEL32.@) */ LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) @@ -460,10 +433,6 @@ LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS epointers) if (check_resource_write( (void *)rec->ExceptionInformation[1] )) return EXCEPTION_CONTINUE_EXECUTION; break; - case EXCEPTION_EXECUTE_FAULT: - if (check_no_exec( (void *)rec->ExceptionInformation[1] )) - return EXCEPTION_CONTINUE_EXECUTION; - break; } }

1 0

Andrew Riedi : ddraw: DPRINTF -> TRACE.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 63f4b6f024cb5393e2e48e544a645fed7b377fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f4b6f024cb5393e2e48e544… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 4 14:27:33 2007 -0800 ddraw: DPRINTF -> TRACE. --- dlls/ddraw/executebuffer.c | 18 ++++---- dlls/ddraw/light.c | 2 +- dlls/ddraw/material.c | 2 +- dlls/ddraw/utils.c | 88 ++++++++++++++++++++++---------------------- 4 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63f4b6f024cb5393e2e48…

1 0

Andrew Riedi : comdlg32: DPRINTF -> TRACE.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 6de3bbc557cac4fcf0d84c9f527994d95f0793ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6de3bbc557cac4fcf0d84c9f5… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Dec 4 14:26:01 2007 -0800 comdlg32: DPRINTF -> TRACE. --- dlls/comdlg32/filedlgbrowser.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index b9c4d2c..2015a49 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -117,11 +117,11 @@ static void COMDLG32_DumpSBSPFlags(UINT uflags) FE(SBSP_INITIATEDBYHLINKFRAME), }; #undef FE - DPRINTF("SBSP Flags: %08x =", uflags); + TRACE("SBSP Flags: %08x =", uflags); for (i = 0; i < (sizeof(flags) / sizeof(flags[0])); i++) if (flags[i].mask & uflags) - DPRINTF("%s ", flags[i].name); - DPRINTF("\n"); + TRACE("%s ", flags[i].name); + TRACE("\n"); } }

1 0

Jonathan Ernst : mshtml: Updated French translation.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 5147ad24b6f8f77324dc57dfb475b035ddfb8aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=5147ad24b6f8f77324dc57dfb… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Dec 5 08:58:59 2007 +0100 mshtml: Updated French translation. --- dlls/mshtml/Fr.rc | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index d378ea1..dcb04cf 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -2,7 +2,7 @@ * MsHTML resources * French Language Support * - * Copyright 2005-2006 Jonathan Ernst + * Copyright 2005-2007 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -42,3 +42,17 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Annuler", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hyperlien" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Informations sur l'hyperlien", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Type�:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL�:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +}

1 0

Dmitry Timoshkov : winex11.drv: Don't forget to initialize dmFields.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: e388a49308aaf20d54d0fe2bfcdb54a7440deaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e388a49308aaf20d54d0fe2bf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 5 15:29:57 2007 +0800 winex11.drv: Don't forget to initialize dmFields. --- dlls/winex11.drv/settings.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index a3fd3d5..e266505 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -197,6 +197,8 @@ static BOOL read_registry_settings(DEVMODEW *dm) DWORD type, size; BOOL ret = TRUE; + dm->dmFields = 0; + if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) return FALSE; @@ -210,10 +212,15 @@ static BOOL read_registry_settings(DEVMODEW *dm) ret = FALSE query_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); + dm->dmFields |= DM_BITSPERPEL; query_value("DefaultSettings.XResolution", &dm->dmPelsWidth); + dm->dmFields |= DM_PELSWIDTH; query_value("DefaultSettings.YResolution", &dm->dmPelsHeight); + dm->dmFields |= DM_PELSHEIGHT; query_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); + dm->dmFields |= DM_DISPLAYFREQUENCY; query_value("DefaultSettings.Flags", &dm->u2.dmDisplayFlags); + dm->dmFields |= DM_DISPLAYFLAGS; query_value("DefaultSettings.XPanning", &dm->u1.s2.dmPosition.x); query_value("DefaultSettings.YPanning", &dm->u1.s2.dmPosition.y); query_value("DefaultSettings.Orientation", &dm->u1.s2.dmDisplayOrientation);

1 0

Dmitry Timoshkov : winex11.drv: Use registry settings as a default display mode.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: a7dba33cf3f514894692b86d3b55ef6e885280a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7dba33cf3f514894692b86d3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Dec 5 15:38:34 2007 +0800 winex11.drv: Use registry settings as a default display mode. --- dlls/winex11.drv/desktop.c | 1 - dlls/winex11.drv/settings.c | 28 ++++++++++++++-------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/xrandr.c | 1 - dlls/winex11.drv/xvidmode.c | 4 ---- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 1adb031..92686fb 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -156,7 +156,6 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount(); - X11DRV_Settings_SetDefaultMode(0); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index e266505..4fb01ad 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -44,7 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); static LPDDHALMODEINFO dd_modes = NULL; static unsigned int dd_mode_count = 0; static unsigned int dd_max_modes = 0; -static int dd_mode_default = 0; static const unsigned int depths[] = {8, 16, 32}; /* pointers to functions that actually do the hard stuff */ @@ -130,12 +129,6 @@ void X11DRV_Settings_AddDepthModes(void) } } -/* set the default mode */ -void X11DRV_Settings_SetDefaultMode(int mode) -{ - dd_mode_default = mode; -} - /* return the number of modes that are initialized */ unsigned int X11DRV_Settings_GetModeCount(void) { @@ -377,20 +370,26 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmFields & DM_DISPLAYFREQUENCY) def_mode &= !devmode->dmDisplayFrequency; } - if (def_mode) + if (def_mode || !dwBpp) { - TRACE("Return to original display mode (%s)\n", handler_name); - if (!X11DRV_EnumDisplaySettingsEx(devname, dd_mode_default, &dm, 0)) + if (!X11DRV_EnumDisplaySettingsEx(devname, ENUM_REGISTRY_SETTINGS, &dm, 0)) { ERR("Default mode not found!\n"); return DISP_CHANGE_BADMODE; } - devmode = &dm; + if (def_mode) + { + TRACE("Return to original display mode (%s)\n", handler_name); + devmode = &dm; + } + dwBpp = dm.dmBitsPerPel; } - dwBpp = !dwBpp ? dd_modes[dd_mode_default].dwBPP : dwBpp; if ((devmode->dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) + { + WARN("devmode doesn't specify the resolution: %04x\n", devmode->dmFields); return DISP_CHANGE_BADMODE; + } for (i = 0; i < dd_mode_count; i++) { @@ -423,13 +422,14 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, if (!(flags & (CDS_TEST | CDS_NORESET))) return pSetCurrentMode(i); + return DISP_CHANGE_SUCCESSFUL; } /* no valid modes found */ - ERR("No matching mode found(%dx%dx%d)! (%s)\n", + ERR("No matching mode found %ux%ux%u @%u! (%s)\n", devmode->dmPelsWidth, devmode->dmPelsHeight, - devmode->dmBitsPerPel, handler_name); + devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name); return DISP_CHANGE_BADMODE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 445badc..ec03e71 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -739,7 +739,6 @@ extern int X11DRV_Settings_CreateDriver(LPDDHALINFO info); extern LPDDHALMODEINFO X11DRV_Settings_CreateModes(unsigned int max_modes, int reserve_depths); unsigned int X11DRV_Settings_GetModeCount(void); void X11DRV_Settings_Init(void); -extern void X11DRV_Settings_SetDefaultMode(int mode); LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name, int (*pNewGCM)(void), LONG (*pNewSCM)(int), diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 8a8d7d9..e6ae615 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -304,7 +304,6 @@ void X11DRV_XRandR_Init(void) make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount(); - X11DRV_Settings_SetDefaultMode(0); TRACE("Available DD modes: count=%d\n", dd_mode_count); TRACE("Enabling XRandR\n"); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 3a0363c..7951373 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -197,10 +197,6 @@ void X11DRV_XF86VM_Init(void) dd_mode_count = X11DRV_Settings_GetModeCount(); TRACE("Available DD modes: count=%d\n", dd_mode_count); - - /* the first mode in the list seems to be the default */ - X11DRV_Settings_SetDefaultMode(0); - TRACE("Enabling XVidMode\n"); }

1 0

Jonathan Ernst : write: New French translation.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 54b18b93917719c48d27291fadf8ede65edf8dc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b18b93917719c48d27291fa… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Dec 3 17:56:55 2007 +0100 write: New French translation. --- programs/write/Fr.rc | 26 ++++++++++++++++++++++++++ programs/write/rsrc.rc | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/write/Fr.rc b/programs/write/Fr.rc new file mode 100644 index 0000000..452244e --- /dev/null +++ b/programs/write/Fr.rc @@ -0,0 +1,26 @@ +/* + * French language support + * + * Copyright (C) 2007 Jonathan Ernst + * + * 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_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Wordpad n'a pas pu être démarré" +} diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index ea4377c..dd7caa6 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -23,4 +23,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "En.rc" +#include "Fr.rc" #include "Ko.rc"

1 0

Jonathan Ernst : wordpad: Updated French translation.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 9efa4daa4c2fd4edcdb6e8a95e687f3bcba68ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efa4daa4c2fd4edcdb6e8a95… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Wed Dec 5 08:59:15 2007 +0100 wordpad: Updated French translation. --- programs/wordpad/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 46928f6..f7ee502 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -27,7 +27,7 @@ BEGIN MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS MENUITEM SEPARATOR - MENUITEM "&Imprimer . . .\tCtrl+P", ID_PRINT + MENUITEM "&Imprimer...\tCtrl+P", ID_PRINT MENUITEM "A&per�u avant impression...", ID_PREVIEW MENUITEM "&Mise en page...", ID_PRINTSETUP MENUITEM SEPARATOR @@ -44,7 +44,7 @@ BEGIN MENUITEM "&Effacer\tDel", ID_EDIT_CLEAR MENUITEM "&S�lectionner tout\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR - MENUITEM "&Rechercher . . .\tCrtl+F", ID_FIND + MENUITEM "&Rechercher...\tCrtl+F", ID_FIND MENUITEM "Rechercher le &suivant\tF3", ID_FIND_NEXT MENUITEM "&Remplacer...\tCtrl+H", ID_REPLACE MENUITEM SEPARATOR

1 0

Roy Shea : wininet: Added check of dwStructSize required by Windows in calls to InternetCrackUrlA .
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 91d07f699590d0a64f0f72e49e438db17f699c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d07f699590d0a64f0f72e49… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Dec 4 14:55:18 2007 -0800 wininet: Added check of dwStructSize required by Windows in calls to InternetCrackUrlA. --- dlls/wininet/internet.c | 4 +++- dlls/wininet/tests/url.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5848ea1..cf4e9bf 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1069,7 +1069,8 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, TRACE("(%s %u %x %p)\n", debugstr_a(lpszUrl), dwUrlLength, dwFlags, lpUrlComponents); - if (!lpszUrl || !*lpszUrl) + if (!lpszUrl || !*lpszUrl || !lpUrlComponents || + lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSA)) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1087,6 +1088,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength); memset(&UCW,0,sizeof(UCW)); + UCW.dwStructSize = sizeof(URL_COMPONENTSW); if(lpUrlComponents->dwHostNameLength!=0) UCW.dwHostNameLength= lpUrlComponents->dwHostNameLength; if(lpUrlComponents->dwUserNameLength!=0) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 8469072..e7c4288 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -239,6 +239,25 @@ static void InternetCrackUrl_test(void) GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); ok(GLE != 0xdeadbeef && GLE != ERROR_SUCCESS, "Expected GLE to represent a failure\n"); + + /* Invalid Call: must set size of components structure (Windows only + * inforces this on the InternetCrackUrlA version of the call) */ + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + SetLastError(0xdeadbeef); + urlComponents.dwStructSize = 0; + ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents); + ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); + ok(GLE != 0xdeadbeef && GLE != ERROR_SUCCESS, "Expected GLE to represent a failure\n"); + + /* Invalid Call: size of dwStructSize must be one of the "standard" sizes + * of the URL_COMPONENTS structure (Windows only inforces this on the + * InternetCrackUrlA version of the call) */ + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + SetLastError(0xdeadbeef); + urlComponents.dwStructSize = sizeof(urlComponents) + 1; + ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents); + ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); + ok(GLE != 0xdeadbeef && GLE != ERROR_SUCCESS, "Expected GLE to represent a failure\n"); } static void InternetCrackUrlW_test(void)

1 0