June 2007 - Wine-commits - list.winehq.org

Paul Vriens : advapi32/tests: Add some service related tests.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 3418ed23e199012cef6c15bbe6fe01a1a20c85e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3418ed23e199012cef6c15bbe… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 26 12:56:53 2007 +0200 advapi32/tests: Add some service related tests. --- dlls/advapi32/tests/Makefile.in | 3 +- dlls/advapi32/tests/service.c | 150 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index e5d9a9f..2036759 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -14,7 +14,8 @@ CTESTS = \ crypt_sha.c \ lsa.c \ registry.c \ - security.c + security.c \ + service.c @MAKE_TEST_RULES@ diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c new file mode 100644 index 0000000..7dde5f5 --- /dev/null +++ b/dlls/advapi32/tests/service.c @@ -0,0 +1,150 @@ +/* + * Unit tests for service functions + * + * Copyright (c) 2007 Paul Vriens + * + * 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winsvc.h" + +#include "wine/test.h" + +static void test_sequence(void) +{ + SC_HANDLE scm_handle, svc_handle; + BOOL ret; + QUERY_SERVICE_CONFIGA *config; + DWORD given, needed; + static const CHAR servicename [] = "Winetest"; + static const CHAR displayname [] = "Winetest dummy service"; + static const CHAR pathname [] = "we_dont_care.exe"; + static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0\0"; + static const CHAR password [] = ""; + static const CHAR empty [] = ""; + static const CHAR localsystem [] = "LocalSystem"; + + SetLastError(0xdeadbeef); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + + if (!scm_handle && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) + { + skip("OpenSCManagerA is not implemented\n"); + return; + } + else if (!scm_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to get a handle to the manager\n"); + return; + } + else + ok(scm_handle != NULL, "Could not get a handle to the manager: %d\n", GetLastError()); + + if (!scm_handle) return; + + /* Create a dummy service */ + SetLastError(0xdeadbeef); + svc_handle = CreateServiceA(scm_handle, servicename, displayname, GENERIC_ALL, + SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, SERVICE_ERROR_IGNORE, + pathname, NULL, NULL, dependencies, NULL, password); + + if (!svc_handle && (GetLastError() == ERROR_SERVICE_EXISTS)) + { + /* We try and open the service and do the rest of the tests. Some could + * fail if the tests were changed between these runs. + */ + trace("Deletion probably didn't work last time\n"); + SetLastError(0xdeadbeef); + svc_handle = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + if (!svc_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to open the service\n"); + CloseServiceHandle(scm_handle); + return; + } + ok(svc_handle != NULL, "Could not open the service : %d\n", GetLastError()); + } + else if (!svc_handle && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights to create the service\n"); + CloseServiceHandle(scm_handle); + return; + } + else + ok(svc_handle != NULL, "Could not create the service : %d\n", GetLastError()); + + if (!svc_handle) return; + + /* TODO: + * Before we do a QueryServiceConfig we should check the registry. This will make sure + * that the correct keys are used. + */ + + /* Request the size for the buffer */ + SetLastError(0xdeadbeef); + ret = QueryServiceConfigA(svc_handle, NULL, 0, &needed); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + + config = HeapAlloc(GetProcessHeap(), 0, needed); + given = needed; + SetLastError(0xdeadbeef); + ret = QueryServiceConfigA(svc_handle, config, given, &needed); + ok(ret, "Expected success\n"); + todo_wine + { + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */|| + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */ || + GetLastError() == ERROR_IO_PENDING /* W2K */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + ok(given == needed, "Expected the given (%d) and needed (%d) buffersizes to be equal\n", given, needed); + } + ok(config->dwServiceType == (SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS), + "Expected SERVICE_INTERACTIVE_PROCESS | SERVICE_WIN32_OWN_PROCESS, got %d\n", config->dwServiceType); + ok(config->dwStartType == SERVICE_DISABLED, "Expected SERVICE_DISABLED, got %d\n", config->dwStartType); + ok(config->dwErrorControl == SERVICE_ERROR_IGNORE, "Expected SERVICE_ERROR_IGNORE, got %d\n", config->dwErrorControl); + ok(!strcmp(config->lpBinaryPathName, pathname), "Expected '%s', got '%s'\n", pathname, config->lpBinaryPathName); + ok(!strcmp(config->lpLoadOrderGroup, empty), "Expected an empty string, got '%s'\n", config->lpLoadOrderGroup); + ok(config->dwTagId == 0, "Expected 0, got %d\n", config->dwTagId); + /* TODO: Show the double 0 terminated string */ + todo_wine + ok(!memcmp(config->lpDependencies, dependencies, sizeof(dependencies)), "Wrong string\n"); + if(config->lpServiceStartName) /* FIXME: Wine workaround, remove when fixed */ + ok(!strcmp(config->lpServiceStartName, localsystem), "Expected 'LocalSystem', got '%s'\n", config->lpServiceStartName); + if(config->lpDisplayName) /* FIXME: Wine workaround, remove when fixed */ + ok(!strcmp(config->lpDisplayName, displayname), "Expected '%s', got '%s'\n", displayname, config->lpDisplayName); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS /* W2K3 */|| + GetLastError() == 0xdeadbeef /* NT4, XP, Vista */ || + GetLastError() == ERROR_IO_PENDING /* W2K */, + "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); +} + +START_TEST(service) +{ + /* Test the creation, querying and deletion of a service */ + test_sequence(); +}

1 0

Paul Vriens : advapi32/service: Use the correct registry key for the service account.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 160b55cb2a6e3e1dc5a4eae82dc98a0724f055f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=160b55cb2a6e3e1dc5a4eae82… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jun 26 17:28:14 2007 +0200 advapi32/service: Use the correct registry key for the service account. --- dlls/advapi32/service.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4808db1..701227b 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -238,6 +238,8 @@ static const WCHAR szDependencies[] = { 'D','e','p','e','n','d','e','n','c','i','e','s',0}; static const WCHAR szDependOnService[] = { 'D','e','p','e','n','d','O','n','S','e','r','v','i','c','e',0}; +static const WCHAR szObjectName[] = { + 'O','b','j','e','c','t','N','a','m','e',0}; struct reg_value { DWORD type; @@ -1317,6 +1319,8 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, if( lpLoadOrderGroup ) service_set_string( &val[n++], szGroup, lpLoadOrderGroup ); + /* FIXME: lpDependencies is used to create both DependOnService and DependOnGroup + * There is no such key as what szDependencies refers to */ if( lpDependencies ) service_set_multi_string( &val[n++], szDependencies, lpDependencies ); @@ -1324,7 +1328,7 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, FIXME("Don't know how to add a Password for a service.\n"); if( lpServiceStartName ) - service_set_string( &val[n++], szDependOnService, lpServiceStartName ); + service_set_string( &val[n++], szObjectName, lpServiceStartName ); r = service_write_values( hKey, val, n ); if( r != ERROR_SUCCESS ) @@ -2209,6 +2213,8 @@ BOOL WINAPI ChangeServiceConfigW( SC_HANDLE hService, DWORD dwServiceType, if( lpLoadOrderGroup ) service_set_string( &val[n++], szGroup, lpLoadOrderGroup ); + /* FIXME: lpDependencies is used to create/change both DependOnService and DependOnGroup + * There is no such key as what szDependencies refers to */ if( lpDependencies ) service_set_multi_string( &val[n++], szDependencies, lpDependencies ); @@ -2216,7 +2222,7 @@ BOOL WINAPI ChangeServiceConfigW( SC_HANDLE hService, DWORD dwServiceType, FIXME("ignoring password\n"); if( lpServiceStartName ) - service_set_string( &val[n++], szDependOnService, lpServiceStartName ); + service_set_string( &val[n++], szObjectName, lpServiceStartName ); r = service_write_values( hsvc->hkey, val, n );

1 0

Evan Stade : gdi32: Added missing call to GDI_ReleaseObj.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 39357c4ba6a862bbe257b6ac9691ee40564e9b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39357c4ba6a862bbe257b6ac9… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jun 26 17:50:52 2007 -0700 gdi32: Added missing call to GDI_ReleaseObj. --- dlls/gdi32/painting.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 98bae33..1b30d6d 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -812,6 +812,7 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, F dc->CursPosX = x2; dc->CursPosY = y2; } + GDI_ReleaseObj( hdc ); return result; }

1 0

Damjan Jovanovic : winex11.drv: Added better support for the X file drag protocol.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: b6030cb26de8c0201a33f59d52322f375786bb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6030cb26de8c0201a33f59d5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 27 09:50:35 2007 +0200 winex11.drv: Added better support for the X file drag protocol. --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 3 +- dlls/winex11.drv/xdnd.c | 178 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8de2e25..c542582 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -597,6 +597,7 @@ enum x11drv_atoms XATOM_text_plain, XATOM_text_rtf, XATOM_text_richtext, + XATOM_text_uri_list, NB_XATOMS }; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 15a3624..e4c8a87 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -158,7 +158,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/html", "text/plain", "text/rtf", - "text/richtext" + "text/richtext", + "text/uri-list" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index f1d6d24..59410c5 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -2,6 +2,7 @@ * XDND handler code * * Copyright 2003 Ulrich Czekalla + * Copyright 2007 Damjan Jovanovic * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ # include <unistd.h> #endif #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -35,6 +37,7 @@ #include "x11drv.h" #include "shlobj.h" /* DROPFILES */ +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xdnd); @@ -56,6 +59,7 @@ static LPXDNDDATA XDNDData = NULL; static POINT XDNDxy = { 0, 0 }; static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); +static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); @@ -64,6 +68,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); +static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI); static DROPFILES* X11DRV_XDND_BuildDropFiles(char* filename, unsigned int len, POINT pt); static CRITICAL_SECTION xdnd_cs; @@ -333,7 +338,9 @@ static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int X11DRV_XDND_InsertXDNDData(property, property, xdata, len); count++; - if (property == x11drv_atom(text_plain)) + if (property == x11drv_atom(text_uri_list)) + count += X11DRV_XDND_DeconstructTextURIList(property, data, len); + else if (property == x11drv_atom(text_plain)) count += X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) count += X11DRV_XDND_DeconstructTextHTML(property, data, len); @@ -343,6 +350,92 @@ static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int /************************************************************************** + * X11DRV_XDND_DeconstructTextURIList + * + * Interpret text/uri-list data and add records to <dndfmt> linked list + */ +static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) +{ + char *uriList = (char*) data; + char *uri; + WCHAR *path; + + char *out = NULL; + int size = 0; + int capacity = 4096; + + int count = 0; + int start = 0; + int end = 0; + + out = HeapAlloc(GetProcessHeap(), 0, capacity); + if (out == NULL) + return 0; + + while (end < len) + { + while (end < len && uriList[end] != '\r') + ++end; + if (end == len) + break; + if (uriList[end+1] != '\n') + { + WARN("URI list line doesn't end in \\r\\n\n"); + break; + } + + uri = HeapAlloc(GetProcessHeap(), 0, end - start + 1); + if (uri == NULL) + break; + lstrcpynA(uri, &uriList[start], end - start + 1); + path = X11DRV_XDND_URIToDOS(uri); + TRACE("converted URI %s to DOS path %s\n", debugstr_a(uri), debugstr_w(path)); + HeapFree(GetProcessHeap(), 0, uri); + + if (path) + { + int pathSize = strlenW(path) + 1; + if (pathSize > capacity-size) + { + capacity = 2*capacity + pathSize; + out = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, out, capacity + 1); + if (out == NULL) + goto done; + } + WideCharToMultiByte(CP_ACP, 0, path, -1, &out[size], pathSize, 0, 0); + size += pathSize; + done: + HeapFree(GetProcessHeap(), 0, path); + if (out == NULL) + break; + } + + start = end + 2; + end = start; + } + if (out && end == len) + { + DROPFILES *dropFiles; + dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + size + 1); + if (dropFiles) + { + dropFiles->pFiles = sizeof(DROPFILES); + dropFiles->pt.x = XDNDxy.x; + dropFiles->pt.y = XDNDxy.y; + dropFiles->fNC = 0; + dropFiles->fWide = FALSE; + out[size] = '\0'; + memcpy(((char*)dropFiles) + dropFiles->pFiles, out, size + 1); + X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + size + 1); + count = 1; + } + } + HeapFree(GetProcessHeap(), 0, out); + return count; +} + + +/************************************************************************** * X11DRV_XDND_DeconstructTextPlain * * Interpret text/plain Data and add records to <dndfmt> linked list @@ -566,3 +659,86 @@ static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len) return lines; } + + +/************************************************************************** + * X11DRV_XDND_URIToDOS + */ +static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI) +{ + WCHAR *ret = NULL; + int i; + int j = 0; + char *uri = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, strlen(encodedURI) + 1); + if (uri == NULL) + return NULL; + for (i = 0; encodedURI[i]; ++i) + { + if (encodedURI[i] == '%') + { + if (encodedURI[i+1] && encodedURI[i+2]) + { + char buffer[3]; + int number; + buffer[0] = encodedURI[i+1]; + buffer[1] = encodedURI[i+2]; + buffer[2] = '\0'; + sscanf(buffer, "%x", &number); + uri[j++] = number; + i += 2; + } + else + { + WARN("invalid URI encoding in %s\n", debugstr_a(encodedURI)); + HeapFree(GetProcessHeap(), 0, uri); + return NULL; + } + } + else + uri[j++] = encodedURI[i]; + } + + /* Read http://www.freedesktop.org/wiki/Draganddropwarts and cry... */ + if (strncmp(uri, "file:/", 6) == 0) + { + if (uri[6] == '/') + { + if (uri[7] == '/') + { + /* file:///path/to/file (nautilus, thunar) */ + ret = wine_get_dos_file_name(&uri[7]); + } + else if (uri[7]) + { + /* file://hostname/path/to/file (X file drag spec) */ + char hostname[256]; + char *path = strchr(&uri[7], '/'); + if (path) + { + *path = '\0'; + if (strcmp(&uri[7], "localhost") == 0) + { + *path = '/'; + ret = wine_get_dos_file_name(path); + } + else if (gethostname(hostname, sizeof(hostname)) == 0) + { + if (strcmp(hostname, &uri[7]) == 0) + { + *path = '/'; + ret = wine_get_dos_file_name(path); + } + } + } + } + } + else if (uri[6]) + { + /* file:/path/to/file (konqueror) */ + ret = wine_get_dos_file_name(&uri[5]); + } + } + HeapFree(GetProcessHeap(), 0, uri); + return ret; +} +

1 0

Michael Stefaniuc : winedos: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: b4475b257ed5ff9e673208d1b3a5ffaa0632d787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4475b257ed5ff9e673208d1b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 00:14:06 2007 +0200 winedos: Remove superfluous casts of void pointers to other pointer types. --- dlls/winedos/int31.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 5fa46c6..dc7351c 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -1253,7 +1253,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) TRACE( "allocate memory block (%d bytes)\n", size ); - ptr = (BYTE *)DPMI_xalloc( size ); + ptr = DPMI_xalloc( size ); if (!ptr) { SET_AX( context, 0x8012 ); /* linear memory not available */ @@ -1285,7 +1285,7 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) TRACE( "resize memory block (0x%08x, %d bytes)\n", handle, size ); - ptr = (BYTE *)DPMI_xrealloc( (void *)handle, size ); + ptr = DPMI_xrealloc( (void *)handle, size ); if (!ptr) { SET_AX( context, 0x8012 ); /* linear memory not available */

1 0

Michael Stefaniuc : janitorial: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 0152ec037593e295984ce9d2c491e74a3266b002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0152ec037593e295984ce9d2c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 00:16:11 2007 +0200 janitorial: Remove superfluous casts of void pointers to other pointer types. --- dlls/amstream/amstream.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/riched20/reader.c | 2 +- dlls/shlwapi/tests/string.c | 2 +- dlls/user32/tests/cursoricon.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 422239c..692403b 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -260,7 +260,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream hr = MediaStream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { - pNewStreams = (IMediaStream**)CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*)); + pNewStreams = CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*)); if (!pNewStreams) { IMediaStream_Release(pStream); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index fa17787..94b3f62 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -150,7 +150,7 @@ xmlChar *xmlChar_from_wchar( LPWSTR str ) xmlChar *xmlstr; len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); - xmlstr = (xmlChar*) HeapAlloc( GetProcessHeap(), 0, len ); + xmlstr = HeapAlloc( GetProcessHeap(), 0, len ); if ( xmlstr ) WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL ); return xmlstr; diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 7fb641b..0cf8ca7 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2682,7 +2682,7 @@ static void RTFFlushCPOutputBuffer(RTF_Info *info) { int bufferMax = info->dwCPOutputCount * 2 * sizeof(WCHAR); - WCHAR *buffer = (WCHAR *)RTFAlloc(bufferMax); + WCHAR *buffer = RTFAlloc(bufferMax); int length; length = MultiByteToWideChar(info->codePage, 0, info->cpOutputBuffer, diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index c868e1e..895d767 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -605,7 +605,7 @@ static void test_StrCmpW(void) static WCHAR *CoDupStrW(const char* src) { INT len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); - WCHAR* szTemp = (WCHAR*)CoTaskMemAlloc(len * sizeof(WCHAR)); + WCHAR* szTemp = CoTaskMemAlloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, src, -1, szTemp, len); return szTemp; } diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 6d93138..84b9fe3 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -94,7 +94,7 @@ static void test_CopyImage_Bitmap(int depth) unsigned int i; /* Create a device-independent bitmap (DIB) */ - info = (BITMAPINFO *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biWidth = 2; info->bmiHeader.biHeight = 2;

1 0

Michael Stefaniuc : wined3d: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 0326da9dd500d47befd44f17a37b02e46a162cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0326da9dd500d47befd44f17a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 00:13:32 2007 +0200 wined3d: Remove superfluous casts of void pointers to other pointer types. --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4ab7702..11ede05 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -65,7 +65,7 @@ void print_glsl_info_log(WineD3D_GL_Info *gl_info, GLhandleARB obj) { * that if there are errors. */ if (infologLength > 1) { - infoLog = (char *)HeapAlloc(GetProcessHeap(), 0, infologLength); + infoLog = HeapAlloc(GetProcessHeap(), 0, infologLength); GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog)); FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog)); HeapFree(GetProcessHeap(), 0, infoLog); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c8e961a..027f8f1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1871,7 +1871,7 @@ static BOOL palette9_changed(IWineD3DSurfaceImpl *This) { return FALSE; } } else { - This->palette9 = (PALETTEENTRY *) HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256); + This->palette9 = HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256); } memcpy(This->palette9, &device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256); return TRUE;

1 0

Michael Stefaniuc : dbghelp: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: f59c8a688f526817551751b7d037721637f65d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59c8a688f526817551751b7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 00:13:42 2007 +0200 dbghelp: Remove superfluous casts of void pointers to other pointer types. --- dlls/dbghelp/msc.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 0bd353e..e6542e9 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -342,14 +342,13 @@ static int codeview_add_type(unsigned int typeno, struct symt* dt) { cv_current_module->num_defined_types += 0x100; if (cv_current_module->defined_types) - cv_current_module->defined_types = (struct symt**) - HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - cv_current_module->defined_types, + cv_current_module->defined_types = HeapReAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, cv_current_module->defined_types, cv_current_module->num_defined_types * sizeof(struct symt*)); else - cv_current_module->defined_types = (struct symt**) - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - cv_current_module->num_defined_types * sizeof(struct symt*)); + cv_current_module->defined_types = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + cv_current_module->num_defined_types * sizeof(struct symt*)); if (cv_current_module->defined_types == NULL) return FALSE; } @@ -1124,8 +1123,8 @@ static struct codeview_linetab* codeview_snarf_linetab(struct module* module, * There is one header for each segment, so that we can reach in * and pull bits as required. */ - lt_hdr = (struct codeview_linetab*) - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nseg + 1) * sizeof(*lt_hdr)); + lt_hdr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + (nseg + 1) * sizeof(*lt_hdr)); if (lt_hdr == NULL) { goto leave;

1 0

Michael Stefaniuc : wininet: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: c576803f6d5a5726319c3fb141950cdf293456b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c576803f6d5a5726319c3fb14… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 00:13:53 2007 +0200 wininet: Remove superfluous casts of void pointers to other pointer types. --- dlls/wininet/tests/url.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 10b45c9..98442bb 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -569,7 +569,7 @@ static void InternetCreateUrlA_test(void) urlComp.lpszScheme = nhttp; urlComp.dwSchemeLength = strlen(urlComp.lpszScheme); len = strlen(CREATE_URL6) + 1; - szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, len); + szUrl = HeapAlloc(GetProcessHeap(), 0, len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL6), "Expected len %d, got %d\n", lstrlenA(CREATE_URL6) + 1, len); @@ -606,7 +606,7 @@ static void InternetCreateUrlA_test(void) urlComp.lpszExtraInfo = empty; urlComp.dwExtraInfoLength = 0; len = strlen(CREATE_URL1); - szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL1), "Expected len %d, got %d\n", lstrlenA(CREATE_URL1), len); @@ -631,7 +631,7 @@ static void InternetCreateUrlA_test(void) urlComp.lpszExtraInfo = empty; urlComp.dwExtraInfoLength = 0; len = strlen(CREATE_URL8); - szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL8), "Expected len %d, got %d\n", lstrlenA(CREATE_URL8), len); @@ -647,7 +647,7 @@ static void InternetCreateUrlA_test(void) urlComp.dwUrlPathLength = 5; len = strlen(CREATE_URL9); len++; /* work around bug in native wininet */ - szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL9), "Expected len %d, got %d\n", lstrlenA(CREATE_URL9), len); @@ -662,7 +662,7 @@ static void InternetCreateUrlA_test(void) urlComp.lpszUrlPath = blank; len = strlen(CREATE_URL10); len++; /* work around bug in native wininet */ - szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL10), "Expected len %d, got %d\n", lstrlenA(CREATE_URL10), len); @@ -675,7 +675,7 @@ static void InternetCreateUrlA_test(void) urlComp.nPort = 8080; urlComp.lpszScheme = about; len = strlen(CREATE_URL11); - szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL11), "Expected len %d, got %d\n", lstrlenA(CREATE_URL11), len); @@ -692,7 +692,7 @@ static void InternetCreateUrlA_test(void) urlComp.dwHostNameLength = 0; urlComp.nPort = 65535; len = strlen(CREATE_URL12); - szUrl = (char *)HeapAlloc(GetProcessHeap(), 0, ++len); + szUrl = HeapAlloc(GetProcessHeap(), 0, ++len); ret = InternetCreateUrlA(&urlComp, ICU_ESCAPE, szUrl, &len); ok(ret, "Expected success\n"); ok(len == strlen(CREATE_URL12), "Expected len %d, got %d\n", lstrlenA(CREATE_URL12), len);

1 0

Michael Stefaniuc : kernel32: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 27 Jun '07

27 Jun '07

Module: wine Branch: master Commit: 7596e3dd91f9f7c327ad5c538002ce4304c14b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7596e3dd91f9f7c327ad5c538… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 27 00:12:59 2007 +0200 kernel32: Remove superfluous casts of void pointers to other pointer types. --- dlls/kernel32/tests/pipe.c | 2 +- dlls/kernel32/tests/virtual.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 81159ab..1850e77 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -848,7 +848,7 @@ static DWORD CALLBACK named_pipe_client_func(LPVOID p) ret = GetTokenInformation(process_token, TokenPrivileges, NULL, 0, &Size); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetTokenInformation(TokenPrivileges) failed with %d\n", GetLastError()); - Privileges = (TOKEN_PRIVILEGES *)HeapAlloc(GetProcessHeap(), 0, Size); + Privileges = HeapAlloc(GetProcessHeap(), 0, Size); ret = GetTokenInformation(process_token, TokenPrivileges, Privileges, Size, &Size); ok(ret, "GetTokenInformation(TokenPrivileges) failed with %d\n", GetLastError()); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index a033096..7727c65 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -81,8 +81,8 @@ static void test_VirtualAllocEx(void) return; } - src = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); - dst = (char *) HeapAlloc( GetProcessHeap(), 0, alloc_size ); + src = HeapAlloc( GetProcessHeap(), 0, alloc_size ); + dst = HeapAlloc( GetProcessHeap(), 0, alloc_size ); for (i = 0; i < alloc_size; i++) src[i] = i & 0xff;

1 0