August 2007 - Wine-Commits - list.winehq.org

Misha Koshelev : wininet/tests: Test that for an open HTTP connection InternetQueryDataAvailable succeeds or returns ERROR_IO_PENDING .
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 9aac2fcf55b262908677003a5edb729f05e5be61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aac2fcf55b262908677003a5… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Aug 12 15:41:47 2007 -0500 wininet/tests: Test that for an open HTTP connection InternetQueryDataAvailable succeeds or returns ERROR_IO_PENDING. --- dlls/wininet/tests/http.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5d0b0bb..b8d391c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -397,7 +397,9 @@ 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\n"); + ok(!(rc == 0 && length != 0),"InternetQueryDataAvailable failed with non-zero length\n"); + ok(rc != 0 || ((flags & INTERNET_FLAG_ASYNC) && GetLastError() == ERROR_IO_PENDING), + "InternetQueryDataAvailable failed, error %d\n", GetLastError()); if (flags & INTERNET_FLAG_ASYNC) { if (rc != 0)

1 0

Roderick Colenbrander : wined3d: Fix WINED3DFMT D16/ L16 bugs in the pixelformat table.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: f6260c5b20194ef351e96488d3000c726345bd11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6260c5b20194ef351e96488d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 11 12:21:15 2007 +0200 wined3d: Fix WINED3DFMT D16/L16 bugs in the pixelformat table. --- dlls/wined3d/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7643aa9..c66c381 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -96,8 +96,8 @@ static const StaticPixelFormatDesc formats[] = { {WINED3DFMT_D24S8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,24 ,8 ,FALSE }, {WINED3DFMT_D24X8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,24 ,0 ,FALSE }, {WINED3DFMT_D24X4S4 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,24 ,4 ,FALSE }, - {WINED3DFMT_D16 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,16 ,0 ,FALSE }, - {WINED3DFMT_L16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,0 ,0 ,FALSE }, + {WINED3DFMT_D16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,16 ,0 ,FALSE }, + {WINED3DFMT_L16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,16 ,0 ,FALSE }, {WINED3DFMT_D32F_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,4 ,32 ,0 ,FALSE }, {WINED3DFMT_D24FS8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,24 ,8 ,FALSE }, /* Is this a vertex buffer? */

1 0

Roderick Colenbrander : wined3d: Use the proper depth stencil format.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 5754726aeb6397d6861ecc04c954f47574fcf72c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5754726aeb6397d6861ecc04c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Aug 11 12:17:56 2007 +0200 wined3d: Use the proper depth stencil format. --- dlls/wined3d/context.c | 22 ++++++++++++++-------- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index eef4bd9..9edbd73 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -119,9 +119,10 @@ static WineD3DContext *AddContextToArray(IWineD3DDeviceImpl *This, HWND win_hand * target: Surface this context will render to * win_handle: handle to the window which we are drawing to * create_pbuffer: tells whether to create a pbuffer or not + * pPresentParameters: contains the pixelformats to use for onscreen rendering * *****************************************************************************/ -WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win_handle, BOOL create_pbuffer) { +WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win_handle, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms) { HDC oldDrawable, hdc; HPBUFFERARB pbuffer = NULL; HGLRC ctx = NULL, oldCtx; @@ -222,18 +223,23 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ pfd.iPixelType = PFD_TYPE_RGBA; pfd.cColorBits = 32; - pfd.cDepthBits = 24; - pfd.cStencilBits = 8; + pfd.cDepthBits = 0; + pfd.cStencilBits = 0; pfd.iLayerType = PFD_MAIN_PLANE; /* Try to match the colorBits of the d3d format */ if(getColorBits(target->resource.format, &red, &green, &blue, &alpha, &colorBits)) pfd.cColorBits = colorBits; - /* TODO: get the depth/stencil format from auto depth stencil format */ - if(getDepthStencilBits(WINED3DFMT_D24S8, &depthBits, &stencilBits)) { - pfd.cDepthBits = depthBits; - pfd.cStencilBits = stencilBits; + /* Retrieve the depth stencil format from the present parameters. + * The choice of the proper format can give a nice performance boost + * in case of GPU limited programs. */ + if(pPresentParms->EnableAutoDepthStencil) { + TRACE("pPresentParms->EnableAutoDepthStencil=enabled; using AutoDepthStencilFormat=%s\n", debug_d3dformat(pPresentParms->AutoDepthStencilFormat)); + if(getDepthStencilBits(pPresentParms->AutoDepthStencilFormat, &depthBits, &stencilBits)) { + pfd.cDepthBits = depthBits; + pfd.cStencilBits = stencilBits; + } } iPixelFormat = ChoosePixelFormat(hdc, &pfd); @@ -696,7 +702,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf */ This->pbufferContext = CreateContext(This, targetimpl, ((IWineD3DSwapChainImpl *) This->swapchains[0])->context[0]->win_handle, - TRUE /* pbuffer */); + TRUE /* pbuffer */, &((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms); This->pbufferWidth = targetimpl->currentDesc.Width; This->pbufferHeight = targetimpl->currentDesc.Height; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59bc35f..b0c0b20 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1302,7 +1302,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevic object->num_contexts = 1; ENTER_GL(); - object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, object->win_handle, FALSE /* pbuffer */); + object->context[0] = CreateContext(This, (IWineD3DSurfaceImpl *) object->frontBuffer, object->win_handle, FALSE /* pbuffer */, pPresentationParameters); LEAVE_GL(); if (!object->context[0]) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7741b37..5d1edbe 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -205,7 +205,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSurface_UnlockRect(This->backBuffer[0]); DestroyContext(This->wineD3DDevice, This->context[0]); - This->context[0] = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, This->win_handle, FALSE /* pbuffer */); + This->context[0] = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, This->win_handle, FALSE /* pbuffer */, &This->presentParms); IWineD3DSurface_LockRect(This->backBuffer[0], &r, NULL, WINED3DLOCK_DISCARD); memcpy(r.pBits, mem, r.Pitch * ((IWineD3DSurfaceImpl *) This->backBuffer[0])->currentDesc.Height); @@ -537,7 +537,7 @@ WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain * TRACE("Creating a new context for swapchain %p, thread %d\n", This, GetCurrentThreadId()); ctx = CreateContext(This->wineD3DDevice, (IWineD3DSurfaceImpl *) This->frontBuffer, - This->context[0]->win_handle, FALSE /* pbuffer */); + This->context[0]->win_handle, FALSE /* pbuffer */, &This->presentParms); if(!ctx) { ERR("Failed to create a new context for the swapchain\n"); return NULL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b2fe145..c996b23 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -535,7 +535,7 @@ typedef enum ContextUsage { } ContextUsage; void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); -WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer); +WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms); void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); void apply_fbo_state(IWineD3DDevice *iface);

1 0

Misha Koshelev : wininet: InternetQueryDataAvailable does not return ERROR_NO_MORE_FILES when no more HTTP data is available .
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 6ea2441ff935c509a9c6548b1c2dd178d2669574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea2441ff935c509a9c6548b1… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Sun Aug 12 15:40:46 2007 -0500 wininet: InternetQueryDataAvailable does not return ERROR_NO_MORE_FILES when no more HTTP data is available. --- dlls/wininet/internet.c | 58 +++++++++++++++++------------------------ dlls/wininet/netconnection.c | 2 +- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 14cfd04..bfad36c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3314,49 +3314,39 @@ BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile, switch (lpwhr->hdr.htype) { case WH_HHTTPREQ: + retval = TRUE; if (NETCON_query_data_available(&lpwhr->netConnection, - lpdwNumberOfBytesAvailble)) + lpdwNumberOfBytesAvailble) && + !*lpdwNumberOfBytesAvailble) { - retval = TRUE; - if (!*lpdwNumberOfBytesAvailble) + /* Even if we are in async mode, we need to determine whether + * there is actually more data available. We do this by trying + * to peek only a single byte in async mode. */ + BOOL async = (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); + if (NETCON_recv(&lpwhr->netConnection, buffer, + min(async ? 1 : sizeof(buffer), + lpwhr->dwContentLength - lpwhr->dwContentRead), + MSG_PEEK, (int *)lpdwNumberOfBytesAvailble) && + async && *lpdwNumberOfBytesAvailble) { - /* Even if we are in async mode, we need to determine whether - * there is actually more data available. We do this by trying - * to peek only a single byte in async mode. */ - BOOL async = (lpwhr->lpHttpSession->lpAppInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC); - if (!NETCON_recv(&lpwhr->netConnection, buffer, - min(async ? 1 : sizeof(buffer), - lpwhr->dwContentLength - lpwhr->dwContentRead), - MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) + WORKREQUEST workRequest; + + *lpdwNumberOfBytesAvailble = 0; + workRequest.asyncproc = AsyncInternetQueryDataAvailableProc; + workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); + + retval = INTERNET_AsyncCall(&workRequest); + if (!retval) { - INTERNET_SetLastError(ERROR_NO_MORE_FILES); - retval = FALSE; + WININET_Release( &lpwhr->hdr ); } - else if (async && *lpdwNumberOfBytesAvailble) + else { - WORKREQUEST workRequest; - - *lpdwNumberOfBytesAvailble = 0; - workRequest.asyncproc = AsyncInternetQueryDataAvailableProc; - workRequest.hdr = WININET_AddRef( &lpwhr->hdr ); - - retval = INTERNET_AsyncCall(&workRequest); - if (!retval) - { - WININET_Release( &lpwhr->hdr ); - } - else - { - INTERNET_SetLastError(ERROR_IO_PENDING); - retval = FALSE; - } + INTERNET_SetLastError(ERROR_IO_PENDING); + retval = FALSE; } } } - else - { - INTERNET_SetLastError(ERROR_NO_MORE_FILES); - } break; default: diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 40f3a22..4500a9f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -572,10 +572,10 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f */ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available) { + *available = 0; if (!NETCON_connected(connection)) return FALSE; - *available = 0; #ifdef SONAME_LIBSSL if (connection->peek_msg) *available = connection->peek_len; #endif

1 0

Alex Villacís Lasso : quartz: Add test for IReferenceClock.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 9d436f697d00ebb739565acf763ccfb753b54013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d436f697d00ebb739565acf7… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Fri Aug 10 21:29:26 2007 -0500 quartz: Add test for IReferenceClock. --- dlls/quartz/tests/Makefile.in | 3 +- dlls/quartz/tests/referenceclock.c | 95 ++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 2c8bdc1..ce67944 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -8,7 +8,8 @@ EXTRALIBS = -lstrmiids CTESTS = \ filtergraph.c \ - memallocator.c + memallocator.c \ + referenceclock.c @MAKE_TEST_RULES@ diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c new file mode 100644 index 0000000..aeadd48 --- /dev/null +++ b/dlls/quartz/tests/referenceclock.c @@ -0,0 +1,95 @@ +/* + * Unit tests for Direct Show functions - IReferenceClock + * + * Copyright (C) 2007 Alex Villacís Lasso + * + * 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 <assert.h> + +#define COBJMACROS + +#include "wine/test.h" +#include "uuids.h" +#include "dshow.h" +#include "control.h" + +/* The following method expects a reference clock that will keep ticking for + * at least 5 seconds since its creation. This method assumes no other methods + * were called on the IReferenceClock interface since its creation. + */ +static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock * pClock) +{ + HRESULT hr; + REFERENCE_TIME time1; + REFERENCE_TIME time2; + signed long diff; + + /* Test response from invalid (NULL) argument */ + hr = IReferenceClock_GetTime(pClock, NULL); + ok (hr == E_POINTER, "%s - Expected E_POINTER (0x%08x), got 0x%08x\n", clockdesc, E_POINTER, hr); + + /* Test response for valid value - try 1 */ + /* TODO: test whether Windows actually returns S_FALSE in its first invocation */ + time1 = (REFERENCE_TIME)0xdeadbeef; + hr = IReferenceClock_GetTime(pClock, &time1); + ok (hr == S_FALSE || hr == S_OK, "%s - Expected S_OK or S_FALSE, got 0x%08x\n", clockdesc, hr); + ok (time1 != 0xdeadbeef, "%s - value was NOT changed on return!\n", clockdesc); + + /* Test response for valid value - try 2 */ + time2 = (REFERENCE_TIME)0xdeadbeef; + hr = IReferenceClock_GetTime(pClock, &time2); + ok (hr == S_FALSE || hr == S_OK, "%s - Expected S_OK or S_FALSE, got 0x%08x\n", clockdesc, hr); + ok (time2 != 0xdeadbeef, "%s - value was NOT changed on return!\n", clockdesc); + + /* In case the second invocation managed to return S_FALSE, MSDN says the + returned time is the same as the previous one. */ + ok ((hr != S_FALSE || time1 == time2), "%s - returned S_FALSE, but values not equal!\n", clockdesc); + + time1 = time2; + Sleep(1000); /* Sleep for at least 1 second */ + hr = IReferenceClock_GetTime(pClock, &time2); + /* After a 1-second sleep, there is no excuse to get S_FALSE (see TODO above) */ + todo_wine { + ok (hr == S_OK, "%s - Expected S_OK, got 0x%08x\n", clockdesc, hr); + } + + /* FIXME: How much deviation should be allowed after a sleep? */ + diff = time2 - time1; + ok (9980000 <= diff && diff <= 10020000, "%s - Expected difference around 10000000, got %lu\n", clockdesc, diff); + +} + +static void test_IReferenceClock_SystemClock(void) +{ + IReferenceClock * pReferenceClock; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&pReferenceClock); + ok(hr == S_OK, "Unable to create reference clock from system clock %x\n", hr); + if (hr == S_OK) + { + test_IReferenceClock_methods("SystemClock", pReferenceClock); + IReferenceClock_Release(pReferenceClock); + } +} + +START_TEST(referenceclock) +{ + CoInitialize(NULL); + + test_IReferenceClock_SystemClock(); +}

1 0

Jason Edmeades : regedit: Fix importing of .reg hex.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 34749c2a076279cc10dcacfe5645ed0d9d3a4329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34749c2a076279cc10dcacfe5… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Aug 10 22:28:36 2007 +0100 regedit: Fix importing of .reg hex. --- programs/regedit/regproc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 6cc63f2..602717a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -109,7 +109,9 @@ static BYTE* convertHexCSVToHex(char *str, DWORD *size) *d++ =(BYTE)wc; (*size)++; - s+=(wc < 0x10 ? 2 : 3); + /* Skip one or two digits and any comma */ + while (*s && *s!=',') s++; + if (*s) s++; } return data;

1 0

Jason Edmeades : advpack: Strip single quotes (with tests) on reg keys.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 799ef700c4b5b131b901942b169055bd18ff3fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=799ef700c4b5b131b901942b1… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Fri Aug 10 22:28:34 2007 +0100 advpack: Strip single quotes (with tests) on reg keys. --- dlls/advpack/advpack.c | 17 +++++++++++- dlls/advpack/tests/advpack.c | 59 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 157413f..8ef1c9a 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -49,6 +49,17 @@ static const WCHAR setup_key[] = { 'C','o','m','p','o','n','e','n','t','s',0 }; +/* Strip single quotes from a token - note size includes NULL */ +static void strip_quotes(WCHAR *buffer, DWORD *size) +{ + if (buffer[0] == '\'' && (*size > 1) && buffer[*size-2]=='\'') + { + *size -= 2; + buffer[*size] = 0x00; + memmove(buffer, buffer + 1, *size * sizeof(WCHAR)); + } +} + /* parses the destination directory parameters from pszSection * the parameters are of the form: root,key,value,unknown,fallback * we first read the reg value root\\key\\value and if that fails, @@ -68,8 +79,11 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw /* load the destination parameters */ SetupFindFirstLineW(hInf, pszSection, NULL, &context); SetupGetStringFieldW(&context, 1, prefix, PREFIX_LEN, &size); + strip_quotes(prefix, &size); SetupGetStringFieldW(&context, 2, key, MAX_PATH, &size); + strip_quotes(key, &size); SetupGetStringFieldW(&context, 3, value, MAX_PATH, &size); + strip_quotes(value, &size); if (!lstrcmpW(prefix, hklm)) root = HKEY_LOCAL_MACHINE; @@ -84,7 +98,8 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw if (RegOpenKeyW(root, key, &subkey) || RegQueryValueExW(subkey, value, NULL, NULL, (LPBYTE)pszBuffer, &size)) { - SetupGetStringFieldW(&context, 5, pszBuffer, dwSize, NULL); + SetupGetStringFieldW(&context, 5, pszBuffer, dwSize, &size); + strip_quotes(pszBuffer, &size); } RegCloseKey(subkey); diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 7218b59..577f274 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -43,6 +43,7 @@ static HRESULT (WINAPI *pTranslateInfString)(LPCSTR,LPCSTR,LPCSTR,LPCSTR,LPSTR,D static HRESULT (WINAPI *pTranslateInfStringEx)(HINF,PCSTR,PCSTR,PCSTR,PSTR,DWORD,PDWORD,PVOID); static CHAR inf_file[MAX_PATH]; +static CHAR PROG_FILES_ROOT[MAX_PATH]; static CHAR PROG_FILES[MAX_PATH]; static DWORD PROG_FILES_LEN; @@ -52,9 +53,10 @@ static void get_progfiles_dir(void) DWORD size = MAX_PATH; RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", &hkey); - RegQueryValueExA(hkey, "ProgramFilesDir", NULL, NULL, (LPBYTE)PROG_FILES, &size); + RegQueryValueExA(hkey, "ProgramFilesDir", NULL, NULL, (LPBYTE)PROG_FILES_ROOT, &size); RegCloseKey(hkey); + lstrcpyA(PROG_FILES, PROG_FILES_ROOT); lstrcatA(PROG_FILES, TEST_STRING1); PROG_FILES_LEN = lstrlenA(PROG_FILES) + 1; } @@ -198,6 +200,9 @@ static void create_inf_file(void) append_str(&ptr, "Signature=\"$Chicago$\"\n"); append_str(&ptr, "[CustInstDestSection]\n"); append_str(&ptr, "49001=ProgramFilesDir\n"); + append_str(&ptr, "49010=DestA,1\n"); + append_str(&ptr, "49020=DestB\n"); + append_str(&ptr, "49030=DestC\n"); append_str(&ptr, "[ProgramFilesDir]\n"); append_str(&ptr, "HKLM,\"Software\\Microsoft\\Windows\\CurrentVersion\","); append_str(&ptr, "\"ProgramFilesDir\",,\"%%24%%\\%%LProgramF%%\"\n"); @@ -207,10 +212,20 @@ static void create_inf_file(void) append_str(&ptr, "[Options.NTx86]\n"); append_str(&ptr, "49001=ProgramFilesDir\n"); append_str(&ptr, "InstallDir=%%49001%%\\%%DefaultAppPath%%\n"); + append_str(&ptr, "Result1=%%49010%%\n"); + append_str(&ptr, "Result2=%%49020%%\n"); + append_str(&ptr, "Result3=%%49030%%\n"); append_str(&ptr, "CustomHDestination=CustInstDestSection\n"); append_str(&ptr, "[Strings]\n"); append_str(&ptr, "DefaultAppPath=\"Application Name\"\n"); append_str(&ptr, "LProgramF=\"Program Files\"\n"); + append_str(&ptr, "[DestA]\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%\\%%LProgramF%%'\n"); + append_str(&ptr, "[DestB]\n"); + append_str(&ptr, "'HKLM','Software\\Microsoft\\Windows\\CurrentVersion',"); + append_str(&ptr, "'ProgramFilesDir',,\"%%24%%\"\n"); + append_str(&ptr, "[DestC]\n"); + append_str(&ptr, "HKLM,\"Software\\Garbage\",\"ProgramFilesDir\",,'%%24%%'\n"); WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); @@ -397,6 +412,48 @@ static void translateinfstringex_test(void) ok(!strcmp(buffer, PROG_FILES), "Expected %s, got %s\n", PROG_FILES, buffer); ok(size == PROG_FILES_LEN, "Expected size %d, got %d\n", PROG_FILES_LEN, size); + /* Single quote test (Note size includes null on return from call) */ + memset(buffer, 'a', PROG_FILES_LEN); + buffer[PROG_FILES_LEN - 1] = '\0'; + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result1", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine { /* Wine returns C:\\Program Files, not C:\Program Files */ + ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); + ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + lstrlenA(PROG_FILES_ROOT)+1, size); + } + + memset(buffer, 'a', PROG_FILES_LEN); + buffer[PROG_FILES_LEN - 1] = '\0'; + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result2", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpi(buffer, PROG_FILES_ROOT), + "Expected %s, got %s\n", PROG_FILES_ROOT, buffer); + ok(size == lstrlenA(PROG_FILES_ROOT)+1, "Expected size %d, got %d\n", + lstrlenA(PROG_FILES_ROOT)+1, size); + + { + char drive[MAX_PATH]; + lstrcpy(drive, PROG_FILES_ROOT); + drive[3] = 0x00; /* Just keep the system drive plus '\' */ + + memset(buffer, 'a', PROG_FILES_LEN); + buffer[PROG_FILES_LEN - 1] = '\0'; + size = MAX_PATH; + hr = pTranslateInfStringEx(hinf, inf_file, "Options.NTx86", "Result3", + buffer, size, &size, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpi(buffer, drive), + "Expected %s, got %s\n", drive, buffer); + ok(size == lstrlenA(drive)+1, "Expected size %d, got %d\n", + lstrlenA(drive)+1, size); + } + /* close the INF again */ hr = pCloseINFEngine(hinf); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Alex Villacís Lasso : quartz: Fix IReferenceClock:: GetTime() implementation for system clock.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 7319157d7dee0ec123aa0494cf78e06fe34b0a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7319157d7dee0ec123aa0494c… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Fri Aug 10 21:30:41 2007 -0500 quartz: Fix IReferenceClock::GetTime() implementation for system clock. --- dlls/quartz/systemclock.c | 7 ++----- dlls/quartz/tests/referenceclock.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index ff1a28a..005a5c7 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -244,14 +244,11 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock* iface, REFERENCE_ curTimeTickCount = GetTickCount(); EnterCriticalSection(&This->safe); - /** TODO: safe this not using * 10000 */ + if (This->lastTimeTickCount == curTimeTickCount) hr = S_FALSE; This->lastRefTime += (REFERENCE_TIME) (DWORD) (curTimeTickCount - This->lastTimeTickCount) * (REFERENCE_TIME) 10000; This->lastTimeTickCount = curTimeTickCount; - LeaveCriticalSection(&This->safe); - *pTime = This->lastRefTime; - if (This->lastTimeTickCount == curTimeTickCount) hr = S_FALSE; - This->lastTimeTickCount = curTimeTickCount; + LeaveCriticalSection(&This->safe); return hr; } diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index aeadd48..1d02615 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -63,9 +63,7 @@ static void test_IReferenceClock_methods(const char * clockdesc, IReferenceClock Sleep(1000); /* Sleep for at least 1 second */ hr = IReferenceClock_GetTime(pClock, &time2); /* After a 1-second sleep, there is no excuse to get S_FALSE (see TODO above) */ - todo_wine { ok (hr == S_OK, "%s - Expected S_OK, got 0x%08x\n", clockdesc, hr); - } /* FIXME: How much deviation should be allowed after a sleep? */ diff = time2 - time1;

1 0

Andrew Talbot : riched20: Constify some variables.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 2e2efd448af87b783314eafedfb784b965edf010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e2efd448af87b783314eafed… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 11 16:07:50 2007 +0100 riched20: Constify some variables. --- dlls/riched20/caret.c | 8 ++++---- dlls/riched20/clipboard.c | 10 +++++----- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index f2ca595..24b65c0 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -47,10 +47,10 @@ int ME_GetTextLength(ME_TextEditor *editor) } -int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how) +int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) { int length; - + if (how->flags & GTL_PRECISE && how->flags & GTL_CLOSE) return E_INVALIDARG; if (how->flags & GTL_NUMCHARS && how->flags & GTL_NUMBYTES) @@ -1148,8 +1148,8 @@ static int ME_GetSelCursor(ME_TextEditor *editor, int dir) else return 1; } - -BOOL ME_UpdateSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor) + +BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor) { ME_Cursor old_anchor = editor->pCursors[1]; diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 99d9503..376a2e5 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -45,7 +45,7 @@ typedef struct EnumFormatImpl { UINT cur; } EnumFormatImpl; -static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); +static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFIID riid, LPVOID *ppvObj) { @@ -147,7 +147,7 @@ static const IEnumFORMATETCVtbl VT_EnumFormatImpl = { EnumFormatImpl_Clone }; -static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFORMATETC **lplpformatetc) +static HRESULT EnumFormatImpl_Create(const FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFORMATETC **lplpformatetc) { EnumFormatImpl *ret; TRACE("\n"); @@ -325,7 +325,7 @@ static const IDataObjectVtbl VT_DataObjectImpl = DataObjectImpl_EnumDAdvise }; -static HGLOBAL get_unicode_text(ME_TextEditor *editor, CHARRANGE *lpchrg) +static HGLOBAL get_unicode_text(ME_TextEditor *editor, const CHARRANGE *lpchrg) { int pars, len; WCHAR *data; @@ -369,7 +369,7 @@ static DWORD CALLBACK ME_AppendToHGLOBAL(DWORD_PTR dwCookie, LPBYTE lpBuff, LONG return 0; } -static HGLOBAL get_rtf_text(ME_TextEditor *editor, CHARRANGE *lpchrg) +static HGLOBAL get_rtf_text(ME_TextEditor *editor, const CHARRANGE *lpchrg) { EDITSTREAM es; ME_GlobalDestStruct gds; @@ -383,7 +383,7 @@ static HGLOBAL get_rtf_text(ME_TextEditor *editor, CHARRANGE *lpchrg) return gds.hData; } -HRESULT ME_GetDataObject(ME_TextEditor *editor, CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj) +HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj) { DataObjectImpl *obj; TRACE("(%p,%d,%d)\n", editor, lpchrg->cpMin, lpchrg->cpMax); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4cdb54a..740828f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -782,7 +782,7 @@ ME_FindItemAtOffset(ME_TextEditor *editor, ME_DIType nItemType, int nOffset, int static int -ME_FindText(ME_TextEditor *editor, DWORD flags, CHARRANGE *chrg, const WCHAR *text, CHARRANGE *chrgText) +ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCHAR *text, CHARRANGE *chrgText) { const int nLen = lstrlenW(text); const int nTextLen = ME_GetTextLength(editor); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f71842b..09083ce 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -206,9 +206,9 @@ void ME_InsertGraphicsFromCursor(ME_TextEditor *editor, int nCursor); void ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor); void ME_InternalDeleteText(ME_TextEditor *editor, int nOfs, int nChars); int ME_GetTextLength(ME_TextEditor *editor); -int ME_GetTextLengthEx(ME_TextEditor *editor, GETTEXTLENGTHEX *how); +int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how); ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor); -BOOL ME_UpdateSelection(ME_TextEditor *editor, ME_Cursor *pTempCursor); +BOOL ME_UpdateSelection(ME_TextEditor *editor, const ME_Cursor *pTempCursor); /* wrap.c */ void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); @@ -285,4 +285,4 @@ LRESULT ME_StreamOutRange(ME_TextEditor *editor, DWORD dwFormat, int nStart, int LRESULT ME_StreamOut(ME_TextEditor *editor, DWORD dwFormat, EDITSTREAM *stream); /* clipboard.c */ -HRESULT ME_GetDataObject(ME_TextEditor *editor, CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj); +HRESULT ME_GetDataObject(ME_TextEditor *editor, const CHARRANGE *lpchrg, LPDATAOBJECT *lplpdataobj);

1 0

Marcus Meissner : msi: Allocate 1 byte more buffer.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: fb4901759be436dba014ae424b473952fdd2f577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4901759be436dba014ae424… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Aug 12 18:30:43 2007 +0200 msi: Allocate 1 byte more buffer. --- dlls/msi/tests/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e96f7dc..778d05a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1733,7 +1733,7 @@ static BOOL pf_exists(LPCSTR file) static void delete_pfmsitest_files(void) { SHFILEOPSTRUCT shfl; - CHAR path[MAX_PATH+10]; + CHAR path[MAX_PATH+11]; lstrcpyA(path, PROG_FILES_DIR); lstrcatA(path, "\\msitest\\*");

1 0