May 2009 - Wine-commits - list.winehq.org

Francois Gouget : lz32/tests: Replace malloc() with HeapAlloc().
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: ea58ea76e2f4450f4c75107dbcb03260811da462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea58ea76e2f4450f4c75107db… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:32:29 2009 +0200 lz32/tests: Replace malloc() with HeapAlloc(). --- dlls/lz32/tests/lzexpand_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 91fd687..3e46fb0 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -881,10 +881,10 @@ static void test_LZOpenFileW(void) START_TEST(lzexpand_main) { - buf = malloc(uncompressed_data_size * 2); + buf = HeapAlloc(GetProcessHeap(), 0, uncompressed_data_size * 2); test_LZOpenFileA(); test_LZOpenFileW(); test_LZRead(); test_LZCopy(); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); }

1 0

Francois Gouget : ntdll/tests: Replace malloc() with HeapAlloc().
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: d6a9082dc48f00328aefa528b2b510259d298f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a9082dc48f00328aefa528b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:32:38 2009 +0200 ntdll/tests: Replace malloc() with HeapAlloc(). --- dlls/ntdll/tests/rtlstr.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index e1d4be7..53f0c80 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -89,7 +89,7 @@ static WCHAR* AtoW( const char* p ) { WCHAR* buffer; DWORD len = MultiByteToWideChar( CP_ACP, 0, p, -1, NULL, 0 ); - buffer = malloc( len * sizeof(WCHAR) ); + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, p, -1, buffer, len ); return buffer; } @@ -191,7 +191,7 @@ static void test_RtlInitUnicodeStringEx(void) UNICODE_STRING uni; NTSTATUS result; - teststring2 = malloc((TESTSTRING2_LEN + 1) * sizeof(WCHAR)); + teststring2 = HeapAlloc(GetProcessHeap(), 0, (TESTSTRING2_LEN + 1) * sizeof(WCHAR)); memset(teststring2, 'X', TESTSTRING2_LEN * sizeof(WCHAR)); teststring2[TESTSTRING2_LEN] = '\0'; @@ -293,7 +293,7 @@ static void test_RtlInitUnicodeStringEx(void) "pRtlInitUnicodeString(&uni, 0) sets Buffer to %p, expected %p\n", uni.Buffer, NULL); - free(teststring2); + HeapFree(GetProcessHeap(), 0, teststring2); } @@ -1364,7 +1364,7 @@ static void test_RtlUnicodeStringToInteger(void) ok(value == 0xdeadbeef || value == 0 /* vista */, "(test %d): RtlUnicodeStringToInteger(\"%s\", %d, [out]) assigns value %d, expected 0 or deadbeef\n", test_num, str2int[test_num].str, str2int[test_num].base, value); - free(wstr); + HeapFree(GetProcessHeap(), 0, wstr); } wstr = AtoW(str2int[1].str); @@ -1404,7 +1404,7 @@ static void test_RtlUnicodeStringToInteger(void) "didn't return expected value (test c): expected: %d, got: %d\n", 1, value); /* w2k: uni.Length = 0 returns value 11234567 instead of 0 */ - free(wstr); + HeapFree(GetProcessHeap(), 0, wstr); }

1 0

Francois Gouget : shell32/tests: Replace malloc() with HeapAlloc().
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: dde9f3196793440e5aa910e3eeaac2517c6960c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dde9f3196793440e5aa910e3e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:32:45 2009 +0200 shell32/tests: Replace malloc() with HeapAlloc(). --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 863cea1..3460e1f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -333,11 +333,11 @@ static void create_test_verb_dde(const char* extension, const char* verb, } else { - cmd=malloc(strlen(argv0)+10+strlen(child_file)+2+strlen(cmdtail)+1); + cmd=HeapAlloc(GetProcessHeap(), 0, strlen(argv0)+10+strlen(child_file)+2+strlen(cmdtail)+1); sprintf(cmd,"%s shlexec \"%s\" %s", argv0, child_file, cmdtail); rc=RegSetValueEx(hkey_cmd, NULL, 0, REG_SZ, (LPBYTE)cmd, strlen(cmd)+1); assert(rc==ERROR_SUCCESS); - free(cmd); + HeapFree(GetProcessHeap(), 0, cmd); } if (ddeexec)

1 0

Francois Gouget : ddraw/tests: Replace malloc() with HeapAlloc().
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 82b7fc685512b95120bf7590e7bf75accc233c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7fc685512b95120bf7590e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:33:42 2009 +0200 ddraw/tests: Replace malloc() with HeapAlloc(). --- dlls/ddraw/tests/ddrawmodes.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index e0bf526..03ac673 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -92,16 +92,16 @@ static void releasedirectdraw(void) static void adddisplaymode(LPDDSURFACEDESC lpddsd) { if (!modes) - modes = malloc((modes_size = 2) * sizeof(DDSURFACEDESC)); + modes = HeapAlloc(GetProcessHeap(), 0, (modes_size = 2) * sizeof(DDSURFACEDESC)); if (modes_cnt == modes_size) - modes = realloc(modes, (modes_size *= 2) * sizeof(DDSURFACEDESC)); + modes = HeapReAlloc(GetProcessHeap(), 0, modes, (modes_size *= 2) * sizeof(DDSURFACEDESC)); assert(modes); modes[modes_cnt++] = *lpddsd; } static void flushdisplaymodes(void) { - free(modes); + HeapFree(GetProcessHeap(), 0, modes); modes = 0; modes_cnt = modes_size = 0; }

1 0

Francois Gouget : winecfg: Use Win32 APIs instead of strdup().
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 7eac467258694ae78b7542f24042fb5eb36ee229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eac467258694ae78b7542f24… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:33:12 2009 +0200 winecfg: Use Win32 APIs instead of strdup(). --- programs/winecfg/audio.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 8e966a5..79e62f0 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -543,7 +543,10 @@ static void findAudioDrivers(void) static void checkRegistrySetting(HWND hDlg) { const AUDIO_DRIVER *pAudioDrv; - char * token, * tokens = strdup(curAudioDriver); + char * token, * tokens; + + tokens = HeapAlloc(GetProcessHeap(), 0, strlen(curAudioDriver)+1); + strcpy(tokens, curAudioDriver); start_over: token = strtok(tokens, ","); @@ -581,7 +584,7 @@ start_over: } token = strtok(NULL, ","); } - free(tokens); + HeapFree(GetProcessHeap(), 0, tokens); } static void selectDriver(HWND hDlg, const char * driver)

1 0

Francois Gouget : wined3d: Make surface_force_reload() static.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 514c5f2648d9568cd215f44645d470ba057754c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=514c5f2648d9568cd215f4464… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:35:27 2009 +0200 wined3d: Make surface_force_reload() static. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e9d55c..58081cb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -38,7 +38,7 @@ static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4] static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert); static void surface_remove_pbo(IWineD3DSurfaceImpl *This); -void surface_force_reload(IWineD3DSurface *iface) +static void surface_force_reload(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8c29d3a..54eb0ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2464,7 +2464,6 @@ void state_fogstartend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC void state_fog_fragpart(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context); void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect); -void surface_force_reload(IWineD3DSurface *iface); GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchain); void surface_load_ds_location(IWineD3DSurface *iface, DWORD location); void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location);

1 0

Francois Gouget : iphlpapi: Make getInterfacePhysicalByName() static.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 0c2430ce3d7321bc0ed9259bfcad522b58d5ac57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2430ce3d7321bc0ed9259bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:35:50 2009 +0200 iphlpapi: Make getInterfacePhysicalByName() static. --- dlls/iphlpapi/ifenum.c | 6 +++--- dlls/iphlpapi/ifenum.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 19c3c3c..d348229 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -299,7 +299,7 @@ static DWORD getInterfaceMaskByName(const char *name) } #if defined (SIOCGIFHWADDR) -DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, +static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, PDWORD type) { DWORD ret; @@ -387,7 +387,7 @@ DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, return ret; } #elif defined (SIOCGARP) -DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, +static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, PDWORD type) { DWORD ret; @@ -446,7 +446,7 @@ DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, return ret; } #elif defined (HAVE_SYS_SYSCTL_H) && defined (HAVE_NET_IF_DL_H) -DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, +static DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, PDWORD type) { DWORD ret; diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 6835dca..c348191 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -86,8 +86,6 @@ DWORD getInterfaceIndexByName(const char *name, PDWORD index); * if internal errors occur. * Returns NO_ERROR on success. */ -DWORD getInterfacePhysicalByName(const char *name, PDWORD len, PBYTE addr, - PDWORD type); DWORD getInterfacePhysicalByIndex(DWORD index, PDWORD len, PBYTE addr, PDWORD type);

1 0

Francois Gouget : d3dx8/tests: Make compare_vec3() static.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: 46ec91210c0f405f4c6de7c03254157874b9a133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ec91210c0f405f4c6de7c03… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:35:56 2009 +0200 d3dx8/tests: Make compare_vec3() static. --- dlls/d3dx8/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx8/tests/mesh.c b/dlls/d3dx8/tests/mesh.c index c16ee15..04e8bf2 100644 --- a/dlls/d3dx8/tests/mesh.c +++ b/dlls/d3dx8/tests/mesh.c @@ -32,7 +32,7 @@ static BOOL compare(FLOAT u, FLOAT v) return (fabs(u-v) < admitted_error); } -BOOL compare_vec3(D3DXVECTOR3 u, D3DXVECTOR3 v) +static BOOL compare_vec3(D3DXVECTOR3 u, D3DXVECTOR3 v) { return ( compare(u.x, v.x) && compare(u.y, v.y) && compare(u.z, v.z) ); }

1 0

Francois Gouget : rpcrt4: Make RPCRT4_NextHttpHeaderField() and RPCRT4_default_receive_fragment() static.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: ef5f1f50658b53c460726b0f1ce1cf5453d7cced URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5f1f50658b53c460726b0f1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:39:33 2009 +0200 rpcrt4: Make RPCRT4_NextHttpHeaderField() and RPCRT4_default_receive_fragment() static. --- dlls/rpcrt4/rpc_message.c | 4 ++-- dlls/rpcrt4/rpc_message.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index d3374cb..46830c8 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -527,7 +527,7 @@ BOOL RPCRT4_IsValidHttpPacket(RpcPktHdr *hdr, unsigned char *data, } /* assumes the HTTP packet has been validated */ -unsigned char *RPCRT4_NextHttpHeaderField(unsigned char *data) +static unsigned char *RPCRT4_NextHttpHeaderField(unsigned char *data) { ULONG type; @@ -1032,7 +1032,7 @@ RPC_STATUS RPCRT4_ValidateCommonHeader(const RpcPktCommonHdr *hdr) * * Receive a fragment from a connection. */ -RPC_STATUS RPCRT4_default_receive_fragment(RpcConnection *Connection, RpcPktHdr **Header, void **Payload) +static RPC_STATUS RPCRT4_default_receive_fragment(RpcConnection *Connection, RpcPktHdr **Header, void **Payload) { RPC_STATUS status; DWORD hdr_length; diff --git a/dlls/rpcrt4/rpc_message.h b/dlls/rpcrt4/rpc_message.h index 228a7c8..8ce5a55 100644 --- a/dlls/rpcrt4/rpc_message.h +++ b/dlls/rpcrt4/rpc_message.h @@ -41,7 +41,6 @@ DWORD RPCRT4_GetHeaderSize(const RpcPktHdr *Header); RPC_STATUS RPCRT4_ValidateCommonHeader(const RpcPktCommonHdr *hdr); BOOL RPCRT4_IsValidHttpPacket(RpcPktHdr *hdr, unsigned char *data, unsigned short data_len); -unsigned char *RPCRT4_NextHttpHeaderField(unsigned char *data); RPC_STATUS RPCRT4_ParseHttpPrepareHeader1(RpcPktHdr *header, unsigned char *data, ULONG *field1); RPC_STATUS RPCRT4_ParseHttpPrepareHeader2(RpcPktHdr *header, unsigned char *data, ULONG *field1, ULONG *bytes_until_next_packet, ULONG *field3); RPC_STATUS RPCRT4_ParseHttpFlowControlHeader(RpcPktHdr *header, unsigned char *data, BOOL server, ULONG *bytes_transmitted, ULONG *flow_control_increment, UUID *pipe_uuid);

1 0

Francois Gouget : ntdll: virtual_free_system_view() is not used anymore so remove it.
by Alexandre Julliard 13 May '09

13 May '09

Module: wine Branch: master Commit: cb9a95f5605d1bf2d40e4fe8ebdc87d8f7aca156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9a95f5605d1bf2d40e4fe8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 13 10:29:35 2009 +0200 ntdll: virtual_free_system_view() is not used anymore so remove it. --- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/virtual.c | 26 -------------------------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 15df5d0..3e54250 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -141,7 +141,6 @@ extern unsigned int DIR_get_drives_info( struct drive_info info[MAX_DOS_DRIVES] /* virtual memory */ extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ); extern NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ); -extern SIZE_T virtual_free_system_view( PVOID *addr_ptr ); extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ); extern void virtual_clear_thread_stack(void); extern BOOL virtual_handle_stack_fault( void *addr ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 9d46764..e0a758b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1368,32 +1368,6 @@ NTSTATUS virtual_create_system_view( void *base, SIZE_T size, DWORD vprot ) /*********************************************************************** - * virtual_free_system_view - */ -SIZE_T virtual_free_system_view( PVOID *addr_ptr ) -{ - FILE_VIEW *view; - sigset_t sigset; - SIZE_T size = 0; - char *base = ROUND_ADDR( *addr_ptr, page_mask ); - - server_enter_uninterrupted_section( &csVirtual, &sigset ); - if ((view = VIRTUAL_FindView( base, 0 ))) - { - TRACE( "freeing %p-%p\n", view->base, (char *)view->base + view->size ); - /* return the values that the caller should use to unmap the area */ - *addr_ptr = view->base; - /* make sure we don't munmap anything from a reserved area */ - if (!wine_mmap_is_in_reserved_area( view->base, view->size )) size = view->size; - view->protect |= VPROT_SYSTEM; - delete_view( view ); - } - server_leave_uninterrupted_section( &csVirtual, &sigset ); - return size; -} - - -/*********************************************************************** * virtual_alloc_thread_stack */ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size )

1 0