December 2008 - Wine-commits

Paul Vriens : shell32/tests: Fix a test failure on Win9x.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: e5779901c334b9dbc6aa4cfcfcfe166c2a90671f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5779901c334b9dbc6aa4cfcf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Dec 1 11:13:13 2008 +0100 shell32/tests: Fix a test failure on Win9x. --- dlls/shell32/tests/shlfileop.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index efe6507..df460d7 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -650,9 +650,12 @@ static void test_rename(void) shfo.pFrom = "test1.txt\0test2.txt\0"; shfo.pTo = "a.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_GEN_FAILURE, "Expected ERROR_GEN_FAILURE, got %d\n", retval); + ok(retval == ERROR_GEN_FAILURE || + broken(!retval), /* Win9x */ + "Expected ERROR_GEN_FAILURE, got %d\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); + ok(!file_exists("a.txt"), "Expected a.txt to not exist\n"); /* pFrom doesn't exist */ shfo.pFrom = "idontexist\0";

1 0

Michael Stefaniuc : iphlpapi/tests: Replace malloc with HeapAlloc.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 4eec1ad444b6fb607d36abf4020fbe6487d8831a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eec1ad444b6fb607d36abf40… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 1 02:09:11 2008 +0100 iphlpapi/tests: Replace malloc with HeapAlloc. --- dlls/iphlpapi/tests/iphlpapi.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 8251151..27393b8 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -225,7 +225,7 @@ static void testGetIpAddrTable(void) "GetIpAddrTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IPADDRTABLE buf = (PMIB_IPADDRTABLE)malloc(dwSize); + PMIB_IPADDRTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetIpAddrTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, @@ -233,7 +233,7 @@ static void testGetIpAddrTable(void) apiReturn); if (apiReturn == NO_ERROR && buf->dwNumEntries) testGetIfEntry(buf->table[0].dwIndex); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -257,13 +257,13 @@ static void testGetIfTable(void) "GetIfTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IFTABLE buf = (PMIB_IFTABLE)malloc(dwSize); + PMIB_IFTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetIfTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIfTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -287,13 +287,13 @@ static void testGetIpForwardTable(void) "GetIpForwardTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IPFORWARDTABLE buf = (PMIB_IPFORWARDTABLE)malloc(dwSize); + PMIB_IPFORWARDTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetIpForwardTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIpForwardTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -319,13 +319,13 @@ static void testGetIpNetTable(void) if (apiReturn == ERROR_NO_DATA) ; /* empty ARP table's okay */ else if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_IPNETTABLE buf = (PMIB_IPNETTABLE)malloc(dwSize); + PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetIpNetTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetIpNetTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -437,13 +437,13 @@ static void testGetTcpTable(void) "GetTcpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PMIB_TCPTABLE buf = (PMIB_TCPTABLE)malloc(dwSize); + PMIB_TCPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetTcpTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetTcpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -467,13 +467,13 @@ static void testGetUdpTable(void) "GetUdpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn != ERROR_INSUFFICIENT_BUFFER) { - PMIB_UDPTABLE buf = (PMIB_UDPTABLE)malloc(dwSize); + PMIB_UDPTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize); apiReturn = gGetUdpTable(buf, &dwSize, FALSE); ok(apiReturn == NO_ERROR, "GetUdpTable(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -527,13 +527,13 @@ static void testGetInterfaceInfo(void) "GetInterfaceInfo returned %d, expected ERROR_INSUFFICIENT_BUFFER\n", apiReturn); if (apiReturn == ERROR_INSUFFICIENT_BUFFER) { - PIP_INTERFACE_INFO buf = (PIP_INTERFACE_INFO)malloc(len); + PIP_INTERFACE_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); apiReturn = gGetInterfaceInfo(buf, &len); ok(apiReturn == NO_ERROR, "GetInterfaceInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -559,13 +559,13 @@ static void testGetAdaptersInfo(void) if (apiReturn == ERROR_NO_DATA) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { - PIP_ADAPTER_INFO buf = (PIP_ADAPTER_INFO)malloc(len); + PIP_ADAPTER_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); apiReturn = gGetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, "GetAdaptersInfo(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } } @@ -589,13 +589,13 @@ static void testGetNetworkParams(void) "GetNetworkParams returned %d, expected ERROR_BUFFER_OVERFLOW\n", apiReturn); if (apiReturn == ERROR_BUFFER_OVERFLOW) { - PFIXED_INFO buf = (PFIXED_INFO)malloc(len); + PFIXED_INFO buf = HeapAlloc(GetProcessHeap(), 0, len); apiReturn = gGetNetworkParams(buf, &len); ok(apiReturn == NO_ERROR, "GetNetworkParams(buf, &dwSize) returned %d, expected NO_ERROR\n", apiReturn); - free(buf); + HeapFree(GetProcessHeap(), 0, buf); } } }

1 0

Rob Shearman : widl: Fix optimisation for writing out ref pointers to simple structs and base types .
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: cc51c30a63ae3e6b9c06d65b030b46248216f972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc51c30a63ae3e6b9c06d65b0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 30 16:25:06 2008 +0000 widl: Fix optimisation for writing out ref pointers to simple structs and base types. The optimisation in write_remoting_arg for sizing, marshalling, unmarshalling and freeing ref pointers to base types directly was broken in d458a599eb8efa192004e0a0bea745be0d1cc0be and caused unnecessary calls to pointer marshalling functions. The same was true for a similar optimisation for simple structures where their size can be pre-calculated, freeing omitted and the NdrSimpleStructMarshall/Unmarshall functions called directly instead of calling NdrPointerMarshall/Unmarshall first. Fix this by looking at the type of the referrent instead of the type of the pointer, making sure to not classify user types as simple structures. Additionally remove some dead code that would never be executed because the code is in an RPC_FC_RP case, inside a !is_ptr if block (and RPC_FC_RP is a pointer type). --- tools/widl/typegen.c | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3ad7152..051d2e8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2713,7 +2713,7 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, } print_file(file, indent, "__frame->_StubMsg.Buffer += sizeof("); - write_type_decl(file, var->type, NULL); + write_type_decl(file, is_ptr(type) ? type->ref : type, NULL); fprintf(file, ");\n"); } @@ -2963,47 +2963,29 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, const case RPC_FC_BOGUS_STRUCT: print_phase_function(file, indent, "ComplexStruct", local_var_prefix, phase, var, start_offset); break; - case RPC_FC_RP: - if (is_base_type( var->type->ref->type )) - { - print_phase_basetype(file, indent, local_var_prefix, phase, pass, var, var->name); - } - else if (var->type->ref->type == RPC_FC_STRUCT) - { - if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) - print_phase_function(file, indent, local_var_prefix, "SimpleStruct", phase, var, start_offset + 4); - } - else - { - expr_t *iid; - if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) - { - print_file( file, indent, "__frame->_StubMsg.MaxCount = (unsigned long) " ); - write_expr( file, iid, 1, 1, NULL, NULL, local_var_prefix ); - fprintf( file, ";\n\n" ); - } - print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset); - } - break; default: error("write_remoting_arguments: Unsupported type: %s (0x%02x)\n", var->name, rtype); } } else { - if (last_ptr(var->type) && (pointer_type == RPC_FC_RP) && is_base_type(rtype)) + const type_t *ref = type->ref; + if (type->type == RPC_FC_RP && is_base_type(ref->type)) { if (phase != PHASE_FREE) print_phase_basetype(file, indent, local_var_prefix, phase, pass, var, var->name); } - else if (last_ptr(var->type) && (pointer_type == RPC_FC_RP) && (rtype == RPC_FC_STRUCT)) + else if (type->type == RPC_FC_RP && ref->type == RPC_FC_STRUCT && + !is_user_type(ref)) { if (phase != PHASE_BUFFERSIZE && phase != PHASE_FREE) - print_phase_function(file, indent, "SimpleStruct", local_var_prefix, phase, var, start_offset + 4); + print_phase_function(file, indent, "SimpleStruct", + local_var_prefix, phase, var, + ref->typestring_offset); } else { - if (var->type->ref->type == RPC_FC_IP) + if (ref->type == RPC_FC_IP) print_phase_function(file, indent, "InterfacePointer", local_var_prefix, phase, var, start_offset); else print_phase_function(file, indent, "Pointer", local_var_prefix, phase, var, start_offset);

1 0

Michael Stefaniuc : winex11.drv: Remove some superfluous casts.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 82a3c433b372c6e59346dd58a967b884f4c75a4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a3c433b372c6e59346dd58a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 1 02:09:52 2008 +0100 winex11.drv: Remove some superfluous casts. --- dlls/winex11.drv/brush.c | 4 ++-- dlls/winex11.drv/clipboard.c | 18 +++++++++--------- dlls/winex11.drv/event.c | 4 ++-- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/x11ddraw.c | 2 +- dlls/winex11.drv/xfont.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 41e45cd..5e51877 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -300,7 +300,7 @@ HBRUSH X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush ) case BS_DIBPATTERN: TRACE("BS_DIBPATTERN\n"); - if ((bmpInfo = (BITMAPINFO *) GlobalLock16( (HGLOBAL16)logbrush.lbHatch ))) + if ((bmpInfo = GlobalLock16( logbrush.lbHatch ))) { int size = bitmap_info_size( bmpInfo, logbrush.lbColor ); hBitmap = CreateDIBitmap( physDev->hdc, &bmpInfo->bmiHeader, @@ -309,7 +309,7 @@ HBRUSH X11DRV_SelectBrush( X11DRV_PDEVICE *physDev, HBRUSH hbrush ) (WORD)logbrush.lbColor ); BRUSH_SelectPatternBrush( physDev, hBitmap ); DeleteObject( hBitmap ); - GlobalUnlock16( (HGLOBAL16)logbrush.lbHatch ); + GlobalUnlock16( logbrush.lbHatch ); } break; diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec7d5ab..d50cf42 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -705,7 +705,7 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) if (lpData->hData16) { - METAFILEPICT16* lpMetaPict = (METAFILEPICT16 *) GlobalLock16(lpData->hData16); + METAFILEPICT16* lpMetaPict = GlobalLock16(lpData->hData16); if (lpMetaPict) { @@ -970,11 +970,11 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma if (lpSource->hData32) { - lpstrS = (LPSTR)GlobalLock(lpSource->hData32); + lpstrS = GlobalLock(lpSource->hData32); } else { - lpstrS = (LPSTR)GlobalLock16(lpSource->hData16); + lpstrS = GlobalLock16(lpSource->hData16); } if (!lpstrS) @@ -1005,7 +1005,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedText(Display *display, UINT wForma hData32 = GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE | GMEM_DDESHARE, alloc_size); - lpstrT = (LPSTR)GlobalLock(hData32); + lpstrT = GlobalLock(hData32); if (lpstrT) { @@ -1095,7 +1095,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) LPBITMAPINFOHEADER lpbmih; hdc = GetDC(NULL); - lpbmih = (LPBITMAPINFOHEADER) GlobalLock(lpSource->hData32); + lpbmih = GlobalLock(lpSource->hData32); offset = sizeof(BITMAPINFOHEADER) + ((lpbmih->biBitCount <= 8) ? (sizeof(RGBQUAD) * @@ -1330,7 +1330,7 @@ HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *display, Window w, Atom prop if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) { if (cbytes) - hClipData = X11DRV_CLIPBOARD_SerializeMetafile(CF_METAFILEPICT, (HANDLE)lpdata, (LPDWORD)&cbytes, FALSE); + hClipData = X11DRV_CLIPBOARD_SerializeMetafile(CF_METAFILEPICT, lpdata, (LPDWORD)&cbytes, FALSE); /* Free the retrieved property data */ HeapFree(GetProcessHeap(), 0, lpdata); @@ -1354,7 +1354,7 @@ HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Atom prop) if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) { if (cbytes) - hClipData = X11DRV_CLIPBOARD_SerializeMetafile(CF_ENHMETAFILE, (HANDLE)lpdata, (LPDWORD)&cbytes, FALSE); + hClipData = X11DRV_CLIPBOARD_SerializeMetafile(CF_ENHMETAFILE, lpdata, (LPDWORD)&cbytes, FALSE); /* Free the retrieved property data */ HeapFree(GetProcessHeap(), 0, lpdata); @@ -2170,7 +2170,7 @@ static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDW if (wformat == CF_METAFILEPICT) { - LPMETAFILEPICT lpmfp = (LPMETAFILEPICT) GlobalLock(hdata); + LPMETAFILEPICT lpmfp = GlobalLock(hdata); unsigned int size = GetMetaFileBitsEx(lpmfp->hMF, 0, NULL); h = GlobalAlloc(0, size + sizeof(METAFILEPICT)); @@ -2212,7 +2212,7 @@ static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDW if (h) { unsigned int wiresize, size; - LPMETAFILEPICT lpmfp = (LPMETAFILEPICT) GlobalLock(h); + LPMETAFILEPICT lpmfp = GlobalLock(h); memcpy(lpmfp, hdata, sizeof(METAFILEPICT)); wiresize = *lpcbytes - sizeof(METAFILEPICT); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index a965b9f..5f7ebef 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1143,7 +1143,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) aux_long += sizeof(DROPFILES) + 1; hDrop = GlobalAlloc( GMEM_SHARE, aux_long ); - lpDrop = (DROPFILES*)GlobalLock( hDrop ); + lpDrop = GlobalLock( hDrop ); if( lpDrop ) { @@ -1237,7 +1237,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) drop_len += sizeof(DROPFILES) + 1; hDrop = GlobalAlloc( GMEM_SHARE, drop_len ); - lpDrop = (DROPFILES *) GlobalLock( hDrop ); + lpDrop = GlobalLock( hDrop ); if( lpDrop && (win_data = X11DRV_get_win_data( hWnd ))) { diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b4845ad..add9569 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2360,7 +2360,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, goto create_failed; /* unexpected error */ } TRACE("->(%p)\n", object); - return (HPBUFFERARB) object; + return object; create_failed: HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/winex11.drv/x11ddraw.c b/dlls/winex11.drv/x11ddraw.c index 492d678..223659f 100644 --- a/dlls/winex11.drv/x11ddraw.c +++ b/dlls/winex11.drv/x11ddraw.c @@ -141,7 +141,7 @@ static DWORD PASCAL X11DRV_DDHAL_CreateSurface(LPDDHAL_CREATESURFACEDATA data) { if (data->lpDDSurfaceDesc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { X11DRV_DD_Primary = *data->lplpSList; - X11DRV_DD_PrimaryWnd = (HWND)X11DRV_DD_Primary->lpSurfMore->lpDDRAWReserved; + X11DRV_DD_PrimaryWnd = X11DRV_DD_Primary->lpSurfMore->lpDDRAWReserved; X11DRV_DD_PrimaryGbl = X11DRV_DD_Primary->lpGbl; SetPrimaryDIB((HBITMAP)GET_LPDDRAWSURFACE_GBL_MORE(X11DRV_DD_PrimaryGbl)->hKernelSurface); X11DRV_DD_UserClass = GlobalFindAtomA("WINE_DDRAW"); diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 6d8ff78..b34e1d5 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -3117,7 +3117,7 @@ static X_PHYSFONT XFONT_RealizeFont( LPLOGFONT16 plf, lfSub.lfCharSet = (BYTE)(charset_sub & 0xff); lfSub.lfFaceName[0] = '\0'; /* FIXME? */ /* this font has sub font */ - if ( i == 0 ) pfo->prefobjs[0] = (X_PHYSFONT)0; + if ( i == 0 ) pfo->prefobjs[0] = 0; pfo->prefobjs[i] = XFONT_RealizeFont( &lfSub, &faceMatchedSub, TRUE, charset_sub,

1 0

Michael Stefaniuc : wininet: Remove some superfluous casts.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: e6bd2881d8d831ac0e3b4c0ad2902ebd3096d070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6bd2881d8d831ac0e3b4c0ad… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 1 02:09:30 2008 +0100 wininet: Remove some superfluous casts. --- dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 10 +++++----- dlls/wininet/urlcache.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f351a02..396f1ef 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2737,7 +2737,7 @@ static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs) lpwfs->lstnSocketAddress = lpwfs->socketAddress; /* and get the system to assign us a port */ - lpwfs->lstnSocketAddress.sin_port = htons((u_short) 0); + lpwfs->lstnSocketAddress.sin_port = htons(0); if (bind(lpwfs->lstnSocket,(struct sockaddr *) &lpwfs->lstnSocketAddress, sizeof(struct sockaddr_in)) == -1) { diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d43c9bb..56ffe63 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -773,8 +773,8 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest, ptr = lpBuffersOut; if (ptr) - lpBuffersOutW = (LPINTERNET_BUFFERSW)HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(INTERNET_BUFFERSW)); + lpBuffersOutW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(INTERNET_BUFFERSW)); else lpBuffersOutW = NULL; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 492ce89..5f67334 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -786,7 +786,7 @@ HINTERNET WINAPI InternetOpenA(LPCSTR lpszAgent, DWORD dwAccessType, BOOL WINAPI InternetGetLastResponseInfoA(LPDWORD lpdwError, LPSTR lpszBuffer, LPDWORD lpdwBufferLength) { - LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + LPWITHREADERROR lpwite = TlsGetValue(g_dwTlsErrIndex); TRACE("\n"); @@ -823,7 +823,7 @@ BOOL WINAPI InternetGetLastResponseInfoA(LPDWORD lpdwError, BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError, LPWSTR lpszBuffer, LPDWORD lpdwBufferLength) { - LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + LPWITHREADERROR lpwite = TlsGetValue(g_dwTlsErrIndex); TRACE("\n"); @@ -3049,7 +3049,7 @@ static LPWITHREADERROR INTERNET_AllocThreadError(void) */ void INTERNET_SetLastError(DWORD dwError) { - LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + LPWITHREADERROR lpwite = TlsGetValue(g_dwTlsErrIndex); if (!lpwite) lpwite = INTERNET_AllocThreadError(); @@ -3070,7 +3070,7 @@ void INTERNET_SetLastError(DWORD dwError) */ DWORD INTERNET_GetLastError(void) { - LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + LPWITHREADERROR lpwite = TlsGetValue(g_dwTlsErrIndex); if (!lpwite) return 0; /* TlsGetValue clears last error, so set it again here */ SetLastError(lpwite->dwError); @@ -3143,7 +3143,7 @@ BOOL INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) */ LPSTR INTERNET_GetResponseBuffer(void) { - LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); + LPWITHREADERROR lpwite = TlsGetValue(g_dwTlsErrIndex); if (!lpwite) lpwite = INTERNET_AllocThreadError(); TRACE("\n"); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index b353302..fe3bc5b 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2794,7 +2794,7 @@ HANDLE WINAPI RetrieveUrlCacheEntryStreamA( pStream->hFile = hFile; strcpy(pStream->lpszUrl, lpszUrlName); - return (HANDLE)pStream; + return pStream; } /***********************************************************************

1 0

Michael Stefaniuc : iphlpapi: Remove a comment that dared to ponder to use malloc.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 85dba6991705c0df5dc0cbc3d44472e5187874a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85dba6991705c0df5dc0cbc3d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 28 23:44:01 2008 +0100 iphlpapi: Remove a comment that dared to ponder to use malloc. --- dlls/iphlpapi/icmp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index a5858ca..b868603 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -27,8 +27,6 @@ * - Not all IP options are supported. * - Are ICMP handles real handles, i.e. inheritable and all? There might be some * more work to do here, including server side stuff with synchronization. - * - Is it correct to use malloc for the internal buffer, for allocating the - * handle's structure? * - This API should probably be thread safe. Is it really? * - Using the winsock functions has not been tested. */

1 0

Jacek Caban : activdbg.idl: Added IDebugApplication64 and IActiveScriptSiteDebug64 declarations.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 378ea704befead54a7d3f0b3abb8fafff6040fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378ea704befead54a7d3f0b3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 29 16:42:15 2008 +0100 activdbg.idl: Added IDebugApplication64 and IActiveScriptSiteDebug64 declarations. --- include/activdbg.idl | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/include/activdbg.idl b/include/activdbg.idl index b41ae09..c046ad3 100644 --- a/include/activdbg.idl +++ b/include/activdbg.idl @@ -334,6 +334,85 @@ interface IDebugApplication32 : IRemoteDebugApplication } /************************************************************ + * interface IDebugApplication64 + */ +[ + object, + uuid(4dedc754-04c7-4f10-9e60-16a390fe6e62), + pointer_default(unique), + local +] +interface IDebugApplication64 : IRemoteDebugApplication +{ + HRESULT SetName( + [in] LPCOLESTR pstrName); + + HRESULT StepOutComplete(); + + HRESULT DebugOutput( + [in] LPCOLESTR pstr); + + HRESULT StartDebugSession(); + + HRESULT HandleBreakPoint( + [in] BREAKREASON br, + [out] BREAKRESUMEACTION *pbra); + + HRESULT Close(); + + HRESULT GetBreakFlags( + [out] APPBREAKFLAGS *pabf, + [out] IRemoteDebugApplicationThread **pprdatSteppingThread); + + HRESULT GetCurrentThread( + [out] IDebugApplicationThread **pat); + + HRESULT CreateAsyncDebugOperation( + [in] IDebugSyncOperation *psdo, + [out] IDebugAsyncOperation **ppado); + + HRESULT AddStackFrameSniffer( + [in] IDebugStackFrameSniffer *pdsfs, + [out] DWORD *pdwCookie); + + HRESULT RemoveStackFrameSniffer( + [in] DWORD dwCookie); + + HRESULT QueryCurrentThreadIsDebuggerThread(); + + HRESULT SynchronousCallInDebuggerThread( + [in] IDebugThreadCall32 *pptc, + [in] DWORDLONG dwParam1, + [in] DWORDLONG dwParam2, + [in] DWORDLONG dwParam3); + + HRESULT CreateApplicationNode( + [out] IDebugApplicationNode **ppdanNew); + + HRESULT FireDebuggerEvent( + [in] REFGUID riid, + [in] IUnknown *punk); + + HRESULT HandleRuntimeError( + [in] IActiveScriptErrorDebug *pErrorDebug, + [in] IActiveScriptSite *pScriptSite, + [out] BREAKRESUMEACTION *pbra, + [out] ERRORRESUMEACTION *perra, + [out] BOOL *pfCallOnScriptError); + + BOOL FCanJitDebug(); + + BOOL FIsAutoJitDebugEnabled(); + + HRESULT AddGlobalExpressionContextProvider( + [in] IProvideExpressionContexts *pdsfs, + [out] DWORDLONG *pdwCookie); + + HRESULT RemoveGlobalExpressionContextProvider( + [in] DWORDLONG dwCookie); +} + +/************************************************************ * interface IActiveScriptSiteDebug32 */ [ @@ -362,6 +441,35 @@ interface IActiveScriptSiteDebug32 : IUnknown [out] BOOL *pfCallOnScriptErrorWhenContinuing); } +/************************************************************ + * interface IActiveScriptSiteDebug64 + */ +[ + object, + uuid(d6b96b0a-7463-402c-92ac-89984226942f), + pointer_default(unique), + local +] +interface IActiveScriptSiteDebug64 : IUnknown +{ + HRESULT GetDocumentContextFromPosition( + [in] DWORDLONG dwSourceContext, + [in] ULONG uCharacterOffset, + [in] ULONG uNumChars, + [out] IDebugDocumentContext **ppsc); + + HRESULT GetApplication( + [out] IDebugApplication64 **ppda); + + HRESULT GetRootApplicationNode( + [out] IDebugApplicationNode **ppdanRoot); + + HRESULT OnScriptErrorDebug( + [in] IActiveScriptErrorDebug *pErrorDebug, + [out] BOOL *pfEnterDebugger, + [out] BOOL *pfCallOnScriptErrorWhenContinuing); +} + cpp_quote("#ifndef DISABLE_ACTIVDBG_INTERFACE_WRAPPERS") cpp_quote("#ifdef _WIN64")

1 0

Rob Shearman : widl: Output the correct buffer size required for parameters whose sizes are known at type-generation time .
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 41152b7929a07131623e6e4635560982a9ab8e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41152b7929a07131623e6e463… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Nov 30 16:25:01 2008 +0000 widl: Output the correct buffer size required for parameters whose sizes are known at type-generation time. Replace code to calculate the size of RPC_FC_STRUCT types with fields_memsize since the memory size of these types will always be equal to the buffer size. Remove dead code in get_required_buffer_size. --- tools/widl/typegen.c | 78 ++++++-------------------------------------------- 1 files changed, 9 insertions(+), 69 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 98145a7..3ad7152 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2508,19 +2508,8 @@ static unsigned int get_required_buffer_size_type( return 0; case RPC_FC_STRUCT: - case RPC_FC_PSTRUCT: - { - size_t size = 0; - const var_t *field; if (!type->fields_or_args) return 0; - LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) - { - unsigned int alignment; - size += get_required_buffer_size_type(field->type, field->name, - &alignment); - } - return size; - } + return fields_memsize(type->fields_or_args, alignment); case RPC_FC_RP: return @@ -2542,75 +2531,26 @@ static unsigned int get_required_buffer_size(const var_t *var, unsigned int *ali { int in_attr = is_attr(var->attrs, ATTR_IN); int out_attr = is_attr(var->attrs, ATTR_OUT); - const type_t *t; if (!in_attr && !out_attr) in_attr = 1; *alignment = 0; - for (t = var->type; is_ptr(t); t = t->ref) - if (is_attr(t->attrs, ATTR_CONTEXTHANDLE)) + if ((pass == PASS_IN && in_attr) || (pass == PASS_OUT && out_attr) || + pass == PASS_RETURN) + { + if (is_ptrchain_attr(var, ATTR_CONTEXTHANDLE)) { *alignment = 4; return 20; } - if (pass == PASS_OUT) - { - if (out_attr && is_ptr(var->type)) - { - type_t *type = var->type; - - if (type->type == RPC_FC_STRUCT) - { - const var_t *field; - unsigned int size = 36; - - if (!type->fields_or_args) return size; - LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) - { - unsigned int align; - size += get_required_buffer_size_type( - field->type, field->name, &align); - } - return size; - } - } - return 0; - } - else - { - if ((!out_attr || in_attr) && !var->type->size_is - && !is_attr(var->attrs, ATTR_STRING) && !var->type->declarray) - { - if (is_ptr(var->type)) - { - type_t *type = var->type; - - if (is_base_type(type->type)) - { - return 25; - } - else if (type->type == RPC_FC_STRUCT) - { - unsigned int size = 36; - const var_t *field; - - if (!type->fields_or_args) return size; - LIST_FOR_EACH_ENTRY( field, type->fields_or_args, const var_t, entry ) - { - unsigned int align; - size += get_required_buffer_size_type( - field->type, field->name, &align); - } - return size; - } - } - } - - return get_required_buffer_size_type(var->type, var->name, alignment); + if (!is_string_type(var->attrs, var->type)) + return get_required_buffer_size_type(var->type, var->name, + alignment); } + return 0; } static unsigned int get_function_buffer_size( const func_t *func, enum pass pass )

1 0

Paul Vriens : lz32/tests: Fix a test failure on Win9x.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: 4b643733fcc226723f280d7430c04fcb137d355f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b643733fcc226723f280d743… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Nov 28 16:46:47 2008 +0100 lz32/tests: Fix a test failure on Win9x. --- dlls/lz32/tests/lzexpand_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index 4d35ba3..187aa80 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -371,7 +371,7 @@ static void test_LZOpenFileA(void) ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS || - test.nErrCode == ERROR_FILE_NOT_FOUND, /* win9x */ + broken(test.nErrCode != ERROR_SUCCESS), /* win9x */ "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s'\n",

1 0

Paul Vriens : advapi32/tests: Fix some crashes on NT4.
by Alexandre Julliard 01 Dec '08

01 Dec '08

Module: wine Branch: master Commit: dd56259453fda9e47a0947a1a107da5d79efde84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd56259453fda9e47a0947a1a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 29 12:38:30 2008 +0100 advapi32/tests: Fix some crashes on NT4. --- dlls/advapi32/tests/security.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3d02777..b5c10ff 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2146,7 +2146,7 @@ static void test_SetEntriesInAcl(void) if (!pSetEntriesInAclW) { - skip("SetEntriesInAclW is not available\n"); + win_skip("SetEntriesInAclW is not available\n"); return; } @@ -2154,7 +2154,7 @@ static void test_SetEntriesInAcl(void) res = pSetEntriesInAclW(0, NULL, NULL, &NewAcl); if(res == ERROR_CALL_NOT_IMPLEMENTED) { - skip("SetEntriesInAclW is not implemented\n"); + win_skip("SetEntriesInAclW is not implemented\n"); return; } ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); @@ -2164,7 +2164,7 @@ static void test_SetEntriesInAcl(void) res = InitializeAcl(OldAcl, 256, ACL_REVISION); if(!res && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("ACLs not implemented - skipping tests\n"); + win_skip("ACLs not implemented - skipping tests\n"); HeapFree(GetProcessHeap(), 0, OldAcl); return; } @@ -2209,15 +2209,17 @@ static void test_SetEntriesInAcl(void) ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_BAD_FORM; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); - ok(NewAcl == NULL, "returned acl wasn't NULL: %p\n", NewAcl); - LocalFree(NewAcl); + ok(NewAcl == NULL || + broken(NewAcl != NULL), /* NT4 */ + "returned acl wasn't NULL: %p\n", NewAcl); ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_INVALID_PARAMETER, "SetEntriesInAclW failed: %u\n", res); - ok(NewAcl == NULL, "returned acl wasn't NULL: %p\n", NewAcl); - LocalFree(NewAcl); + ok(NewAcl == NULL || + broken(NewAcl != NULL), /* NT4 */ + "returned acl wasn't NULL: %p\n", NewAcl); ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; ExplicitAccess.grfAccessMode = SET_ACCESS; @@ -2805,6 +2807,13 @@ static void test_GetSecurityInfo(void) LocalFree(sd); + if (!pCreateWellKnownSid) + { + win_skip("NULL parameter test would crash on NT4\n"); + CloseHandle(obj); + return; + } + /* If we don't ask for the security descriptor, Windows will still give us the other stuff, leaving us no way to free it. */ ret = pGetSecurityInfo(obj, SE_FILE_OBJECT,

1 0