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

Paul Vriens : winecfg: Fix setting version to Vista.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 863240b77b4886c5868ccf566dc537b33ca2394e URL: http://source.winehq.org/git/wine.git/?a=commit;h=863240b77b4886c5868ccf566… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 11 14:25:05 2008 +0100 winecfg: Fix setting version to Vista. --- programs/winecfg/appdefaults.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 3fdd8f3..53e912a 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -70,11 +70,18 @@ static const char szKeyNT[] = "Software\\Microsoft\\Windows NT\\CurrentVersion"; static int get_registry_version(void) { - int i, best = -1, platform, major, minor = 0; + int i, best = -1, platform, major, minor, build = 0; char *p, *ver; if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL ))) + { + char *build_str; + platform = VER_PLATFORM_WIN32_NT; + + build_str = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL ); + build = atoi(build_str); + } else if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKey9x, "VersionNumber", NULL ))) platform = VER_PLATFORM_WIN32_WINDOWS; else @@ -82,10 +89,15 @@ static int get_registry_version(void) if ((p = strchr( ver, '.' ))) { - char *str = p; - *str++ = 0; - if ((p = strchr( str, '.' ))) *p = 0; - minor = atoi(str); + char *minor_str = p; + *minor_str++ = 0; + if ((p = strchr( minor_str, '.' ))) + { + char *build_str = p; + *build_str++ = 0; + build = atoi(build_str); + } + minor = atoi(minor_str); } major = atoi(ver); @@ -94,7 +106,9 @@ static int get_registry_version(void) if (win_versions[i].dwPlatformId != platform) continue; if (win_versions[i].dwMajorVersion != major) continue; best = i; - if (win_versions[i].dwMinorVersion == minor) return i; + if ((win_versions[i].dwMinorVersion == minor) && + (win_versions[i].dwBuildNumber == build)) + return i; } return best; }

1 0

Alexandre Julliard : uuid: Avoid some guids that shouldn' t be defined in libuuid.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: acc1dd11cb7cb6a95f1801d8f591addab8ea9eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc1dd11cb7cb6a95f1801d8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 15:38:21 2008 +0100 uuid: Avoid some guids that shouldn't be defined in libuuid. --- dlls/uuid/uuid.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index c53238f..32f953b 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -50,7 +50,9 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "shldisp.h" #include "comcat.h" #include "urlmon.h" +#define _NO_AUTHOR_GUIDS #include "activaut.h" +#define _NO_SCRIPT_GUIDS #include "activscp.h" #include "dispex.h" #include "mlang.h"

1 0

Jacek Caban : include: Added activaut.idl.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: fe5ea9f006ada0a79ba2fad2cb82d476ea3393d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe5ea9f006ada0a79ba2fad2c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 13:01:00 2008 +0100 include: Added activaut.idl. --- .gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/activaut.idl | 29 +++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 483b391..1abc9e7 100644 --- a/.gitignore +++ b/.gitignore @@ -590,6 +590,7 @@ dlls/ws2_32/version.res dlls/wsock32/libwsock32.def dlls/wsock32/version.res dlls/wtsapi32/libwtsapi32.def +include/activaut.h include/activscp.h include/amstream.h include/amvideo.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 3fc97ee..c53238f 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -50,6 +50,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "shldisp.h" #include "comcat.h" #include "urlmon.h" +#include "activaut.h" #include "activscp.h" #include "dispex.h" #include "mlang.h" diff --git a/include/Makefile.in b/include/Makefile.in index 287cfa9..f81b4c4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = none IDL_H_SRCS = \ + activaut.idl \ activscp.idl \ amstream.idl \ amvideo.idl \ diff --git a/include/activaut.idl b/include/activaut.idl new file mode 100644 index 0000000..890e785 --- /dev/null +++ b/include/activaut.idl @@ -0,0 +1,29 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * 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 DO_NO_IMPORTS +import "ocidl.idl"; +import "oleidl.idl"; +import "oaidl.idl"; +#endif + +cpp_quote("#ifndef _NO_AUTHOR_GUIDS") + +cpp_quote("DEFINE_GUID(CATID_ActiveScriptAuthor, 0xaee2a92,0xbcbb,0x11d0,0x8c,0x72,0x0,0xc0,0x4f,0xc2,0xb0,0x85);") + +cpp_quote("#endif")

1 0

Denver Gingerich : ddraw: Implement ForceRefreshRate registry entry for overriding DirectX refresh rate .
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 248ae8f112720d65cebe76f60f062c5589268a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248ae8f112720d65cebe76f60… Author: Denver Gingerich <denver(a)ossguy.com> Date: Mon Mar 10 12:44:38 2008 -0400 ddraw: Implement ForceRefreshRate registry entry for overriding DirectX refresh rate. --- dlls/ddraw/ddraw.c | 91 +++++++++++++++++++++++++++++-------------- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/main.c | 36 +++++++++++++++++ 3 files changed, 99 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4cac55d..60ffdcd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3,6 +3,7 @@ * Copyright 1998-2000 Lionel Ulmer * Copyright 2000-2001 TransGaming Technologies Inc. * Copyright 2006 Stefan D�singer + * Copyright 2008 Denver Gingerich * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -534,34 +535,24 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, } /***************************************************************************** - * IDirectDraw7::SetDisplayMode * - * Sets the display screen resolution, color depth and refresh frequency - * when in fullscreen mode (in theory). - * Possible return values listed in the SDK suggest that this method fails - * when not in fullscreen mode, but this is wrong. Windows 2000 happily sets - * the display mode in DDSCL_NORMAL mode without an hwnd specified. - * It seems to be valid to pass 0 for With and Height, this has to be tested - * It could mean that the current video mode should be left as-is. (But why - * call it then?) - * - * Params: - * Height, Width: Screen dimension - * BPP: Color depth in Bits per pixel - * Refreshrate: Screen refresh rate - * Flags: Other stuff + * Helper function for SetDisplayMode and RestoreDisplayMode * - * Returns - * DD_OK on success + * Implements DirectDraw's SetDisplayMode, but ignores the value of + * ForceRefreshRate, since it is already handled by + * IDirectDrawImpl_SetDisplayMode. RestoreDisplayMode can use this function + * without worrying that ForceRefreshRate will override the refresh rate. For + * argument and return value documentation, see + * IDirectDrawImpl_SetDisplayMode. * *****************************************************************************/ -static HRESULT WINAPI -IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface, - DWORD Width, - DWORD Height, - DWORD BPP, - DWORD RefreshRate, - DWORD Flags) +static HRESULT +IDirectDrawImpl_SetDisplayModeNoOverride(IDirectDraw7 *iface, + DWORD Width, + DWORD Height, + DWORD BPP, + DWORD RefreshRate, + DWORD Flags) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); WINED3DDISPLAYMODE Mode; @@ -616,6 +607,46 @@ IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface, } /***************************************************************************** + * IDirectDraw7::SetDisplayMode + * + * Sets the display screen resolution, color depth and refresh frequency + * when in fullscreen mode (in theory). + * Possible return values listed in the SDK suggest that this method fails + * when not in fullscreen mode, but this is wrong. Windows 2000 happily sets + * the display mode in DDSCL_NORMAL mode without an hwnd specified. + * It seems to be valid to pass 0 for With and Height, this has to be tested + * It could mean that the current video mode should be left as-is. (But why + * call it then?) + * + * Params: + * Height, Width: Screen dimension + * BPP: Color depth in Bits per pixel + * Refreshrate: Screen refresh rate + * Flags: Other stuff + * + * Returns + * DD_OK on success + * + *****************************************************************************/ +static HRESULT WINAPI +IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface, + DWORD Width, + DWORD Height, + DWORD BPP, + DWORD RefreshRate, + DWORD Flags) +{ + if (force_refresh_rate != 0) + { + TRACE("ForceRefreshRate overriding passed-in refresh rate (%d Hz) to %d Hz\n", RefreshRate, force_refresh_rate); + RefreshRate = force_refresh_rate; + } + + return IDirectDrawImpl_SetDisplayModeNoOverride(iface, Width, Height, BPP, + RefreshRate, Flags); +} + +/***************************************************************************** * IDirectDraw7::RestoreDisplayMode * * Restores the display mode to what it was at creation time. Basically. @@ -642,12 +673,12 @@ IDirectDrawImpl_RestoreDisplayMode(IDirectDraw7 *iface) ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); TRACE("(%p)\n", This); - return IDirectDraw7_SetDisplayMode(ICOM_INTERFACE(This, IDirectDraw7), - This->orig_width, - This->orig_height, - This->orig_bpp, - 0, - 0); + return IDirectDrawImpl_SetDisplayModeNoOverride(ICOM_INTERFACE(This, IDirectDraw7), + This->orig_width, + This->orig_height, + This->orig_bpp, + 0, + 0); } /***************************************************************************** diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 9b78edf..c10f981 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -83,6 +83,8 @@ extern ULONG WINAPI D3D7CB_DestroyDepthStencilSurface(IWineD3DSurface *pSurface) /* Global critical section */ extern CRITICAL_SECTION ddraw_cs; +extern DWORD force_refresh_rate; + /***************************************************************************** * IDirectDraw implementation structure *****************************************************************************/ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 4e77d4f..a33cb34 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -4,6 +4,7 @@ * Copyright 1998 Lionel Ulmer * Copyright 2000-2001 TransGaming Technologies Inc. * Copyright 2006 Stefan D�singer + * Copyright 2008 Denver Gingerich * * This file contains the (internal) driver registration functions, * driver enumeration APIs and DirectDraw creation functions. @@ -68,6 +69,9 @@ static CRITICAL_SECTION_DEBUG ddraw_cs_debug = }; CRITICAL_SECTION ddraw_cs = { &ddraw_cs_debug, -1, 0, 0, 0, 0 }; +/* value of ForceRefreshRate */ +DWORD force_refresh_rate = 0; + /*********************************************************************** * * Helper function for DirectDrawCreate and friends @@ -886,6 +890,38 @@ DllMain(HINSTANCE hInstDLL, } } + /* On Windows one can force the refresh rate that DirectDraw uses by + * setting an override value in dxdiag. This is documented in KB315614 + * (main article), KB230002, and KB217348. By comparing registry dumps + * before and after setting the override, we see that the override value + * is stored in HKLM\Software\Microsoft\DirectDraw\ForceRefreshRate as a + * DWORD that represents the refresh rate to force. We use this + * registry entry to modify the behavior of SetDisplayMode so that Wine + * users can override the refresh rate in a Windows-compatible way. + * + * dxdiag will not accept a refresh rate lower than 40 or higher than + * 120 so this value should be within that range. It is, of course, + * possible for a user to set the registry entry value directly so that + * assumption might not hold. + * + * There is no current mechanism for setting this value through the Wine + * GUI. It would be most appropriate to set this value through a dxdiag + * clone, but it may be sufficient to use winecfg. + * + * TODO: Create a mechanism for setting this value through the Wine GUI. + */ + if ( !RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Microsoft\\DirectDraw", &hkey ) ) + { + DWORD type, data; + size = sizeof(data); + if (!RegQueryValueExA( hkey, "ForceRefreshRate", NULL, &type, (LPBYTE)&data, &size ) && type == REG_DWORD) + { + TRACE("ForceRefreshRate set; overriding refresh rate to %d Hz\n", data); + force_refresh_rate = data; + } + RegCloseKey( hkey ); + } + DisableThreadLibraryCalls(hInstDLL); } else if (Reason == DLL_PROCESS_DETACH)

1 0

Jacek Caban : activscp.idl: Added CATID_* declarations.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 7ba25f0b22698d5ebc48d1c02400c1c2268540c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba25f0b22698d5ebc48d1c02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 13:00:46 2008 +0100 activscp.idl: Added CATID_* declarations. --- include/activscp.idl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/activscp.idl b/include/activscp.idl index 248203e..ea201f5 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -21,6 +21,14 @@ import "ocidl.idl"; import "oleidl.idl"; import "oaidl.idl"; #endif + +cpp_quote("#ifndef _NO_SCRIPT_GUIDS") + +cpp_quote("DEFINE_GUID(CATID_ActiveScript, 0xf0b7a1a1,0x9847,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64);") +cpp_quote("DEFINE_GUID(CATID_ActiveScriptParse, 0xf0b7a1a2,0x9847,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64);") +cpp_quote("DEFINE_GUID(CATID_ActiveScriptEncode, 0xf0b7a1a3,0x9847,0x11cf,0x8f,0x20,0x00,0x80,0x5f,0x2c,0xd0,0x64);") + +cpp_quote("#endif") typedef enum tagSCRIPTSTATE { SCRIPTSTATE_UNINITIALIZED = 0,

1 0

Aric Stewart : gdi32: Skip leading @ from FontFace when looking for font to load.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 5c1229982a932c72d2bf444b61a2f24da6e3d155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1229982a932c72d2bf444b6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Mar 11 19:34:48 2008 +0900 gdi32: Skip leading @ from FontFace when looking for font to load. --- dlls/gdi32/freetype.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 46a53c8..765ac82 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3068,13 +3068,22 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) FontSubst *psub; SYSTEM_LINKS *font_link; CHILD_FONT *font_link_entry; + LPWSTR FaceName = lf.lfFaceName; - psub = get_font_subst(&font_subst_list, lf.lfFaceName, lf.lfCharSet); + /* + * Check for a leading '@' this signals that the font is being + * requested in tategaki mode (vertical writing subtitution) but + * does not affect the fontface that is to be selected. + */ + if (lf.lfFaceName[0]=='@') + FaceName = &lf.lfFaceName[1]; + + psub = get_font_subst(&font_subst_list, FaceName, lf.lfCharSet); if(psub) { - TRACE("substituting %s -> %s\n", debugstr_w(lf.lfFaceName), + TRACE("substituting %s -> %s\n", debugstr_w(FaceName), debugstr_w(psub->to.name)); - strcpyW(lf.lfFaceName, psub->to.name); + strcpyW(FaceName, psub->to.name); } /* We want a match on name and charset or just name if @@ -3085,7 +3094,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) */ LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpiW(family->FamilyName, lf.lfFaceName)) { + if(!strcmpiW(family->FamilyName, FaceName)) { LIST_FOR_EACH(face_elem_ptr, &family->faces) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if((csi.fs.fsCsb[0] & (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) || !csi.fs.fsCsb[0]) @@ -3101,7 +3110,7 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) */ LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) { - if(!strcmpiW(font_link->font_name, lf.lfFaceName)) + if(!strcmpiW(font_link->font_name, FaceName)) { TRACE("found entry in system list\n"); LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry)

1 0

Christopher Berner : user32: Make LoadStringW pass tests.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 9978cc9c56f7ec09be2d2a22c2e7fb5d5d1f07be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9978cc9c56f7ec09be2d2a22c… Author: Christopher Berner <raccoonone(a)procyongames.com> Date: Wed Mar 5 12:28:54 2008 -0800 user32: Make LoadStringW pass tests. --- dlls/crypt32/oid.c | 10 +++++----- dlls/hhctrl.ocx/help.c | 9 +++++---- dlls/mpr/wnet.c | 10 ++++++---- dlls/user32/resource.c | 12 +++++++++++- dlls/user32/tests/resource.c | 29 +++++++++++------------------ 5 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 5d17997..980c750 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -1402,8 +1402,9 @@ static void init_oid_info(HINSTANCE hinst) } else { + LPCWSTR stringresource; int len = LoadStringW(hinst, (UINT_PTR)oidInfoConstructors[i].pwszName, - NULL, 0); + (LPWSTR)&stringresource, 0); if (len) { @@ -1415,12 +1416,11 @@ static void init_oid_info(HINSTANCE hinst) memset(info, 0, sizeof(*info)); info->info.cbSize = sizeof(CRYPT_OID_INFO); info->info.pszOID = oidInfoConstructors[i].pszOID; - info->info.pwszName = - (LPWSTR)((LPBYTE)info + sizeof(struct OIDInfo)); + info->info.pwszName = (LPWSTR)(info + 1); info->info.dwGroupId = oidInfoConstructors[i].dwGroupId; info->info.u.Algid = oidInfoConstructors[i].Algid; - LoadStringW(hinst, (UINT_PTR)oidInfoConstructors[i].pwszName, - (LPWSTR)info->info.pwszName, len + 1); + memcpy(info + 1, stringresource, len*sizeof(WCHAR)); + ((LPWSTR)(info + 1))[len] = 0; if (oidInfoConstructors[i].blob) { info->info.ExtraInfo.cbData = diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 3f6a080..3ee522e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -51,13 +51,14 @@ static const WCHAR szEmpty[] = {0}; static LPWSTR HH_LoadString(DWORD dwID) { LPWSTR string = NULL; + LPCWSTR stringresource; int iSize; - iSize = LoadStringW(hhctrl_hinstance, dwID, NULL, 0); - iSize += 2; /* some strings (tab text) needs double-null termination */ + iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); - string = heap_alloc(iSize * sizeof(WCHAR)); - LoadStringW(hhctrl_hinstance, dwID, string, iSize); + string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ + memcpy(string, stringresource, iSize*sizeof(WCHAR)); + string[iSize] = 0; return string; } diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 17e8195..32bc255 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -279,16 +279,18 @@ void wnetInit(HINSTANCE hInstDll) { PWSTR ptrPrev; int entireNetworkLen; + LPCWSTR stringresource; entireNetworkLen = LoadStringW(hInstDll, - IDS_ENTIRENETWORK, NULL, 0); + IDS_ENTIRENETWORK, (LPWSTR)&stringresource, 0); providerTable->entireNetwork = HeapAlloc( GetProcessHeap(), 0, (entireNetworkLen + 1) * sizeof(WCHAR)); if (providerTable->entireNetwork) - LoadStringW(hInstDll, IDS_ENTIRENETWORK, - providerTable->entireNetwork, - entireNetworkLen + 1); + { + memcpy(providerTable->entireNetwork, stringresource, entireNetworkLen*sizeof(WCHAR)); + providerTable->entireNetwork[entireNetworkLen] = 0; + } providerTable->numAllocated = numToAllocate; for (ptr = providers; ptr; ) { diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 9eed0e8..cbdb4ea 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -368,6 +368,9 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, TRACE("instance = %p, id = %04x, buffer = %p, length = %d\n", instance, resource_id, buffer, buflen); + if(buffer == NULL) + return 0; + /* Use loword (incremented by 1) as resourceid */ hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((LOWORD(resource_id) >> 4) + 1), (LPWSTR)RT_STRING ); @@ -382,7 +385,14 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, TRACE("strlen = %d\n", (int)*p ); - if (buffer == NULL) return *p; + /*if buflen == 0, then return a read-only pointer to the resource itself in buffer + it is assumed that buffer is actually a (LPWSTR *) */ + if(buflen == 0) + { + *((LPWSTR *)buffer) = p + 1; + return *p; + } + i = min(buflen - 1, *p); if (i > 0) { memcpy(buffer, p + 1, i * sizeof (WCHAR)); diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index 7be82ad..99fc24f 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -43,13 +43,10 @@ static void test_LoadStringW(void) length1 = LoadStringW(hInst, 2, (WCHAR *) &resourcepointer, 0); /* get pointer to resource. */ length2 = LoadStringW(hInst, 2, returnedstringw, sizeof(returnedstringw) /sizeof(WCHAR)); /* get resource string */ ok(length2 > 0, "LoadStringW failed to load resource 2, ret %d, err %d\n", length2, GetLastError()); - todo_wine - { - ok(length1 == length2, "LoadStringW returned different values dependent on buflen. ret1 %d, ret2 %d\n", - length1, length2); - ok(length1 > 0 && resourcepointer != NULL, "LoadStringW failed to get pointer to resource 2, ret %d, err %d\n", - length1, GetLastError()); - } + ok(length1 == length2, "LoadStringW returned different values dependent on buflen. ret1 %d, ret2 %d\n", + length1, length2); + ok(length1 > 0 && resourcepointer != NULL, "LoadStringW failed to get pointer to resource 2, ret %d, err %d\n", + length1, GetLastError()); /* Copy the resource since it is not '\0' terminated, and add '\0' to the end */ if(resourcepointer != NULL) /* Check that the resource pointer was loaded to avoid access violation */ @@ -62,17 +59,13 @@ static void test_LoadStringW(void) ok(!memcmp(copiedstringw, returnedstringw, (length2 + 1)*sizeof(WCHAR)), "strings don't match: returnedstring = %s, copiedstring = %s\n", returnedstring, copiedstring); } - todo_wine - { - /* check that calling LoadStringW with buffer = NULL returns zero */ - retvalue = LoadStringW(hInst, 2, NULL, 0); - ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d\n", - retvalue); - /* check again, with a different buflen value, that calling LoadStringW with buffer = NULL returns zero */ - retvalue = LoadStringW(hInst, 2, NULL, 128); - ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d\n", - retvalue); - } + + /* check that calling LoadStringW with buffer = NULL returns zero */ + retvalue = LoadStringW(hInst, 2, NULL, 0); + ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d\n", retvalue); + /* check again, with a different buflen value, that calling LoadStringW with buffer = NULL returns zero */ + retvalue = LoadStringW(hInst, 2, NULL, 128); + ok(!retvalue, "LoadStringW returned a non-zero value when called with buffer = NULL, retvalue = %d\n", retvalue); } static void test_LoadStringA (void)

1 0

James Hawkins : msi: Fix an off-by-one error when applying embedded transforms.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 776a7d7065bbc8de1a0431b1a1a6a1e5779373b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776a7d7065bbc8de1a0431b1a… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Mar 10 23:03:50 2008 -0500 msi: Fix an off-by-one error when applying embedded transforms. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 04ccef5..cfef958 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -565,7 +565,7 @@ static UINT msi_apply_transforms( MSIPACKAGE *package ) for( i=0; xforms && xforms[i] && r == ERROR_SUCCESS; i++ ) { if (xforms[i][0] == ':') - r = msi_apply_substorage_transform( package, package->db, &xforms[i][1] ); + r = msi_apply_substorage_transform( package, package->db, xforms[i] ); else r = MSI_DatabaseApplyTransformW( package->db, xforms[i], 0 ); }

1 0

James Hawkins : msi: Optimize MsiSourceListAddSourceEx for adding to the end of the list.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 5871bee8c76add5c085924ee5686194fa593fd17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5871bee8c76add5c085924ee5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Mar 10 23:02:02 2008 -0500 msi: Optimize MsiSourceListAddSourceEx for adding to the end of the list. --- dlls/msi/source.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 37a0b8b..36fcc80 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -934,12 +934,15 @@ static void free_source_list(struct list *sourcelist) } } -static void add_source_to_list(struct list *sourcelist, media_info *info) +static void add_source_to_list(struct list *sourcelist, media_info *info, + DWORD *index) { media_info *iter; BOOL found = FALSE; static const WCHAR fmt[] = {'%','i',0}; + if (index) *index = 0; + if (list_empty(sourcelist)) { list_add_head(sourcelist, &info->entry); @@ -957,6 +960,8 @@ static void add_source_to_list(struct list *sourcelist, media_info *info) /* update the rest of the list */ if (found) sprintfW(iter->szIndex, fmt, ++iter->index); + else if (index) + (*index)++; } if (!found) @@ -1005,7 +1010,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou } index = ++(*count); - add_source_to_list(sourcelist, entry); + add_source_to_list(sourcelist, entry, NULL); } error: @@ -1031,6 +1036,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, LPWSTR source; LPCWSTR postfix; DWORD size, count; + DWORD index; static const WCHAR fmt[] = {'%','i',0}; static const WCHAR one[] = {'1',0}; @@ -1098,7 +1104,7 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, rc = RegSetValueExW(typekey, one, 0, REG_EXPAND_SZ, (LPBYTE)source, size); goto done; } - else if (dwIndex > count) + else if (dwIndex > count || dwIndex == 0) { sprintfW(name, fmt, count + 1); rc = RegSetValueExW(typekey, name, 0, REG_EXPAND_SZ, (LPBYTE)source, size); @@ -1106,10 +1112,6 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, } else { - /* add to the end of the list */ - if (dwIndex == 0) - dwIndex = count + 1; - sprintfW(name, fmt, dwIndex); info = msi_alloc(sizeof(media_info)); if (!info) @@ -1121,10 +1123,13 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, info->path = strdupW(source); lstrcpyW(info->szIndex, name); info->index = dwIndex; - add_source_to_list(&sourcelist, info); + add_source_to_list(&sourcelist, info, &index); LIST_FOR_EACH_ENTRY(info, &sourcelist, media_info, entry) { + if (info->index < index) + continue; + size = (lstrlenW(info->path) + 1) * sizeof(WCHAR); rc = RegSetValueExW(typekey, info->szIndex, 0, REG_EXPAND_SZ, (LPBYTE)info->path, size);

1 0

Alexandre Julliard : winex11: Add support for merging redundant events, and use it for ConfigureNotify and MotionNotify.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 0118e0d0f10fb61abcfeb5100b206b94594d4493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0118e0d0f10fb61abcfeb5100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 12:11:35 2008 +0100 winex11: Add support for merging redundant events, and use it for ConfigureNotify and MotionNotify. --- dlls/winex11.drv/event.c | 100 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 83 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cdd0853..c531410 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -241,39 +241,105 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) } +enum event_merge_action +{ + MERGE_DISCARD, /* discard the old event */ + MERGE_HANDLE, /* handle the old event */ + MERGE_KEEP /* keep the old event for future merging */ +}; + +/*********************************************************************** + * merge_events + * + * Try to merge 2 consecutive events. + */ +static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) +{ + if (prev->xany.window != next->xany.window) return MERGE_HANDLE; + switch (prev->type) + { + case ConfigureNotify: + if (prev->xany.window != next->xany.window) break; + switch (next->type) + { + case ConfigureNotify: + TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); + return MERGE_DISCARD; + case Expose: + case PropertyNotify: + return MERGE_KEEP; + } + break; + case MotionNotify: + if (next->type == MotionNotify) + { + TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); + return MERGE_DISCARD; + } + break; + } + return MERGE_HANDLE; +} + + +/*********************************************************************** + * call_event_handler + */ +static inline void call_event_handler( Display *display, XEvent *event ) +{ + HWND hwnd; + x11drv_event_handler handler; + + if (!(handler = find_handler( event->type ))) + { + TRACE( "%s for win %lx, ignoring\n", dbgstr_event( event->type ), event->xany.window ); + return; /* no handler, ignore it */ + } + + if (XFindContext( display, event->xany.window, winContext, (char **)&hwnd ) != 0) + hwnd = 0; /* not for a registered window */ + if (!hwnd && event->xany.window == root_window) hwnd = GetDesktopWindow(); + + TRACE( "%s for hwnd/window %p/%lx\n", + dbgstr_event( event->type ), hwnd, event->xany.window ); + wine_tsx11_unlock(); + handler( hwnd, event ); + wine_tsx11_lock(); +} + + /*********************************************************************** * process_events */ static int process_events( Display *display, Bool (*filter)(), ULONG_PTR arg ) { - XEvent event; - HWND hwnd; + XEvent event, prev_event; int count = 0; - x11drv_event_handler handler; + enum event_merge_action action = MERGE_DISCARD; + prev_event.type = 0; wine_tsx11_lock(); while (XCheckIfEvent( display, &event, filter, (char *)arg )) { count++; if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ - - if (!(handler = find_handler( event.type ))) + if (prev_event.type) action = merge_events( &prev_event, &event ); + switch( action ) { - TRACE( "%s for win %lx, ignoring\n", dbgstr_event( event.type ), event.xany.window ); - continue; /* no handler, ignore it */ + case MERGE_DISCARD: /* discard prev, keep new */ + prev_event = event; + break; + case MERGE_HANDLE: /* handle prev, keep new */ + call_event_handler( display, &prev_event ); + prev_event = event; + break; + case MERGE_KEEP: /* handle new, keep prev for future merging */ + call_event_handler( display, &event ); + break; } - - if (XFindContext( display, event.xany.window, winContext, (char **)&hwnd ) != 0) - hwnd = 0; /* not for a registered window */ - if (!hwnd && event.xany.window == root_window) hwnd = GetDesktopWindow(); - - wine_tsx11_unlock(); - TRACE( "%s for hwnd/window %p/%lx\n", - dbgstr_event( event.type ), hwnd, event.xany.window ); - handler( hwnd, &event ); - wine_tsx11_lock(); } XFlush( gdi_display ); + if (prev_event.type) call_event_handler( display, &prev_event ); wine_tsx11_unlock(); if (count) TRACE( "processed %d events\n", count ); return count;

1 0