November 2007 - Wine-commits

Gerald Pfeifer : shell32: Avoid checking for <0 for unsigned variables.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: e403292e5af8e5a1bc18de74a28d2fee6c482b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e403292e5af8e5a1bc18de74a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 17:58:32 2007 +0100 shell32: Avoid checking for <0 for unsigned variables. --- dlls/shell32/recyclebin.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 441068f..ddf2fc3 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -381,7 +381,7 @@ static HRESULT WINAPI RecycleBin_GetDefaultColumnState(IShellFolder2 *iface, UIN { RecycleBin *This = (RecycleBin *)iface; TRACE("(%p, %d, %p)\n", This, iColumn, pcsFlags); - if (iColumn < 0 || iColumn >= COLUMNS_COUNT) + if (iColumn >= COLUMNS_COUNT) return E_INVALIDARG; *pcsFlags = RecycleBinColumns[iColumn].pcsFlags; return S_OK; @@ -400,7 +400,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS WCHAR buffer[MAX_PATH]; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, pDetails); - if (iColumn < 0 || iColumn >= COLUMNS_COUNT) + if (iColumn >= COLUMNS_COUNT) return E_FAIL; pDetails->fmt = RecycleBinColumns[iColumn].fmt; pDetails->cxChar = RecycleBinColumns[iColumn].cxChars; @@ -446,7 +446,7 @@ static HRESULT WINAPI RecycleBin_MapColumnToSCID(IShellFolder2 *iface, UINT iCol { RecycleBin *This = (RecycleBin *)iface; TRACE("(%p, %d, %p)\n", This, iColumn, pscid); - if (iColumn<0 || iColumn>=COLUMNS_COUNT) + if (iColumn>=COLUMNS_COUNT) return E_INVALIDARG; pscid->fmtid = *RecycleBinColumns[iColumn].fmtId; pscid->pid = RecycleBinColumns[iColumn].pid;

1 0

Gerald Pfeifer : dinput: Fix type of loop variable in alloc_device().
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 79ccb7889c86367c40c994b5ef73a0f4adcce118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ccb7889c86367c40c994b5e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 18:05:39 2007 +0100 dinput: Fix type of loop variable in alloc_device(). --- dlls/dinput/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 214bbd8..35ddc0b 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -173,7 +173,7 @@ static SysMouseImpl *alloc_device(REFGUID rguid, const void *mvt, IDirectInputIm { SysMouseImpl* newDevice; LPDIDATAFORMAT df = NULL; - int i; + unsigned i; newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysMouseImpl)); if (!newDevice) return NULL;

1 0

Rob Shearman : setupapi: Make the setupapi tests load on systems < Vista by providing a private implementation of RegDeleteTreeW.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 55aeb80aa3657623fdd474852d2930ca221ba53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55aeb80aa3657623fdd474852… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 1 22:04:03 2007 +0000 setupapi: Make the setupapi tests load on systems < Vista by providing a private implementation of RegDeleteTreeW. --- dlls/setupapi/tests/devinst.c | 70 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 115da83..5dda333 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -70,6 +70,74 @@ static void init_function_pointers(void) pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); } +/* RegDeleteTreeW from dlls/advapi32/registry.c */ +LSTATUS WINAPI devinst_RegDeleteTreeW(HKEY hKey, LPCWSTR lpszSubKey) +{ + LONG ret; + DWORD dwMaxSubkeyLen, dwMaxValueLen; + DWORD dwMaxLen, dwSize; + WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf; + HKEY hSubKey = hKey; + + if(lpszSubKey) + { + ret = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey); + if (ret) return ret; + } + + /* Get highest length for keys, values */ + ret = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, NULL, + &dwMaxSubkeyLen, NULL, NULL, &dwMaxValueLen, NULL, NULL, NULL); + if (ret) goto cleanup; + + dwMaxSubkeyLen++; + dwMaxValueLen++; + dwMaxLen = max(dwMaxSubkeyLen, dwMaxValueLen); + if (dwMaxLen > sizeof(szNameBuf)/sizeof(WCHAR)) + { + /* Name too big: alloc a buffer for it */ + if (!(lpszName = HeapAlloc( GetProcessHeap(), 0, dwMaxLen*sizeof(WCHAR)))) + { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + } + + + /* Recursively delete all the subkeys */ + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, + NULL, NULL, NULL)) break; + + ret = devinst_RegDeleteTreeW(hSubKey, lpszName); + if (ret) goto cleanup; + } + + if (lpszSubKey) + ret = RegDeleteKeyW(hKey, lpszSubKey); + else + while (TRUE) + { + dwSize = dwMaxLen; + if (RegEnumValueW(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueW(hKey, lpszName); + if (ret) goto cleanup; + } + +cleanup: + /* Free buffer if allocated */ + if (lpszName != szNameBuf) + HeapFree( GetProcessHeap(), 0, lpszName); + if(lpszSubKey) + RegCloseKey(hSubKey); + return ret; +} + + static void test_SetupDiCreateDeviceInfoListEx(void) { HDEVINFO devlist; @@ -686,7 +754,7 @@ static void testDevRegKey(void) ret = pSetupDiCallClassInstaller(DIF_REMOVE, set, &devInfo); pSetupDiDestroyDeviceInfoList(set); } - RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, classKey); } START_TEST(devinst)

1 0

Chris Robinson : setupapi: Add stub for SetupInstallServicesFromInfSectionW .
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 4d721de4d2e413787c5a11a50ca2478617ef4154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d721de4d2e413787c5a11a50… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Fri Nov 2 02:27:40 2007 -0700 setupapi: Add stub for SetupInstallServicesFromInfSectionW. --- dlls/setupapi/install.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 412b1fd..ad44640 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1067,6 +1067,15 @@ void WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, LPCSTR cmdline, IN } /*********************************************************************** + * SetupInstallServicesFromInfSectionW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF Inf, PCWSTR SectionName, DWORD Flags) +{ + FIXME("(%p, %s, %d) stub!\n", Inf, debugstr_w(SectionName), Flags); + return FALSE; +} + +/*********************************************************************** * SetupInstallServicesFromInfSectionA (SETUPAPI.@) */ BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DWORD Flags) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 7f64edf..328a23e 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -445,7 +445,7 @@ @ stdcall SetupInstallServicesFromInfSectionA(long str long) @ stub SetupInstallServicesFromInfSectionExA @ stub SetupInstallServicesFromInfSectionExW -@ stub SetupInstallServicesFromInfSectionW +@ stdcall SetupInstallServicesFromInfSectionW(long wstr long) @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) @ stub SetupLogErrorA

1 0

Gerald Pfeifer : wined3d: Fix type of loop variable in IWineD3DCubeTextureImpl_Destroy().
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: d59ca347949535db169bc516dcd2c2529735ae79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d59ca347949535db169bc516d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 17:15:45 2007 +0100 wined3d: Fix type of loop variable in IWineD3DCubeTextureImpl_Destroy(). --- dlls/wined3d/cubetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 28677c6..3cb44e6 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -272,7 +272,7 @@ static void WINAPI IWineD3DCubeTextureImpl_ApplyStateChanges(IWineD3DCubeTexture ******************************************* */ static void WINAPI IWineD3DCubeTextureImpl_Destroy(IWineD3DCubeTexture *iface, D3DCB_DESTROYSURFACEFN D3DCB_DestroySurface) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - int i,j; + unsigned int i,j; TRACE("(%p) : Cleaning up\n",This); for (i = 0; i < This->baseTexture.levels; i++) { for (j = 0; j < 6; j++) {

1 0

Gerald Pfeifer : user32: Don't check unsigned types for >= 0.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: c7adf5f4b296d266bf06ed6c1a638595b00e13fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7adf5f4b296d266bf06ed6c1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 1 17:42:50 2007 +0100 user32: Don't check unsigned types for >= 0. --- dlls/user32/tests/dde.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index b6f1d94..ca9fe20 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1286,7 +1286,7 @@ static HDDEDATA CALLBACK client_dde_callback(UINT uType, UINT uFmt, HCONV hconv, const char *cmd_name; type = (uType & XTYP_MASK) >> XTYP_SHIFT; - cmd_name = (type >= 0 && type <= 14) ? cmd_type[type] : "unknown"; + cmd_name = (type <= 14) ? cmd_type[type] : "unknown"; trace("client_dde_callback: %04x (%s) %d %p %p %p %p %08lx %08lx\n", uType, cmd_name, uFmt, hconv, hsz1, hsz2, hdata, dwData1, dwData2);

1 0

Dmitry Timoshkov : winex11.drv: Initialize buffer size.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 407db36684b879c15247b5a5aed6610da40a647c URL: http://source.winehq.org/git/wine.git/?a=commit;h=407db36684b879c15247b5a5a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 1 21:09:03 2007 +0800 winex11.drv: Initialize buffer size. --- dlls/winex11.drv/settings.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index d530f9b..116bf15 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -176,6 +176,7 @@ static BOOL read_registry_settings(DEVMODEW *dm) return FALSE; #define query_value(name, data) \ + size = sizeof(DWORD); \ if (RegQueryValueExA(hkey, name, 0, &type, (LPBYTE)(data), &size) || \ type != REG_DWORD || size != sizeof(DWORD)) \ ret = FALSE

1 0

Marcel Partap : include: Add winddiui.h header.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 91b3eac2f21d7b2f531b120f6e9aa8646c8a9295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b3eac2f21d7b2f531b120f6… Author: Marcel Partap <mpartap(a)gmx.net> Date: Thu Nov 1 19:12:19 2007 +0100 include: Add winddiui.h header. --- include/Makefile.in | 1 + include/ddk/winddiui.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 7ae17d7..9835f09 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -125,6 +125,7 @@ SRCDIR_INCLUDES = \ ddk/ntddser.h \ ddk/ntddtape.h \ ddk/wdm.h \ + ddk/winddiui.h \ ddk/winsplp.h \ ddraw.h \ ddrawi.h \ diff --git a/include/ddk/winddiui.h b/include/ddk/winddiui.h new file mode 100644 index 0000000..7c6e775 --- /dev/null +++ b/include/ddk/winddiui.h @@ -0,0 +1,50 @@ +/* + * Header for the Device Driver Interface - User Interface library + * + * Copyright 2007 Marcel Partap + * + * 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 __WINE_WINDDIUI_H +#define __WINE_WINDDIUI_H + +#include <ddk/compstui.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#define DRIVER_EVENT_INITIALIZE 1 +#define DRIVER_EVENT_DELETE 2 + +#define PRINTER_EVENT_ADD_CONNECTION 1 +#define PRINTER_EVENT_DELETE_CONNECTION 2 +#define PRINTER_EVENT_INITIALIZE 3 +#define PRINTER_EVENT_DELETE 4 +#define PRINTER_EVENT_CACHE_REFRESH 5 +#define PRINTER_EVENT_CACHE_DELETE 6 +#define PRINTER_EVENT_ATTRIBUTES_CHANGED 7 + +#define PRINTER_EVENT_FLAG_NO_UI 1 + +BOOL WINAPI DrvDriverEvent(DWORD, DWORD, LPBYTE, LPARAM); +BOOL WINAPI DrvPrinterEvent(LPWSTR, INT, DWORD, LPARAM); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __WINE_WINDDIUI_H */

1 0

Alexandre Julliard : user32/tests: Don' t test the contents of uninitialized buffers.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 5c5e333284a832c8ef0f40ad1a55e7abc40da095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5e333284a832c8ef0f40ad1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 12:27:27 2007 +0100 user32/tests: Don't test the contents of uninitialized buffers. --- dlls/user32/tests/dde.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e78c8c9..b6f1d94 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1512,7 +1512,6 @@ static void test_DdeCreateDataHandle(void) ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); - ok(lstrlenA((LPSTR)ptr) == 0, "Expected 0, got %d\n", lstrlenA((LPSTR)ptr)); ok(size == 260, "Expected 260, got %d\n", size); ret = DdeUnaccessData(hdata); @@ -1536,8 +1535,6 @@ static void test_DdeCreateDataHandle(void) ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); - ok(lstrlenA((LPSTR)ptr) != 0, "Expected non-empty string\n"); - ok(lstrcmpA((LPSTR)ptr, "data"), "Did not expect data\n"); ok(size == 0, "Expected 0, got %d\n", size); ret = DdeUnaccessData(hdata);

1 0

Thomas Weidenmueller : shell32: Use SHStrDupW in IShellFolder2:: GetDetailsOf to allocate returned string.
by Alexandre Julliard 02 Nov '07

02 Nov '07

Module: wine Branch: master Commit: 4c516e63d31a846c41b77b5ecf8d84a5af268f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c516e63d31a846c41b77b5ec… Author: Thomas Weidenmueller <thomas(a)reactsoft.com> Date: Thu Nov 1 16:02:57 2007 -0600 shell32: Use SHStrDupW in IShellFolder2::GetDetailsOf to allocate returned string. --- dlls/shell32/recyclebin.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index a1ca9a6..441068f 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -439,8 +439,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS } pDetails->str.uType = STRRET_WSTR; - pDetails->str.u.pOleStr = StrDupW(buffer); - return (pDetails->str.u.pOleStr != NULL ? S_OK : E_OUTOFMEMORY); + return SHStrDupW(buffer, &pDetails->str.u.pOleStr); } static HRESULT WINAPI RecycleBin_MapColumnToSCID(IShellFolder2 *iface, UINT iColumn, SHCOLUMNID *pscid)

1 0