wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Alexandre Julliard : ws2_32: Define a specific structure for each query type.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 8dcb6f3f3c338748dfaec6368ed04c08f00985db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcb6f3f3c338748dfaec6368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 19:30:05 2009 +0200 ws2_32: Define a specific structure for each query type. --- dlls/ws2_32/async.c | 398 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 239 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dcb6f3f3c338748dfaec…

1 0

Alexandre Julliard : ws2_32: Define a common header struct for async queries, and switch to 32-bit types.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 6905a6c2ad40ed12b3e014e7433eee37f50c51c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6905a6c2ad40ed12b3e014e74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 18:25:05 2009 +0200 ws2_32: Define a common header struct for async queries, and switch to 32-bit types. --- dlls/ws2_32/async.c | 79 ++++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 38 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 157c35b..5948aa8 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -132,7 +132,7 @@ UINT wsaHerrno(int errnr); #define AQ_WIN16 0x00 #define AQ_WIN32 0x04 -#define HB_WIN32(hb) (hb->flags & AQ_WIN32) +#define HB_WIN32(hb) (hb->query.flags & AQ_WIN32) #define AQ_COPYPTR1 0x10 #define AQ_DUPLOWPTR1 0x20 #define AQ_MASKPTR1 0x30 @@ -144,12 +144,21 @@ UINT wsaHerrno(int errnr); /* 16-bit values are used internally (to be sure handle comparison works right in 16-bit apps). */ #define WSA_H32(h16) ((HANDLE)(ULONG_PTR)(h16)) +struct async_query_header +{ + HWND hWnd; + UINT uMsg; + void *sbuf; + INT sbuflen; + UINT flags; + HANDLE handle; +}; + /* Generic async query struct. we use symbolic names for the different queries * for readability. */ typedef struct _async_query { - HWND16 hWnd; - UINT16 uMsg; + struct async_query_header query; LPCSTR ptr1; #define host_name ptr1 #define host_addr ptr1 @@ -163,12 +172,6 @@ typedef struct _async_query { #define serv_port int1 int int2; #define host_type int2 - SEGPTR sbuf; - INT16 sbuflen; - - HANDLE16 async_handle; - int flags; - int qt; char xbuf[1]; } async_query; @@ -202,10 +205,10 @@ static int list_dup(char** l_src, char* ref, char* base, int item_size) return (p - ref); } -static DWORD finish_query( async_query *aq, LPARAM lparam ) +static DWORD finish_query( struct async_query_header *query, LPARAM lparam ) { - PostMessageW( HWND_32(aq->hWnd), aq->uMsg, (WPARAM)aq->async_handle, lparam ); - HeapFree( GetProcessHeap(), 0, aq ); + PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); + HeapFree( GetProcessHeap(), 0, query ); return 0; } @@ -274,7 +277,7 @@ static DWORD WINAPI async_gethostbyname(LPVOID arg) int size = 0; WORD fail = 0; struct hostent *he; - char *copy_hostent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_hostent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; int ebufsize=1024; @@ -298,13 +301,13 @@ static DWORD WINAPI async_gethostbyname(LPVOID arg) ebufsize *=2; extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; } - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); HeapFree(GetProcessHeap(),0,extrabuf); #else EnterCriticalSection( &csWSgetXXXbyYYY ); he = gethostbyname(aq->host_name); - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif @@ -314,7 +317,7 @@ static DWORD WINAPI async_gethostbyname(LPVOID arg) } done: - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } static DWORD WINAPI async_gethostbyaddr(LPVOID arg) @@ -323,7 +326,7 @@ static DWORD WINAPI async_gethostbyaddr(LPVOID arg) int size = 0; WORD fail = 0; struct hostent *he; - char *copy_hostent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_hostent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; int ebufsize=1024; @@ -338,13 +341,13 @@ static DWORD WINAPI async_gethostbyaddr(LPVOID arg) ebufsize *=2; extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; } - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); HeapFree(GetProcessHeap(),0,extrabuf); #else EnterCriticalSection( &csWSgetXXXbyYYY ); he = gethostbyaddr(aq->host_addr,aq->host_len,aq->host_type); - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif @@ -352,7 +355,7 @@ static DWORD WINAPI async_gethostbyaddr(LPVOID arg) fail = WSAENOBUFS; size = -size; } - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } /* ----- protoent */ @@ -414,11 +417,11 @@ static DWORD WINAPI async_getprotobyname(LPVOID arg) #ifdef HAVE_GETPROTOBYNAME struct protoent *pe; - char *copy_protoent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_protoent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); pe = getprotobyname(aq->proto_name); if (pe) { - size = WS_copy_pe(copy_protoent,(char*)aq->sbuf,aq->sbuflen,pe,aq->flags); + size = WS_copy_pe(copy_protoent, aq->query.sbuf, aq->query.sbuflen, pe, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -432,7 +435,7 @@ static DWORD WINAPI async_getprotobyname(LPVOID arg) #else fail = WSANO_DATA; #endif - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } static DWORD WINAPI async_getprotobynumber(LPVOID arg) @@ -443,11 +446,11 @@ static DWORD WINAPI async_getprotobynumber(LPVOID arg) #ifdef HAVE_GETPROTOBYNUMBER struct protoent *pe; - char *copy_protoent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_protoent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); pe = getprotobynumber(aq->proto_number); if (pe) { - size = WS_copy_pe(copy_protoent,(char*)aq->sbuf,aq->sbuflen,pe,aq->flags); + size = WS_copy_pe(copy_protoent, aq->query.sbuf, aq->query.sbuflen, pe, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -461,7 +464,7 @@ static DWORD WINAPI async_getprotobynumber(LPVOID arg) #else fail = WSANO_DATA; #endif - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } /* ----- servent */ @@ -527,12 +530,12 @@ static DWORD WINAPI async_getservbyname(LPVOID arg) int size = 0; WORD fail = 0; struct servent *se; - char *copy_servent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_servent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); se = getservbyname(aq->serv_name,aq->serv_proto); if (se) { - size = WS_copy_se(copy_servent,(char*)aq->sbuf,aq->sbuflen,se,aq->flags); + size = WS_copy_se(copy_servent, aq->query.sbuf, aq->query.sbuflen, se, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -544,7 +547,7 @@ static DWORD WINAPI async_getservbyname(LPVOID arg) fail = WSANO_DATA; } LeaveCriticalSection( &csWSgetXXXbyYYY ); - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } static DWORD WINAPI async_getservbyport(LPVOID arg) @@ -553,13 +556,13 @@ static DWORD WINAPI async_getservbyport(LPVOID arg) int size = 0; WORD fail = 0; struct servent *se; - char *copy_servent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_servent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); #ifdef HAVE_GETSERVBYPORT se = getservbyport(aq->serv_port,aq->serv_proto); if (se) { - size = WS_copy_se(copy_servent,(char*)aq->sbuf,aq->sbuflen,se,aq->flags); + size = WS_copy_se(copy_servent, aq->query.sbuf, aq->query.sbuflen, se, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -574,7 +577,7 @@ static DWORD WINAPI async_getservbyport(LPVOID arg) fail = WSANO_DATA; #endif LeaveCriticalSection( &csWSgetXXXbyYYY ); - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } @@ -630,17 +633,17 @@ static HANDLE16 __WSAsyncDBQuery( HWND hWnd, UINT uMsg, LPTHREAD_START_ROUTINE f case AQ_DUPLOWPTR2: pfm = ptr2; ptr2 = pto; do *pto++ = tolower(*pfm); while (*pfm++); break; } - aq->hWnd = HWND_16(hWnd); - aq->uMsg = uMsg; + aq->query.hWnd = hWnd; + aq->query.uMsg = uMsg; aq->int1 = int1; aq->ptr1 = ptr1; aq->int2 = int2; aq->ptr2 = ptr2; /* avoid async_handle = 0 */ - aq->async_handle = (++__ws_async_handle ? __ws_async_handle : ++__ws_async_handle); - aq->flags = flags; - aq->sbuf = (SEGPTR)sbuf; - aq->sbuflen = sbuflen; + aq->query.handle = UlongToHandle(++__ws_async_handle ? __ws_async_handle : ++__ws_async_handle); + aq->query.flags = flags; + aq->query.sbuf = sbuf; + aq->query.sbuflen = sbuflen; thread = CreateThread( NULL, 0, func, aq, 0, NULL ); if (!thread)

1 0

Alexandre Julliard : ws2_32: Split the async function callback by type of query.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 9c2abfc503126c629f9b75c7f39e4477a4d78d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2abfc503126c629f9b75c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 18:22:52 2009 +0200 ws2_32: Split the async function callback by type of query. --- dlls/ws2_32/async.c | 481 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 281 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c2abfc503126c629f9b7…

1 0

Michael Stefaniuc : msi/tests: Remove trailing '\'.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: f8ec47d5c63b6f0301a874ed2132fdad3e64be11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ec47d5c63b6f0301a874ed2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 29 15:55:27 2009 +0200 msi/tests: Remove trailing '\'. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index df768ec..4af37aa 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -369,8 +369,8 @@ static int strcmp_ww(const WCHAR* str1, const WCHAR* str2) { CHAR str1A[MAX_PATH], str2A[MAX_PATH]; - WideCharToMultiByte(CP_ACP, 0, str1, -1, str1A, MAX_PATH, NULL, NULL); \ - WideCharToMultiByte(CP_ACP, 0, str2, -1, str2A, MAX_PATH, NULL, NULL); \ + WideCharToMultiByte(CP_ACP, 0, str1, -1, str1A, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, str2, -1, str2A, MAX_PATH, NULL, NULL); return lstrcmpA(str1A, str2A); }

1 0

Michael Stefaniuc : windowscodecs: Remove trailing '\'.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 22e2c111c1236def0bca3f572d26e07eda36f8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e2c111c1236def0bca3f572… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 29 15:55:42 2009 +0200 windowscodecs: Remove trailing '\'. --- dlls/windowscodecs/bmpencode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 11c39e8..abe9977 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -342,7 +342,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; pos.QuadPart = 0; - hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL);\ + hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) return hr; hr = IStream_Write(This->stream, &bfh, sizeof(BITMAPFILEHEADER), &byteswritten);

1 0

Michael Stefaniuc : dxdiagn: Remove duplicate include.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 46dcb777dbb255b573a31917f93e15045a002232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46dcb777dbb255b573a31917f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 29 15:55:21 2009 +0200 dxdiagn: Remove duplicate include. --- dlls/dxdiagn/provider.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index fb13033..cb91ed4 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -29,7 +29,6 @@ #include "winver.h" #include "objidl.h" #include "dshow.h" -#include "strmif.h" #include "vfw.h" #include "mmddk.h" #include "ddraw.h"

1 0

Ge van Geldorp : comctl32/tests: Fix toolbar test on comctl32 version 4.72.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 6eb6e31e0558ab43062be13158e38db877f216bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb6e31e0558ab43062be1315… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 28 12:40:46 2009 +0200 comctl32/tests: Fix toolbar test on comctl32 version 4.72. --- dlls/comctl32/tests/toolbar.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 86e9027..d0a444e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -740,6 +740,22 @@ static tbsize_result_t tbsize_results[] = static int tbsize_numtests = 0; +typedef struct +{ + int test_num; + int rect_index; + RECT rcButton; +} tbsize_alt_result_t; + +static tbsize_alt_result_t tbsize_alt_results[] = +{ + { 5, 2, { 0, 24, 8, 29 } }, + { 20, 1, { 100, 2, 107, 102 } }, + { 20, 2, { 107, 2, 207, 102 } } +}; + +static int tbsize_alt_numtests = 0; + #define check_sizes_todo(todomask) { \ RECT rc; \ int buttonCount, i, mask=(todomask); \ @@ -751,7 +767,11 @@ static int tbsize_numtests = 0; compare(buttonCount, res->nButtons, "%d"); \ for (i=0; i<min(buttonCount, res->nButtons); i++) { \ ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \ - if (!(mask&1)) { \ + if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \ + memcmp(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton, sizeof(RECT)) == 0)) { \ + win_skip("Alternate rect found\n"); \ + tbsize_alt_numtests++; \ + } else if (!(mask&1)) { \ check_rect("button", rc, res->rcButtons[i]); \ } else {\ todo_wine { check_rect("button", rc, res->rcButtons[i]); } \

1 0

Markus Stockhausen : ddraw: Set dwBackBufferCount= 0 in CreateSurface for backbuffer.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: dbb29993db537a3d2de4f1de3c7c6cfbf65c50bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb29993db537a3d2de4f1de3… Author: Markus Stockhausen <markus.stockhausen(a)collogia.de> Date: Tue Sep 29 15:50:47 2009 +0200 ddraw: Set dwBackBufferCount=0 in CreateSurface for backbuffer. --- dlls/ddraw/ddraw.c | 1 + dlls/ddraw/tests/dsurface.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c21dec1..726ce7b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2492,6 +2492,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, extra_surfaces = DDSD->dwBackBufferCount; desc2.ddsCaps.dwCaps &= ~DDSCAPS_FRONTBUFFER; /* It's not a front buffer */ desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; + desc2.dwBackBufferCount = 0; } hr = DD_OK; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 8e0857e..c0e84be 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1154,9 +1154,9 @@ static void AttachmentTest7(void) HRESULT hr; IDirectDraw7 *dd7; IDirectDrawSurface7 *surface1, *surface2, *surface3, *surface4; - DDSURFACEDESC2 ddsd; + DDSURFACEDESC2 ddsd, ddsd2; UINT num; - DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}; + DDSCAPS2 caps = {DDSCAPS_TEXTURE, 0, 0, 0}, caps2 = {DDSCAPS_BACKBUFFER,0,0,0}; HWND window = CreateWindow( "static", "ddraw_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); @@ -1253,6 +1253,14 @@ static void AttachmentTest7(void) hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface1, NULL); ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); + /* backbuffer surfaces must not have dwBackBufferCount set */ + ddsd2.dwSize = sizeof(ddsd2); + hr = IDirectDrawSurface7_GetAttachedSurface(surface1, &caps2, &surface2); + ok(hr==DD_OK,"GetAttachedSurface returned: %x\n", hr); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface2, &ddsd2); + ok(hr==DD_OK,"GetSurfaceDesc returned: %x\n", hr); + ok(ddsd2.dwBackBufferCount==0,"backbuffer surface has dwBackBufferCount==%u\n", ddsd2.dwBackBufferCount); + num = 0; IDirectDrawSurface7_EnumAttachedSurfaces(surface1, &num, SurfaceCounter); ok(num == 1, "Primary surface has %d surfaces attached, expected 1\n", num);

1 0

Hans Leidekker : msi: Test installing over in-use files.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: c0c6daeb5ab8e2e02c1f9a611f44e72fe9956581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c6daeb5ab8e2e02c1f9a611… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 29 14:57:42 2009 +0200 msi: Test installing over in-use files. --- dlls/msi/tests/install.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 627b81c..6a037ef 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1539,6 +1539,18 @@ static const msi_table ip_tables[] = ADD_TABLE(property) }; +static const msi_table fiu_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -6677,6 +6689,84 @@ static void test_installed_prop(void) delete_test_files(); } +static void test_file_in_use(void) +{ + UINT r; + DWORD size; + HANDLE file; + HKEY hkey; + LONG ret; + char path[MAX_PATH], *buf, *src, *dst; + + static char key[] = "System\\CurrentControlSet\\Control\\Session Manager"; + static char value[] = "PendingFileRenameOperations"; + + RegOpenKeyExA(HKEY_LOCAL_MACHINE, key, 0, KEY_ALL_ACCESS, &hkey); + if (!RegQueryValueExA(hkey, value, NULL, NULL, NULL, &size)) + { + skip("Pending file rename operations, skipping test\n"); + return; + } + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + create_database(msifile, fiu_tables, sizeof(fiu_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\\msitest"); + CreateDirectoryA(path, NULL); + + lstrcat(path, "\\maximus"); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + + r = MsiInstallProductA(msifile, "REBOOT=ReallySuppress FULL=1"); + todo_wine ok(r == ERROR_SUCCESS_REBOOT_REQUIRED, "Expected ERROR_SUCCESS_REBOOT_REQUIRED got %u\n", r); + ok(!file_matches(path), "Expected file not to match\n"); + CloseHandle(file); + + ret = RegQueryValueExA(hkey, value, NULL, NULL, NULL, &size); + buf = HeapAlloc(GetProcessHeap(), 0, size); + + buf[0] = 0; + ret = RegQueryValueExA(hkey, value, NULL, NULL, (LPBYTE)buf, &size); + todo_wine ok(!ret, "RegQueryValueExA failed %d (%u)\n", ret, GetLastError()); + todo_wine ok(strstr(buf, "msitest\\maximus") != NULL, "Unexpected value \"%s\"\n", buf); + + for (src = buf; *src; src = dst + strlen(dst) + 1) + { + DWORD flags = MOVEFILE_COPY_ALLOWED; + + dst = src + strlen(src) + 1; + if (*dst == '!') + { + flags |= MOVEFILE_REPLACE_EXISTING; + dst++; + } + src += strlen("\\??\\"); + if (*dst) + { + dst += strlen("\\??\\"); + ok(MoveFileExA(src, dst, flags), "Failed to move file %s -> %s (%u)\n", src, dst, GetLastError()); + } + else + ok(DeleteFileA(src), "Failed to delete file %s (%u)\n", src, GetLastError()); + } + HeapFree(GetProcessHeap(), 0, buf); + RegDeleteValueA(hkey, value); + RegCloseKey(hkey); + + todo_wine ok(file_matches(path), "Expected file to match\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not present\n"); + ok(delete_pf("msitest", FALSE), "Directory not present\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6763,6 +6853,7 @@ START_TEST(install) test_lastusedsource(); test_preselected(); test_installed_prop(); + test_file_in_use(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Don't set the Installed property twice.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 46ac59f988b27de395bbf731f323b986ae2a7802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ac59f988b27de395bbf731f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 29 14:57:06 2009 +0200 msi: Don't set the Installed property twice. --- dlls/msi/msi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ba9d8bf..2a66d60 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -693,9 +693,6 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (szCommandLine) lstrcpyW(commandline,szCommandLine); - if (MsiQueryProductStateW(szProduct) != INSTALLSTATE_UNKNOWN) - lstrcatW(commandline,szInstalled); - if (eInstallState == INSTALLSTATE_ABSENT) lstrcatW(commandline, szRemoveAll);

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2009