February 2015 - Wine-commits

Piotr Caban : user32/tests: Add tests for window clipping with CS_PARENTDC flag.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 3d6de8c8a2b105909d77a35c04c5b5dd15401a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6de8c8a2b105909d77a35c0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 13 11:38:15 2015 +0100 user32/tests: Add tests for window clipping with CS_PARENTDC flag. --- dlls/user32/tests/dce.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index dc78caf..4ce8d5d 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -33,7 +33,7 @@ #define DCX_USESTYLE 0x00010000 #endif -static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2; +static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2, hwnd_parent, hwnd_parentdc; /* test behavior of DC attributes with various GetDC/ReleaseDC combinations */ static void test_dc_attributes(void) @@ -190,7 +190,7 @@ static void test_dc_visrgn(void) { HDC old_hdc, hdc; HRGN hrgn, hrgn2; - RECT rect; + RECT rect, parent_rect; /* cache DC */ @@ -325,6 +325,20 @@ static void test_dc_visrgn(void) ok( !(rect.left >= 20 && rect.top >= 20 && rect.right <= 30 && rect.bottom <= 30), "clip box must have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); ReleaseDC( hwnd_classdc2, hdc ); + + /* parent DC */ + hdc = GetDC( hwnd_parentdc ); + GetClipBox( hdc, &rect ); + ReleaseDC( hwnd_parentdc, hdc ); + + hdc = GetDC( hwnd_parent ); + GetClipBox( hdc, &parent_rect ); + ReleaseDC( hwnd_parent, hdc ); + + ok( rect.left == parent_rect.left, "rect.left = %d, expected %d\n", rect.left, parent_rect.left ); + ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); + ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); + ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); } @@ -332,7 +346,7 @@ static void test_dc_visrgn(void) static void test_begin_paint(void) { HDC old_hdc, hdc; - RECT rect; + RECT rect, parent_rect; PAINTSTRUCT ps; /* cache DC */ @@ -405,6 +419,21 @@ static void test_begin_paint(void) GetClipBox( hdc, &rect ); ok( !(rect.left >= 10 && rect.top >= 10 && rect.right <= 20 && rect.bottom <= 20), "clip box should have been reset %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ReleaseDC( hwnd_classdc2, hdc ); + EndPaint( hwnd_classdc, &ps ); + + /* parent DC */ + RedrawWindow( hwnd_parent, NULL, 0, RDW_VALIDATE|RDW_NOFRAME|RDW_NOERASE ); + RedrawWindow( hwnd_parentdc, NULL, 0, RDW_INVALIDATE ); + hdc = BeginPaint( hwnd_parentdc, &ps ); + GetClipBox( hdc, &rect ); + EndPaint( hwnd_parentdc, &ps ); + GetClientRect( hwnd_parent, &parent_rect ); + + ok( rect.left == parent_rect.left, "rect.left = %d, expected %d\n", rect.left, parent_rect.left ); + ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); + todo_wine ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); + todo_wine ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); } /* test ScrollWindow with window DCs */ @@ -593,6 +622,9 @@ START_TEST(dce) cls.style = CS_DBLCLKS | CS_CLASSDC; cls.lpszClassName = "classdc_class"; RegisterClassA(&cls); + cls.style = CS_PARENTDC; + cls.lpszClassName = "parentdc_class"; + RegisterClassA(&cls); hwnd_cache = CreateWindowA("cache_class", NULL, WS_OVERLAPPED | WS_VISIBLE, 0, 0, 100, 100, @@ -606,6 +638,11 @@ START_TEST(dce) hwnd_classdc2 = CreateWindowA("classdc_class", NULL, WS_OVERLAPPED | WS_VISIBLE, 200, 200, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + hwnd_parent = CreateWindowA("static", NULL, WS_OVERLAPPED | WS_VISIBLE, + 400, 0, 100, 100, 0, 0, 0, NULL ); + hwnd_parentdc = CreateWindowA("parentdc_class", NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 1, 1, hwnd_parent, 0, 0, NULL ); + test_dc_attributes(); test_parameters(); test_dc_visrgn(); @@ -614,6 +651,7 @@ START_TEST(dce) test_invisible_create(); test_dc_layout(); + DestroyWindow(hwnd_parent); DestroyWindow(hwnd_classdc2); DestroyWindow(hwnd_classdc); DestroyWindow(hwnd_owndc);

1 0

Piotr Caban : user32/tests: Test that CS_PARENTDC enables child window to draw over whole parent window.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 33803586edcd79ef9d5f9d2fd48d0cebe3c5996e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33803586edcd79ef9d5f9d2fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 13 11:38:24 2015 +0100 user32/tests: Test that CS_PARENTDC enables child window to draw over whole parent window. --- dlls/user32/tests/dce.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 4ce8d5d..dfd58a5 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -348,6 +348,7 @@ static void test_begin_paint(void) HDC old_hdc, hdc; RECT rect, parent_rect; PAINTSTRUCT ps; + COLORREF cr; /* cache DC */ @@ -427,6 +428,8 @@ static void test_begin_paint(void) RedrawWindow( hwnd_parentdc, NULL, 0, RDW_INVALIDATE ); hdc = BeginPaint( hwnd_parentdc, &ps ); GetClipBox( hdc, &rect ); + cr = SetPixel( hdc, 10, 10, RGB(255, 0, 0) ); + ok( cr != -1, "error drawing outside of window client area\n" ); EndPaint( hwnd_parentdc, &ps ); GetClientRect( hwnd_parent, &parent_rect ); @@ -434,6 +437,10 @@ static void test_begin_paint(void) ok( rect.top == parent_rect.top, "rect.top = %d, expected %d\n", rect.top, parent_rect.top ); todo_wine ok( rect.right == parent_rect.right, "rect.right = %d, expected %d\n", rect.right, parent_rect.right ); todo_wine ok( rect.bottom == parent_rect.bottom, "rect.bottom = %d, expected %d\n", rect.bottom, parent_rect.bottom ); + + hdc = GetDC( hwnd_parent ); + todo_wine ok( GetPixel( hdc, 10, 10 ) == cr, "error drawing outside of window client area\n" ); + ReleaseDC( hwnd_parent, hdc ); } /* test ScrollWindow with window DCs */

1 0

Jacek Caban : wininet: Removed direct errno usage in ftp.c.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: fdf50ba8832d2bce7bde914e5b3395b010fe33e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdf50ba8832d2bce7bde914e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 12:11:04 2015 +0100 wininet: Removed direct errno usage in ftp.c. --- dlls/wininet/ftp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 7f349d3..855e5a8 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -34,7 +34,6 @@ #include <ws2tcpip.h> #endif -#include <errno.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -2586,7 +2585,7 @@ HINTERNET FTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, if (connect(nsocket, (struct sockaddr *)&socketAddr, sock_namelen) < 0) { - ERR("Unable to connect (%s)\n", strerror(errno)); + ERR("Unable to connect (%d)\n", sock_get_error()); INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); closesocket(nsocket); }

1 0

Jacek Caban : wininet: Moved INTERNET_GetNextLine to ftp.c.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 7410bf5896b9787bb3c3f86a577284d274d83eb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7410bf5896b9787bb3c3f86a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 12:11:27 2015 +0100 wininet: Moved INTERNET_GetNextLine to ftp.c. --- dlls/wininet/ftp.c | 63 ++++++++++++++++++++++++++++++++++++++++++-- dlls/wininet/internet.c | 70 ------------------------------------------------- dlls/wininet/internet.h | 1 - 3 files changed, 61 insertions(+), 73 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 855e5a8..082eb58 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -51,6 +51,12 @@ #ifdef HAVE_SYS_IOCTL_H # include <sys/ioctl.h> #endif +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #include <time.h> #include <assert.h> @@ -70,6 +76,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); +#define RESPONSE_TIMEOUT 30 + typedef struct _ftp_session_t ftp_session_t; typedef struct @@ -2660,6 +2668,57 @@ lend: return bSuccess; } +/*********************************************************************** + * FTP_GetNextLine (internal) + * + * Parse next line in directory string listing + * + * RETURNS + * Pointer to beginning of next line + * NULL on failure + * + */ + +static LPSTR FTP_GetNextLine(INT nSocket, LPDWORD dwLen) +{ + struct pollfd pfd; + INT nRecv = 0; + LPSTR lpszBuffer = INTERNET_GetResponseBuffer(); + + TRACE("\n"); + + pfd.fd = nSocket; + pfd.events = POLLIN; + + while (nRecv < MAX_REPLY_LEN) + { + if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) + { + if (sock_recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + return NULL; + } + + if (lpszBuffer[nRecv] == '\n') + { + lpszBuffer[nRecv] = '\0'; + *dwLen = nRecv - 1; + TRACE(":%d %s\n", nRecv, lpszBuffer); + return lpszBuffer; + } + if (lpszBuffer[nRecv] != '\r') + nRecv++; + } + else + { + INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT); + return NULL; + } + } + + return NULL; +} /*********************************************************************** * FTP_SendCommandA (internal) @@ -2759,7 +2818,7 @@ INT FTP_ReceiveResponse(ftp_session_t *lpwfs, DWORD_PTR dwContext) while(1) { - if (!INTERNET_GetNextLine(lpwfs->sndSocket, &nRecv)) + if (!FTP_GetNextLine(lpwfs->sndSocket, &nRecv)) goto lerror; if (nRecv >= 3) @@ -3619,7 +3678,7 @@ static BOOL FTP_ParseNextFile(INT nSocket, LPCWSTR lpszSearchFile, LPFILEPROPERT lpfp->lpszName = NULL; do { - if(!(pszLine = INTERNET_GetNextLine(nSocket, &nBufLen))) + if(!(pszLine = FTP_GetNextLine(nSocket, &nBufLen))) return FALSE; pszToken = strtok(pszLine, szSpace); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index aa9c259..c915513 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -40,12 +40,6 @@ #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> #endif -#ifdef HAVE_POLL_H -#include <poll.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif @@ -85,8 +79,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); -#define RESPONSE_TIMEOUT 30 - typedef struct { DWORD dwError; @@ -3918,68 +3910,6 @@ LPSTR INTERNET_GetResponseBuffer(void) return lpwite->response; } -/*********************************************************************** - * INTERNET_GetNextLine (internal) - * - * Parse next line in directory string listing - * - * RETURNS - * Pointer to beginning of next line - * NULL on failure - * - */ - -LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) -{ - struct pollfd pfd; - BOOL bSuccess = FALSE; - INT nRecv = 0; - LPSTR lpszBuffer = INTERNET_GetResponseBuffer(); - - TRACE("\n"); - - pfd.fd = nSocket; - pfd.events = POLLIN; - - while (nRecv < MAX_REPLY_LEN) - { - if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) - { - if (sock_recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) - { - INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); - goto lend; - } - - if (lpszBuffer[nRecv] == '\n') - { - bSuccess = TRUE; - break; - } - if (lpszBuffer[nRecv] != '\r') - nRecv++; - } - else - { - INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT); - goto lend; - } - } - -lend: - if (bSuccess) - { - lpszBuffer[nRecv] = '\0'; - *dwLen = nRecv - 1; - TRACE(":%d %s\n", nRecv, lpszBuffer); - return lpszBuffer; - } - else - { - return NULL; - } -} - /********************************************************** * InternetQueryDataAvailable (WININET.@) * diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 23f4a41..f0b09c8 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -430,7 +430,6 @@ void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN; DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN; DWORD INTERNET_AsyncCall(task_header_t*) DECLSPEC_HIDDEN; LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN; -LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) DECLSPEC_HIDDEN; VOID SendAsyncCallback(object_header_t *hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo,

1 0

Jacek Caban : wininet: Use set_socket_blocking helper in a few more places.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 5d6d2fda7b32d37a1187a57a7d90f70b8b6475cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6d2fda7b32d37a1187a57a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 12:11:39 2015 +0100 wininet: Use set_socket_blocking helper in a few more places. --- dlls/wininet/netconnection.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index a7cbf6a..cf567ae 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -346,6 +346,14 @@ void init_winsock(void) #endif } +static void set_socket_blocking(int socket, blocking_mode_t mode) +{ +#ifdef USE_WINSOCK + ULONG arg = mode == BLOCKING_DISALLOW; + ioctlsocket(socket, FIONBIO, &arg); +#endif +} + static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD timeout) { int result; @@ -357,8 +365,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t assert(server->addr_len); result = netconn->socket = socket(server->addr.ss_family, SOCK_STREAM, 0); if(result != -1) { - flag = 1; - ioctlsocket(netconn->socket, FIONBIO, &flag); + set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); result = connect(netconn->socket, (struct sockaddr*)&server->addr, server->addr_len); if(result == -1) { @@ -391,8 +398,7 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t netconn->socket = -1; } else { - flag = 0; - ioctlsocket(netconn->socket, FIONBIO, &flag); + set_socket_blocking(netconn->socket, BLOCKING_ALLOW); } } if(result == -1) @@ -573,14 +579,6 @@ int sock_recv(int fd, void *msg, size_t len, int flags) return ret; } -static void set_socket_blocking(int socket, blocking_mode_t mode) -{ -#ifdef USE_WINSOCK - ULONG arg = mode == BLOCKING_DISALLOW; - ioctlsocket(socket, FIONBIO, &arg); -#endif -} - static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; @@ -1079,19 +1077,12 @@ BOOL NETCON_is_alive(netconn_t *netconn) len = sock_recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK); #elif defined(USE_WINSOCK) - ULONG mode; int len; char b; - mode = 1; - if(ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - + set_socket_blocking(netconn->socket, BLOCKING_DISALLOW); len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); - - mode = 0; - if(ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; + set_socket_blocking(netconn->socket, BLOCKING_ALLOW); return len == 1 || (len == -1 && sock_get_error() == WSAEWOULDBLOCK); #else

1 0

Jacek Caban : wininet: Always use winsock sockets.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 5436fef80722fe7896aed5e659c31fdade4ef5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5436fef80722fe7896aed5e65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 13 12:12:29 2015 +0100 wininet: Always use winsock sockets. --- dlls/wininet/Makefile.in | 4 +- dlls/wininet/cookie.c | 10 +-- dlls/wininet/dialogs.c | 7 +- dlls/wininet/ftp.c | 61 ++++---------- dlls/wininet/http.c | 22 ++--- dlls/wininet/internet.c | 18 +--- dlls/wininet/internet.h | 23 ------ dlls/wininet/netconnection.c | 193 ++++--------------------------------------- dlls/wininet/urlcache.c | 11 +-- dlls/wininet/utility.c | 60 ++------------ 10 files changed, 49 insertions(+), 360 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5436fef80722fe7896aed…

1 0

Hans Leidekker : msi: Always update column info after applying a transform to the _Columns table.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: c6f3f72d611358b3cf5c8110817f956ca57925b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f3f72d611358b3cf5c81108… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 13 13:37:22 2015 +0100 msi: Always update column info after applying a transform to the _Columns table. --- dlls/msi/table.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 900f9ae..3cd939e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -107,7 +107,7 @@ static inline UINT bytes_per_column( MSIDATABASE *db, const MSICOLUMNINFO *col, return 2; if( (col->type & 0xff) != 4 ) - ERR("Invalid column size!\n"); + ERR("Invalid column size %u\n", col->type & 0xff); return 4; } @@ -951,7 +951,7 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) UINT size, offset, old_count; UINT n; - table = find_cached_table( db, name ); + if (!(table = find_cached_table( db, name ))) return; old_count = table->col_count; msi_free_colinfo( table->colinfo, table->col_count ); msi_free( table->colinfo ); @@ -2574,6 +2574,12 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, */ sz = 2; num_cols = mask >> 8; + if (num_cols > tv->num_cols) + { + ERR("excess columns in transform: %u > %u\n", num_cols, tv->num_cols); + break; + } + for (i = 0; i < num_cols; i++) { if( (tv->columns[i].type & MSITYPE_STRING) && @@ -2631,7 +2637,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, /* * Native msi seems writes nul into the Number (2nd) column of - * the _Columns table, only when the columns are from a new table + * the _Columns table when there are new columns */ if ( number == MSI_NULL_INTEGER ) { @@ -2682,7 +2688,7 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, WARN("failed to insert row %u\n", r); } - if (number != MSI_NULL_INTEGER && !strcmpW( name, szColumns )) + if (!strcmpW( name, szColumns )) msi_update_table_columns( db, table ); msiobj_release( &rec->hdr );

1 0

Hans Leidekker : msi: Get rid of the open streams cache.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: d954fbf8da039e508e3f9516e3ef40d63fd03bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d954fbf8da039e508e3f9516e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 13 13:37:49 2015 +0100 msi: Get rid of the open streams cache. --- dlls/msi/database.c | 150 ++-------------------------------------------------- dlls/msi/media.c | 13 ++--- dlls/msi/msipriv.h | 2 - dlls/msi/streams.c | 4 +- 4 files changed, 11 insertions(+), 158 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index e5ed16e..9749d66 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -59,116 +59,26 @@ typedef struct tagMSITRANSFORM { IStorage *stg; } MSITRANSFORM; -typedef struct tagMSISTREAM { - struct list entry; - IStorage *stg; - IStream *stm; -} MSISTREAM; - -static UINT find_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) -{ - MSISTREAM *stream; - - LIST_FOR_EACH_ENTRY( stream, &db->streams, MSISTREAM, entry ) - { - HRESULT r; - STATSTG stat; - - if (stream->stg != stg) continue; - - r = IStream_Stat( stream->stm, &stat, 0 ); - if( FAILED( r ) ) - { - WARN("failed to stat stream r = %08x!\n", r); - continue; - } - - if( !strcmpW( name, stat.pwcsName ) ) - { - TRACE("found %s\n", debugstr_w(name)); - *stm = stream->stm; - CoTaskMemFree( stat.pwcsName ); - return ERROR_SUCCESS; - } - - CoTaskMemFree( stat.pwcsName ); - } - - return ERROR_FUNCTION_FAILED; -} - -UINT msi_clone_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) -{ - IStream *stream; - - if (find_open_stream( db, stg, name, &stream ) == ERROR_SUCCESS) - { - HRESULT r; - LARGE_INTEGER pos; - - r = IStream_Clone( stream, stm ); - if( FAILED( r ) ) - { - WARN("failed to clone stream r = %08x!\n", r); - return ERROR_FUNCTION_FAILED; - } - - pos.QuadPart = 0; - r = IStream_Seek( *stm, pos, STREAM_SEEK_SET, NULL ); - if( FAILED( r ) ) - { - IStream_Release( *stm ); - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; - } - - return ERROR_FUNCTION_FAILED; -} - UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { HRESULT r; - IStorage *stg; WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; decode_streamname( stname, decoded ); TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); - if (msi_clone_open_stream( db, db->storage, stname, stm ) == ERROR_SUCCESS) - return ERROR_SUCCESS; - - r = IStorage_OpenStream( db->storage, stname, NULL, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); - if( FAILED( r ) ) + r = IStorage_OpenStream( db->storage, stname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); + if (FAILED( r )) { MSITRANSFORM *transform; LIST_FOR_EACH_ENTRY( transform, &db->transforms, MSITRANSFORM, entry ) { - r = IStorage_OpenStream( transform->stg, stname, NULL, - STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); - if (SUCCEEDED(r)) - { - stg = transform->stg; + r = IStorage_OpenStream( transform->stg, stname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); + if (SUCCEEDED( r )) break; - } } } - else stg = db->storage; - - if( SUCCEEDED(r) ) - { - MSISTREAM *stream; - - if (!(stream = msi_alloc( sizeof(MSISTREAM) ))) return ERROR_NOT_ENOUGH_MEMORY; - stream->stg = stg; - IStorage_AddRef( stg ); - stream->stm = *stm; - IStream_AddRef( *stm ); - list_add_tail( &db->streams, &stream->entry ); - } return SUCCEEDED(r) ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; } @@ -177,58 +87,13 @@ static void free_transforms( MSIDATABASE *db ) { while( !list_empty( &db->transforms ) ) { - MSITRANSFORM *t = LIST_ENTRY( list_head( &db->transforms ), - MSITRANSFORM, entry ); + MSITRANSFORM *t = LIST_ENTRY( list_head( &db->transforms ), MSITRANSFORM, entry ); list_remove( &t->entry ); IStorage_Release( t->stg ); msi_free( t ); } } -void msi_destroy_stream( MSIDATABASE *db, const WCHAR *stname ) -{ - MSISTREAM *stream, *stream2; - - LIST_FOR_EACH_ENTRY_SAFE( stream, stream2, &db->streams, MSISTREAM, entry ) - { - HRESULT r; - STATSTG stat; - - r = IStream_Stat( stream->stm, &stat, 0 ); - if (FAILED(r)) - { - WARN("failed to stat stream r = %08x\n", r); - continue; - } - - if (!strcmpW( stname, stat.pwcsName )) - { - TRACE("destroying %s\n", debugstr_w(stname)); - - list_remove( &stream->entry ); - IStream_Release( stream->stm ); - IStorage_Release( stream->stg ); - IStorage_DestroyElement( stream->stg, stname ); - msi_free( stream ); - CoTaskMemFree( stat.pwcsName ); - break; - } - CoTaskMemFree( stat.pwcsName ); - } -} - -static void free_streams( MSIDATABASE *db ) -{ - while( !list_empty( &db->streams ) ) - { - MSISTREAM *s = LIST_ENTRY(list_head( &db->streams ), MSISTREAM, entry); - list_remove( &s->entry ); - IStream_Release( s->stm ); - IStorage_Release( s->stg ); - msi_free( s ); - } -} - void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) { MSITRANSFORM *t; @@ -237,9 +102,6 @@ void append_storage_to_db( MSIDATABASE *db, IStorage *stg ) t->stg = stg; IStorage_AddRef( stg ); list_add_head( &db->transforms, &t->entry ); - - /* the transform may add or replace streams */ - free_streams( db ); } static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) @@ -248,7 +110,6 @@ static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) msi_free(db->path); free_cached_tables( db ); - free_streams( db ); free_transforms( db ); if (db->strings) msi_destroy_stringtable( db->strings ); IStorage_Release( db->storage ); @@ -431,7 +292,6 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) db->deletefile = strdupW( szDBPath ); list_init( &db->tables ); list_init( &db->transforms ); - list_init( &db->streams ); db->strings = msi_load_string_table( stg, &db->bytes_per_strref ); if( !db->strings ) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index c26ac41..3dbd1b7 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -227,15 +227,12 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) WARN("failed to encode stream name\n"); return -1; } - if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) + hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); + if (FAILED(hr)) { - hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); - if (FAILED(hr)) - { - WARN("failed to open stream 0x%08x\n", hr); - msi_free( encoded ); - return -1; - } + WARN("failed to open stream 0x%08x\n", hr); + msi_free( encoded ); + return -1; } msi_free( encoded ); return (INT_PTR)stream; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 88333d3..661535f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -93,7 +93,6 @@ typedef struct tagMSIDATABASE UINT media_transform_disk_id; struct list tables; struct list transforms; - struct list streams; } MSIDATABASE; typedef struct tagMSIVIEW MSIVIEW; @@ -830,7 +829,6 @@ extern BOOL decode_streamname(LPCWSTR in, LPWSTR out) DECLSPEC_HIDDEN; /* database internals */ extern UINT msi_get_raw_stream( MSIDATABASE *, LPCWSTR, IStream ** ) DECLSPEC_HIDDEN; -extern UINT msi_clone_open_stream( MSIDATABASE *, IStorage *, const WCHAR *, IStream ** ) DECLSPEC_HIDDEN; void msi_destroy_stream( MSIDATABASE *, const WCHAR * ) DECLSPEC_HIDDEN; extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ) DECLSPEC_HIDDEN; extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index b91fe88..28a572d 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -181,9 +181,6 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U goto done; } - encname = encode_streamname(FALSE, name); - msi_destroy_stream(sv->db, encname); - r = write_stream_data(sv->db->storage, name, data, count, FALSE); if (r != ERROR_SUCCESS) { @@ -195,6 +192,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U if (!stream) goto done; + encname = encode_streamname(FALSE, name); hr = IStorage_OpenStream(sv->db->storage, encname, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); if (FAILED(hr))

1 0

Hans Leidekker : msi: Get rid of the refcount parameter to msi_addstringW.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: db3346247c192bb94dfdf4fce564db45677c9b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3346247c192bb94dfdf4fce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 13 13:38:14 2015 +0100 msi: Get rid of the refcount parameter to msi_addstringW. --- dlls/msi/msipriv.h | 2 +- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 2 +- dlls/msi/string.c | 22 +++++++++++----------- dlls/msi/table.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 661535f..e4a8235 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -750,7 +750,7 @@ enum StringPersistence StringNonPersistent = 1 }; -extern BOOL msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) DECLSPEC_HIDDEN; +extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) DECLSPEC_HIDDEN; extern UINT msi_string2id( const string_table *st, const WCHAR *data, int len, UINT *id ) DECLSPEC_HIDDEN; extern VOID msi_destroy_stringtable( string_table *st ) DECLSPEC_HIDDEN; extern const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 35c1de5..3ca708c 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -77,7 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) if (!storage) return NULL; - storage->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); + storage->str_index = msi_add_string(sv->db->strings, name, -1, StringNonPersistent); storage->storage = stg; if (storage->storage) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 28a572d..d795c8a 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -83,7 +83,7 @@ static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, ISt name = decoded; } - stream->str_index = msi_addstringW(sv->db->strings, name, -1, 1, StringNonPersistent); + stream->str_index = msi_add_string(sv->db->strings, name, -1, StringNonPersistent); stream->stream = stm; return stream; } diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 8e3e575..f094a53 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -231,7 +231,7 @@ static void set_st_entry( string_table *st, UINT n, WCHAR *str, int len, USHORT st->freeslot = n + 1; } -static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) +static UINT string2id( const string_table *st, const char *buffer, UINT *id ) { DWORD sz; UINT r = ERROR_INVALID_PARAMETER; @@ -258,7 +258,7 @@ static UINT msi_string2idA( const string_table *st, LPCSTR buffer, UINT *id ) return r; } -static int msi_addstring( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) +static int add_string( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) { LPWSTR str; int sz; @@ -273,7 +273,7 @@ static int msi_addstring( string_table *st, UINT n, const char *data, UINT len, } else { - if( ERROR_SUCCESS == msi_string2idA( st, data, &n ) ) + if (string2id( st, data, &n ) == ERROR_SUCCESS) { if (persistence == StringPersistent) st->strings[n].persistent_refcount += refcount; @@ -304,7 +304,7 @@ static int msi_addstring( string_table *st, UINT n, const char *data, UINT len, return n; } -int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcount, enum StringPersistence persistence ) +int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) { UINT n; LPWSTR str; @@ -320,9 +320,9 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun if (msi_string2id( st, data, len, &n) == ERROR_SUCCESS ) { if (persistence == StringPersistent) - st->strings[n].persistent_refcount += refcount; + st->strings[n].persistent_refcount++; else - st->strings[n].nonpersistent_refcount += refcount; + st->strings[n].nonpersistent_refcount++; return n; } @@ -339,7 +339,7 @@ int msi_addstringW( string_table *st, const WCHAR *data, int len, USHORT refcoun memcpy( str, data, len*sizeof(WCHAR) ); str[len] = 0; - set_st_entry( st, n, str, len, refcount, persistence ); + set_st_entry( st, n, str, len, 1, persistence ); return n; } @@ -363,7 +363,7 @@ const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) } /* - * msi_id2stringA + * id2string * * [in] st - pointer to the string table * [in] id - id of the string to retrieve @@ -373,7 +373,7 @@ const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) * * Returned string is not nul terminated. */ -static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) +static UINT id2string( const string_table *st, UINT id, char *buffer, UINT *sz ) { int len, lenW; const WCHAR *str; @@ -546,7 +546,7 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) break; } - r = msi_addstring( st, n, data+offset, len, refs, StringPersistent ); + r = add_string( st, n, data+offset, len, refs, StringPersistent ); if( r != n ) ERR("Failed to add string %d\n", n ); n++; @@ -616,7 +616,7 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *byt } sz = datasize - used; - r = msi_id2stringA( st, i, data+used, &sz ); + r = id2string( st, i, data+used, &sz ); if( r != ERROR_SUCCESS ) { ERR("failed to fetch string\n"); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 3cd939e..53f4b4b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -760,8 +760,8 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, for( i = 0, col = col_info; col; i++, col = col->next ) { - UINT table_id = msi_addstringW( db->strings, col->table, -1, 1, string_persistence ); - UINT col_id = msi_addstringW( db->strings, col->column, -1, 1, string_persistence ); + UINT table_id = msi_add_string( db->strings, col->table, -1, string_persistence ); + UINT col_id = msi_add_string( db->strings, col->column, -1, string_persistence ); table->colinfo[ i ].tablename = msi_string_lookup( db->strings, table_id, NULL ); table->colinfo[ i ].number = i + 1; @@ -1369,8 +1369,8 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI { int len; const WCHAR *sval = msi_record_get_string( rec, i + 1, &len ); - val = msi_addstringW( tv->db->strings, sval, len, 1, - persistent ? StringPersistent : StringNonPersistent ); + val = msi_add_string( tv->db->strings, sval, len, + persistent ? StringPersistent : StringNonPersistent ); } else {

1 0

Hans Leidekker : msi: Don' t write streams to storage until the database is committed.
by Alexandre Julliard 13 Feb '15

13 Feb '15

Module: wine Branch: master Commit: 0dba391d67a4cf564371c44a3a781d1e9e3507c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dba391d67a4cf564371c44a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 13 13:39:38 2015 +0100 msi: Don't write streams to storage until the database is committed. Native allows streams to be created with names that exceed the maximum length allowed by OLE storages. These streams can be used normally, it's just not possible to commit such a database. --- dlls/msi/database.c | 40 ++-- dlls/msi/msipriv.h | 19 +- dlls/msi/msiquery.c | 9 +- dlls/msi/streams.c | 532 ++++++++++++++++++++++++++++++---------------------- dlls/msi/table.c | 18 +- dlls/msi/tests/db.c | 55 +++++- 6 files changed, 404 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dba391d67a4cf564371c…

1 0