October 2008 - Wine-Commits

Vitaly Lipatov : include/ddk: Fix include path and include guard name.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 98d0155371f7a844aa4ed9c293b309da4f8a6192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d0155371f7a844aa4ed9c29… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Tue Oct 7 20:32:16 2008 +0400 include/ddk: Fix include path and include guard name. --- include/ddk/usb.h | 6 +++--- include/ddk/usb100.h | 4 ++-- include/ddk/usb200.h | 6 +++--- include/ddk/usbdlib.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/ddk/usb.h b/include/ddk/usb.h index 8137bb6..b8f5f3f 100644 --- a/include/ddk/usb.h +++ b/include/ddk/usb.h @@ -16,10 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _USB_ -#define _USB_ +#ifndef __DDK_USB_H__ +#define __DDK_USB_H__ -#include <usb200.h> +#include <ddk/usb200.h> #define URB_FUNCTION_SELECT_CONFIGURATION 0x0000 #define URB_FUNCTION_SELECT_INTERFACE 0x0001 diff --git a/include/ddk/usb100.h b/include/ddk/usb100.h index 7e05f63..534dca1 100644 --- a/include/ddk/usb100.h +++ b/include/ddk/usb100.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _USB100_ -#define _USB100_ +#ifndef __DDK_USB100_H__ +#define __DDK_USB100_H__ #define USB_DEVICE_DESCRIPTOR_TYPE 0x01 #define USB_CONFIGURATION_DESCRIPTOR_TYPE 0x02 diff --git a/include/ddk/usb200.h b/include/ddk/usb200.h index bf24601..42cd27e 100644 --- a/include/ddk/usb200.h +++ b/include/ddk/usb200.h @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _USB200_ -#define _USB200_ +#ifndef __DDK_USB200_H__ +#define __DDK_USB200_H__ -#include <usb100.h> +#include <ddk/usb100.h> #endif diff --git a/include/ddk/usbdlib.h b/include/ddk/usbdlib.h index 8e67faa..c0adc46 100644 --- a/include/ddk/usbdlib.h +++ b/include/ddk/usbdlib.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __USBDLIB_H__ -#define __USBDLIB_H__ +#ifndef __DDK_USBDLIB_H__ +#define __DDK_USBDLIB_H__ typedef struct _USBD_INTERFACE_LIST_ENTRY { PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor;

1 0

Rob Shearman : wininet: Fix crash when calling HttpQueryInfoA/W( HTTP_QUERY_RAW_HEADERS) before any response has been received from a server .
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 0715d9c12303714e8b98974aa85f479d1f3e1ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0715d9c12303714e8b98974aa… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Oct 7 15:39:50 2008 +0100 wininet: Fix crash when calling HttpQueryInfoA/W(HTTP_QUERY_RAW_HEADERS) before any response has been received from a server. --- dlls/wininet/http.c | 31 ++++++++++++++++++------------- dlls/wininet/tests/http.c | 6 ++++++ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3675c9d..f72082b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -143,21 +143,26 @@ static LPWSTR * HTTP_Tokenize(LPCWSTR string, LPCWSTR token_string) int i; LPCWSTR next_token; - /* empty string has no tokens */ - if (*string) - tokens++; - /* count tokens */ - for (i = 0; string[i]; i++) - if (!strncmpW(string+i, token_string, strlenW(token_string))) - { - DWORD j; + if (string) + { + /* empty string has no tokens */ + if (*string) tokens++; - /* we want to skip over separators, but not the null terminator */ - for (j = 0; j < strlenW(token_string) - 1; j++) - if (!string[i+j]) - break; - i += j; + /* count tokens */ + for (i = 0; string[i]; i++) + { + if (!strncmpW(string+i, token_string, strlenW(token_string))) + { + DWORD j; + tokens++; + /* we want to skip over separators, but not the null terminator */ + for (j = 0; j < strlenW(token_string) - 1; j++) + if (!string[i+j]) + break; + i += j; + } } + } /* add 1 for terminating NULL */ token_array = HeapAlloc(GetProcessHeap(), 0, (tokens+1) * sizeof(*token_array)); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 3a1a13f..93752bd 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -296,6 +296,12 @@ static void InternetReadFile_test(int flags) ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed: %u\n", GetLastError()); ok(!strcmp(buffer, "http://www.winehq.org/about/"), "Wrong URL %s\n", buffer); + length = sizeof(buffer); + res = HttpQueryInfoA(hor, HTTP_QUERY_RAW_HEADERS, buffer, &length, 0x0); + ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); + ok(length == 0, "HTTP_QUERY_RAW_HEADERS: expected length 0, but got %d\n", length); + ok(!strcmp(buffer, ""), "HTTP_QUERY_RAW_HEADERS: expected string \"\", but got \"%s\"\n", buffer); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED);

1 0

Henri Verbeet : wined3d: Remove a redundant initialization of cfgs in WineD3D_ChoosePixelFormat.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 0420f17b1f144539ad2ea05186dc936242944680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0420f17b1f144539ad2ea0518… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 16:01:01 2008 +0200 wined3d: Remove a redundant initialization of cfgs in WineD3D_ChoosePixelFormat. --- dlls/wined3d/context.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2aeb5fa..ce432c9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -470,7 +470,6 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF int i = 0; int nCfgs = This->adapter->nCfgs; - WineD3D_PixelFormat *cfgs = This->adapter->cfgs; TRACE("ColorFormat=%s, DepthStencilFormat=%s, auxBuffers=%d, numSamples=%d, pbuffer=%d, findCompatible=%d\n", debug_d3dformat(ColorFormat), debug_d3dformat(DepthStencilFormat), auxBuffers, numSamples, pbuffer, findCompatible); @@ -503,64 +502,64 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])) && !iPixelFormat; matchtry++) { for(i=0; i<nCfgs; i++) { BOOL exactDepthMatch = TRUE; - cfgs = &This->adapter->cfgs[i]; + WineD3D_PixelFormat *cfg = &This->adapter->cfgs[i]; /* For now only accept RGBA formats. Perhaps some day we will * allow floating point formats for pbuffers. */ - if(cfgs->iPixelType != WGL_TYPE_RGBA_ARB) + if(cfg->iPixelType != WGL_TYPE_RGBA_ARB) continue; /* In window mode (!pbuffer) we need a window drawable format and double buffering. */ - if(!pbuffer && !(cfgs->windowDrawable && cfgs->doubleBuffer)) + if(!pbuffer && !(cfg->windowDrawable && cfg->doubleBuffer)) continue; /* We like to have aux buffers in backbuffer mode */ - if(auxBuffers && !cfgs->auxBuffers && matches[matchtry].require_aux) + if(auxBuffers && !cfg->auxBuffers && matches[matchtry].require_aux) continue; /* In pbuffer-mode we need a pbuffer-capable format but we don't want double buffering */ - if(pbuffer && (!cfgs->pbufferDrawable || cfgs->doubleBuffer)) + if(pbuffer && (!cfg->pbufferDrawable || cfg->doubleBuffer)) continue; if(matches[matchtry].exact_color) { - if(cfgs->redSize != redBits) + if(cfg->redSize != redBits) continue; - if(cfgs->greenSize != greenBits) + if(cfg->greenSize != greenBits) continue; - if(cfgs->blueSize != blueBits) + if(cfg->blueSize != blueBits) continue; } else { - if(cfgs->redSize < redBits) + if(cfg->redSize < redBits) continue; - if(cfgs->greenSize < greenBits) + if(cfg->greenSize < greenBits) continue; - if(cfgs->blueSize < blueBits) + if(cfg->blueSize < blueBits) continue; } if(matches[matchtry].exact_alpha) { - if(cfgs->alphaSize != alphaBits) + if(cfg->alphaSize != alphaBits) continue; } else { - if(cfgs->alphaSize < alphaBits) + if(cfg->alphaSize < alphaBits) continue; } /* We try to locate a format which matches our requirements exactly. In case of * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if(cfgs->depthSize < depthBits) + if(cfg->depthSize < depthBits) continue; - else if(cfgs->depthSize > depthBits) + else if(cfg->depthSize > depthBits) exactDepthMatch = FALSE; /* In all cases make sure the number of stencil bits matches our requirements * even when we don't need stencil because it could affect performance EXCEPT * on cards which don't offer depth formats without stencil like the i915 drivers * on Linux. */ - if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize)) + if(stencilBits != cfg->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfg->stencilSize)) continue; /* Check multisampling support */ - if(cfgs->numSamples != numSamples) + if(cfg->numSamples != numSamples) continue; /* When we have passed all the checks then we have found a format which matches our @@ -571,13 +570,13 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF /* Exit the loop as we have found a format :) */ if(exactDepthMatch) { - iPixelFormat = cfgs->iPixelFormat; + iPixelFormat = cfg->iPixelFormat; break; } else if(!iPixelFormat) { /* In the end we might end up with a format which doesn't exactly match our depth * requirements. Accept the first format we found because formats with higher iPixelFormat * values tend to have more extended capabilities (e.g. multisampling) which we don't need. */ - iPixelFormat = cfgs->iPixelFormat; + iPixelFormat = cfg->iPixelFormat; } } }

1 0

Rob Shearman : wininet: Get rid of rc variable in InternetReadFile_test.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: dbd1800ab2ce516ddb1f06a407f7695f702f6b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd1800ab2ce516ddb1f06a40… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Oct 7 15:39:46 2008 +0100 wininet: Get rid of rc variable in InternetReadFile_test. All of the tested functions return BOOLs, not DWORDs so use res instead of rc. --- dlls/wininet/tests/http.c | 57 ++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c9d1d6f..3a1a13f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -241,7 +241,6 @@ static VOID WINAPI callback( static void InternetReadFile_test(int flags) { BOOL res; - DWORD rc; CHAR buffer[4000]; DWORD length; DWORD out; @@ -332,12 +331,12 @@ static void InternetReadFile_test(int flags) trace("HttpSendRequestA -->\n"); SetLastError(0xdeadbeef); - rc = HttpSendRequestA(hor, "", -1, NULL, 0); + res = HttpSendRequestA(hor, "", -1, NULL, 0); if (flags & INTERNET_FLAG_ASYNC) - ok(((rc == 0)&&(GetLastError() == ERROR_IO_PENDING)), + ok(!res && (GetLastError() == ERROR_IO_PENDING), "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); else - ok((rc != 0) || GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED, + ok(res || (GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED), "Synchronous HttpSendRequest returning 0, error %u\n", GetLastError()); trace("HttpSendRequestA <--\n"); @@ -368,17 +367,17 @@ static void InternetReadFile_test(int flags) CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); length = 4; - rc = InternetQueryOptionA(hor,INTERNET_OPTION_REQUEST_FLAGS,&out,&length); - trace("Option 0x17 -> %i %i\n",rc,out); + res = InternetQueryOptionA(hor,INTERNET_OPTION_REQUEST_FLAGS,&out,&length); + ok(res, "InternetQueryOptionA(INTERNET_OPTION_REQUEST) failed with error %d\n", GetLastError()); length = 100; - rc = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); - trace("Option 0x22 -> %i %s\n",rc,buffer); + res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); + ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = 4000; - rc = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); + length = sizeof(buffer); + res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); + ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); buffer[length]=0; - trace("Option 0x16 -> %i %s\n",rc,buffer); length = sizeof(buffer); res = InternetQueryOptionA(hor, INTERNET_OPTION_URL, buffer, &length); @@ -386,17 +385,17 @@ static void InternetReadFile_test(int flags) ok(!strcmp(buffer, "http://www.winehq.org/site/about"), "Wrong URL %s\n", buffer); length = 16; - rc = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); - trace("Option 0x5 -> %i %s (%u)\n",rc,buffer,GetLastError()); + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_LENGTH,&buffer,&length,0x0); + trace("Option 0x5 -> %i %s (%u)\n",res,buffer,GetLastError()); length = 100; - rc = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); + res = HttpQueryInfoA(hor,HTTP_QUERY_CONTENT_TYPE,buffer,&length,0x0); buffer[length]=0; - trace("Option 0x1 -> %i %s\n",rc,buffer); + trace("Option 0x1 -> %i %s\n",res,buffer); SetLastError(0xdeadbeef); - rc = InternetReadFile(NULL, buffer, 100, &length); - ok(!rc, "InternetReadFile should have failed\n"); + res = InternetReadFile(NULL, buffer, 100, &length); + ok(!res, "InternetReadFile should have failed\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "InternetReadFile should have set last error to ERROR_INVALID_HANDLE instead of %u\n", GetLastError()); @@ -410,13 +409,13 @@ static void InternetReadFile_test(int flags) { if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); - rc = InternetQueryDataAvailable(hor,&length,0x0,0x0); - ok(!(rc == 0 && length != 0),"InternetQueryDataAvailable failed with non-zero length\n"); - ok(rc != 0 || ((flags & INTERNET_FLAG_ASYNC) && GetLastError() == ERROR_IO_PENDING), + res = InternetQueryDataAvailable(hor,&length,0x0,0x0); + ok(!(!res && length != 0),"InternetQueryDataAvailable failed with non-zero length\n"); + ok(res || ((flags & INTERNET_FLAG_ASYNC) && GetLastError() == ERROR_IO_PENDING), "InternetQueryDataAvailable failed, error %d\n", GetLastError()); if (flags & INTERNET_FLAG_ASYNC) { - if (rc != 0) + if (res) { CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); } @@ -432,11 +431,11 @@ static void InternetReadFile_test(int flags) char *buffer; buffer = HeapAlloc(GetProcessHeap(),0,length+1); - rc = InternetReadFile(hor,buffer,length,&length); + res = InternetReadFile(hor,buffer,length,&length); buffer[length]=0; - trace("ReadFile -> %i %i\n",rc,length); + trace("ReadFile -> %s %i\n",res?"TRUE":"FALSE",length); HeapFree(GetProcessHeap(),0,buffer); } @@ -452,11 +451,11 @@ abort: SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); SetLastError(0xdeadbeef); - rc = InternetCloseHandle(hor); - ok ((rc != 0), "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); + res = InternetCloseHandle(hor); + ok (res, "InternetCloseHandle of handle opened by HttpOpenRequestA failed\n"); SetLastError(0xdeadbeef); - rc = InternetCloseHandle(hor); - ok ((rc == 0), "Double close of handle opened by HttpOpenRequestA succeeded\n"); + res = InternetCloseHandle(hor); + ok (!res, "Double close of handle opened by HttpOpenRequestA succeeded\n"); ok (GetLastError() == ERROR_INVALID_HANDLE, "Double close of handle should have set ERROR_INVALID_HANDLE instead of %u\n", GetLastError()); @@ -467,8 +466,8 @@ abort: * INTERNET_STATUS_HANDLE_CLOSING notifications matches the number expected. */ if (hi != 0x0) { SET_WINE_ALLOW(INTERNET_STATUS_HANDLE_CLOSING); - rc = InternetCloseHandle(hi); - ok ((rc != 0), "InternetCloseHandle of handle opened by InternetOpenA failed\n"); + res = InternetCloseHandle(hi); + ok (res, "InternetCloseHandle of handle opened by InternetOpenA failed\n"); if (flags & INTERNET_FLAG_ASYNC) Sleep(100); }

1 0

Henri Verbeet : wined3d: Cleanup CreateAdditionalSwapChain error handling a bit (LLVM/Clang).
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 31d6dbfd7406017e781659aacf0113dd5e561076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d6dbfd7406017e781659aac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 16:01:01 2008 +0200 wined3d: Cleanup CreateAdditionalSwapChain error handling a bit (LLVM/Clang). --- dlls/wined3d/device.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2e13613..b5bc82f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1395,7 +1395,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic HDC hDc; IWineD3DSwapChainImpl *object; /** NOTE: impl ref allowed since this is a create function **/ - HRESULT hr = WINED3D_OK; + HRESULT hr; IUnknown *bufferParent; BOOL displaymode_set = FALSE; WINED3DDISPLAYMODE Mode; @@ -1501,7 +1501,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic TRUE /* Lockable */, &object->frontBuffer, NULL /* pShared (always null)*/); - if (object->frontBuffer != NULL) { + if (SUCCEEDED(hr)) { IWineD3DSurface_SetContainer(object->frontBuffer, (IWineD3DBase *)object); if(surface_type == SURFACE_OPENGL) { IWineD3DSurface_ModifyLocation(object->frontBuffer, SFLAG_INDRAWABLE, TRUE); @@ -1586,7 +1586,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic TRUE /* Lockable */, &object->backBuffer[i], NULL /* pShared (always null)*/); - if(hr == WINED3D_OK && object->backBuffer[i]) { + if(SUCCEEDED(hr)) { IWineD3DSurface_SetContainer(object->backBuffer[i], (IWineD3DBase *)object); } else { ERR("Cannot create new back buffer\n"); @@ -1612,7 +1612,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic } /* Under directX swapchains share the depth stencil, so only create one depth-stencil */ - if (pPresentationParameters->EnableAutoDepthStencil && hr == WINED3D_OK && surface_type == SURFACE_OPENGL) { + if (pPresentationParameters->EnableAutoDepthStencil && surface_type == SURFACE_OPENGL) { TRACE("Creating depth stencil buffer\n"); if (This->auto_depth_stencil_buffer == NULL ) { hr = D3DCB_CreateDepthStencil(This->parent, @@ -1625,8 +1625,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic FALSE /* FIXME: Discard */, &This->auto_depth_stencil_buffer, NULL /* pShared (always null)*/ ); - if (This->auto_depth_stencil_buffer != NULL) + if (SUCCEEDED(hr)) { IWineD3DSurface_SetContainer(This->auto_depth_stencil_buffer, 0); + } else { + ERR("Failed to create the auto depth stencil\n"); + goto error; + } } }

1 0

Rob Shearman : wininet: Validate parameters passed to RetrieveUrlCacheEntryInfoA/W.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 0c75ead3e8123841b358cea7822dc128b2e4fc36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c75ead3e8123841b358cea78… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Oct 7 15:39:33 2008 +0100 wininet: Validate parameters passed to RetrieveUrlCacheEntryInfoA/W. Add tests for this. --- dlls/wininet/tests/urlcache.c | 25 +++++++++++++++++++++++++ dlls/wininet/urlcache.c | 14 ++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index d264b91..44852f7 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -113,6 +113,7 @@ static void test_GetUrlCacheEntryInfoExA(void) check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); cbCacheEntryInfo = 100000; + SetLastError(0xdeadbeef); ret = GetUrlCacheEntryInfoEx(TEST_URL, NULL, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(!ret, "GetUrlCacheEntryInfoEx with zero-length buffer should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetUrlCacheEntryInfoEx should have set last error to ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); @@ -120,6 +121,29 @@ static void test_GetUrlCacheEntryInfoExA(void) HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo); } +static void test_RetrieveUrlCacheEntryA(void) +{ + BOOL ret; + DWORD cbCacheEntryInfo; + + cbCacheEntryInfo = 0; + SetLastError(0xdeadbeef); + ret = RetrieveUrlCacheEntryFile(NULL, NULL, &cbCacheEntryInfo, 0); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = RetrieveUrlCacheEntryFile(TEST_URL, NULL, NULL, 0); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + cbCacheEntryInfo = 100000; + ret = RetrieveUrlCacheEntryFile(NULL, NULL, &cbCacheEntryInfo, 0); + ok(!ret, "RetrieveUrlCacheEntryFile should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "RetrieveUrlCacheEntryFile should have set last error to ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); +} + static void test_urlcacheA(void) { BOOL ret; @@ -168,6 +192,7 @@ static void test_urlcacheA(void) test_find_url_cache_entriesA(); test_GetUrlCacheEntryInfoExA(); + test_RetrieveUrlCacheEntryA(); if (pDeleteUrlCacheEntryA) { diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 792c7bc..9705769 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1817,6 +1817,13 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( lpdwCacheEntryInfoBufferSize, dwReserved); + if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || + (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + error = URLCacheContainers_FindContainerA(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) { @@ -1899,6 +1906,13 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( lpdwCacheEntryInfoBufferSize, dwReserved); + if (!lpszUrlName || !lpdwCacheEntryInfoBufferSize || + (!lpCacheEntryInfo && *lpdwCacheEntryInfoBufferSize)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + error = URLCacheContainers_FindContainerW(lpszUrlName, &pContainer); if (error != ERROR_SUCCESS) {

1 0

Henri Verbeet : gdi32: Call AbortProc from StartDoc instead of EndPage.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: 4f2a3c2c28a4c7815c0a277ed6ecbf471122ddf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2a3c2c28a4c7815c0a277ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 16:01:01 2008 +0200 gdi32: Call AbortProc from StartDoc instead of EndPage. --- dlls/gdi32/printdrv.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index b224896..7d2cb42 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -77,6 +77,12 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) if(!dc) return SP_ERROR; + if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) + { + release_dc_ptr( dc ); + return ret; + } + if (dc->funcs->pStartDoc) ret = dc->funcs->pStartDoc( dc->physDev, doc ); release_dc_ptr( dc ); return ret; @@ -173,11 +179,6 @@ INT WINAPI EndPage(HDC hdc) if(!dc) return SP_ERROR; if (dc->funcs->pEndPage) ret = dc->funcs->pEndPage( dc->physDev ); - if (dc->pAbortProc && !dc->pAbortProc( hdc, 0 )) - { - EndDoc( hdc ); - ret = 0; - } release_dc_ptr( dc ); return ret; }

1 0

Henri Verbeet : comdlg32: Add a test for AbortProc handling.
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: d19bb7832901d7723f32f110bc508feb2c6c7083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19bb7832901d7723f32f110b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 16:01:01 2008 +0200 comdlg32: Add a test for AbortProc handling. --- dlls/comdlg32/tests/Makefile.in | 2 +- dlls/comdlg32/tests/printdlg.c | 72 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/Makefile.in b/dlls/comdlg32/tests/Makefile.in index c3bf0cb..fae9717 100644 --- a/dlls/comdlg32/tests/Makefile.in +++ b/dlls/comdlg32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = comdlg32.dll -IMPORTS = comdlg32 user32 kernel32 +IMPORTS = comdlg32 user32 gdi32 kernel32 CTESTS = \ filedlg.c \ diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index fef274d..cb86d62 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -289,6 +289,77 @@ static void test_PrintDlgExW(void) } +static BOOL abort_proc_called = FALSE; +static BOOL CALLBACK abort_proc(HDC hdc, int error) { return abort_proc_called = TRUE; } +static void test_abort_proc(void) +{ + HDC print_dc; + RECT rect = {0, 0, 100, 100}; + DOCINFOA doc_info = {0}; + PRINTDLGA pd = {0}; + char filename[MAX_PATH]; + + if (!GetTempFileNameA(".", "prn", 0, filename)) + { + skip("Failed to create a temporary file name\n"); + return; + } + + pd.lStructSize = sizeof(pd); + pd.Flags = PD_RETURNDEFAULT | PD_ALLPAGES | PD_RETURNDC | PD_PRINTTOFILE; + pd.nFromPage = 1; + pd.nToPage = 1; + pd.nCopies = 1; + + if (!PrintDlgA(&pd)) + { + skip("No default printer available.\n"); + ok(DeleteFileA(filename), "Failed to delete temporary file\n"); + return; + } + + ok(pd.hDC != NULL, "PrintDlg didn't return a DC.\n"); + if (!(print_dc = pd.hDC)) + { + ok(DeleteFileA(filename), "Failed to delete temporary file\n"); + return; + } + + ok(SetAbortProc(print_dc, abort_proc) > 0, "SetAbortProc failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by SetAbortProc.\n"); + abort_proc_called = FALSE; + + doc_info.cbSize = sizeof(doc_info); + doc_info.lpszDocName = "Some document"; + doc_info.lpszOutput = filename; + + ok(StartDocA(print_dc, &doc_info) > 0, "StartDocA failed\n"); + ok(abort_proc_called, "AbortProc didn't get called by StartDoc.\n"); + abort_proc_called = FALSE; + + ok(StartPage(print_dc) > 0, "StartPage failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by StartPage.\n"); + abort_proc_called = FALSE; + + ok(FillRect(print_dc, &rect, (HBRUSH)(COLOR_BACKGROUND + 1)), "FillRect failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by StretchBlt.\n"); + abort_proc_called = FALSE; + + ok(EndPage(print_dc) > 0, "EndPage failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by EndPage.\n"); + abort_proc_called = FALSE; + + ok(EndDoc(print_dc) > 0, "EndDoc failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by EndDoc.\n"); + abort_proc_called = FALSE; + + ok(DeleteDC(print_dc), "DeleteDC failed\n"); + ok(!abort_proc_called, "AbortProc got called unexpectedly by DeleteDC.\n"); + abort_proc_called = FALSE; + + ok(DeleteFileA(filename), "Failed to delete temporary file\n"); +} + /* ########################### */ START_TEST(printdlg) @@ -299,6 +370,7 @@ START_TEST(printdlg) test_PageSetupDlgA(); test_PrintDlgA(); + test_abort_proc(); /* PrintDlgEx not present before w2k */ if (ptr) {

1 0

Henri Verbeet : wined3d: Print an error when drawStridedSlow() is called with 0 idxSize and non-NULL idxData (CID 509).
by Alexandre Julliard Oct. 8, 2008

Oct. 8, 2008

Module: wine Branch: master Commit: d8c40f76414929e7f87e737f7baed0751279bb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c40f76414929e7f87e737f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 16:01:01 2008 +0200 wined3d: Print an error when drawStridedSlow() is called with 0 idxSize and non-NULL idxData (CID 509). --- dlls/wined3d/drawprim.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 95af758..512d85c 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -318,6 +318,9 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData if (idxSize == 2) pIdxBufS = (const WORD *) idxData; else pIdxBufL = (const DWORD *) idxData; + } else if (idxData) { + ERR("non-NULL idxData with 0 idxSize, this should never happen\n"); + return; } /* Adding the stream offset once is cheaper than doing it every iteration. Do not modify the strided data, it is a pointer

1 0

Zachary Goldberg : WWN Issue 353 -- WineConf edition
by Jeremy Newman Oct. 7, 2008

Oct. 7, 2008

Module: website Branch: master Commit: c645a9aecc85d864731d15d4f7c238305f005ae2 URL: http://source.winehq.org/git/website.git/?a=commit;h=c645a9aecc85d864731d15… Author: Zachary Goldberg <zgs(a)bluesata.com> Date: Tue Oct 7 10:09:48 2008 -0500 WWN Issue 353 -- WineConf edition --- news/en/2008100601.xml | 8 -------- news/en/2008100701.xml | 18 ++++++++++++++++++ wwn/en/{wn20081006_353.xml => wn20081007_353.xml} | 4 ++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/news/en/2008100601.xml b/news/en/2008100601.xml deleted file mode 100644 index dbfb322..0000000 --- a/news/en/2008100601.xml +++ /dev/null @@ -1,8 +0,0 @@ -<news> - <date>October 06, 2008</date> - <title>Wine Weekly News Issue 353</title> - <body> - <a href="?issue=353">WWN Issue 353</a> was released today. -   - </body> -</news> diff --git a/news/en/2008100701.xml b/news/en/2008100701.xml new file mode 100644 index 0000000..7ce8cd5 --- /dev/null +++ b/news/en/2008100701.xml @@ -0,0 +1,18 @@ +<news> + <date>October 07, 2008</date> + <title>World Wine News Issue 353</title> + <body> + <a href="?issue=353">WWN Issue 353</a> was released today. + <ul> + <li><a href="?issue=353#News: WineConf 2008" class="small">News: WineConf 2008</a></li> + <li><a href="?issue=353#WineConf 2008 Keynote" class="small">WineConf 2008 Keynote</a></li> + <li><a href="?issue=353#Focusing on the Users" class="small">Focusing on the Users</a></li> + <li><a href="?issue=353#Wine's Image: WineHQ.org" class="small">Wine's Image: WineHQ.org</a></li> + <li><a href="?issue=353#Wine on other platforms (Solaris, BSD, OS X)" class="small">Wine on other platforms (Solaris, BSD, OS X)</a></li> + <li><a href="?issue=353#Wine 1.2 Timeline" class="small">Wine 1.2 Timeline</a></li> + <li><a href="?issue=353#Updates on The Big Tickets: Quartz, WineD3D, iPod Support, DIB Engine" class="small">Updates on The Big Tickets: Quartz, WineD3D, iPod Support, DIB Engine</a></li> + <li><a href="?issue=353#Weekly AppDB/BugZilla Status Changes" class="small">Weekly AppDB/BugZilla Status Changes</a></li> + </ul> + <a href="?issue=back">More Issues...</a> + </body> +</news> diff --git a/wwn/en/wn20081006_353.xml b/wwn/en/wn20081007_353.xml similarity index 99% rename from wwn/en/wn20081006_353.xml rename to wwn/en/wn20081007_353.xml index 35e1829..90e84b6 100644 --- a/wwn/en/wn20081006_353.xml +++ b/wwn/en/wn20081007_353.xml @@ -4,8 +4,8 @@ <title>Wine Traffic</title> <author contact="http://www.bluesata.com">Zachary Goldberg</author> -<issue num="353" date="10/06/2008" /> -<intro> This is the 353 issue of the Wine Weekly News publication. +<issue num="353" date="10/07/2008" /> +<intro> This is the 353 issue of the World Wine News publication. Its main goal is to bring WineConf 2008 information to the masses. It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </intro> <stats posts="106" size="145" contrib="38" multiples="20" lastweek="27">

1 0