November 2007 - Wine-commits

Hans Leidekker : wininet: Correct several ftp server response to error code mappings.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 5270b429fae84afe45316df6d70c03ce07e2a7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5270b429fae84afe45316df6d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Oct 31 22:53:51 2007 +0100 wininet: Correct several ftp server response to error code mappings. --- dlls/wininet/ftp.c | 69 ++++++++++++++++++++-------------------------- dlls/wininet/tests/ftp.c | 16 ++-------- 2 files changed, 34 insertions(+), 51 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index d763043..c045217 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -3437,45 +3437,36 @@ static DWORD FTP_SetResponseError(DWORD dwResponse) switch(dwResponse) { - case 421: /* Service not available - Server may be shutting down. */ - dwCode = ERROR_INTERNET_EXTENDED_ERROR; - break; - - case 425: /* Cannot open data connection. */ - dwCode = ERROR_INTERNET_CANNOT_CONNECT; - break; - - case 426: /* Connection closed, transer aborted. */ - dwCode = ERROR_INTERNET_CONNECTION_ABORTED; - break; - - case 500: /* Syntax error. Command unrecognized. */ - case 501: /* Syntax error. Error in parameters or arguments. */ - dwCode = ERROR_INTERNET_INCORRECT_FORMAT; - break; - - case 530: /* Not logged in. Login incorrect. */ - dwCode = ERROR_INTERNET_LOGIN_FAILURE; - break; - - case 550: /* File action not taken. File not found or no access. */ - dwCode = ERROR_INTERNET_ITEM_NOT_FOUND; - break; - - case 450: /* File action not taken. File may be busy. */ - case 451: /* Action aborted. Server error. */ - case 452: /* Action not taken. Insufficient storage space on server. */ - case 502: /* Command not implemented. */ - case 503: /* Bad sequence of commands. */ - case 504: /* Command not implemented for that parameter. */ - case 532: /* Need account for storing files */ - case 551: /* Requested action aborted. Page type unknown */ - case 552: /* Action aborted. Exceeded storage allocation */ - case 553: /* Action not taken. File name not allowed. */ - - default: - dwCode = ERROR_INTERNET_EXTENDED_ERROR; - break; + case 425: /* Cannot open data connection. */ + dwCode = ERROR_INTERNET_CANNOT_CONNECT; + break; + + case 426: /* Connection closed, transer aborted. */ + dwCode = ERROR_INTERNET_CONNECTION_ABORTED; + break; + + case 530: /* Not logged in. Login incorrect. */ + dwCode = ERROR_INTERNET_LOGIN_FAILURE; + break; + + case 421: /* Service not available - Server may be shutting down. */ + case 450: /* File action not taken. File may be busy. */ + case 451: /* Action aborted. Server error. */ + case 452: /* Action not taken. Insufficient storage space on server. */ + case 500: /* Syntax error. Command unrecognized. */ + case 501: /* Syntax error. Error in parameters or arguments. */ + case 502: /* Command not implemented. */ + case 503: /* Bad sequence of commands. */ + case 504: /* Command not implemented for that parameter. */ + case 532: /* Need account for storing files */ + case 550: /* File action not taken. File not found or no access. */ + case 551: /* Requested action aborted. Page type unknown */ + case 552: /* Action aborted. Exceeded storage allocation */ + case 553: /* Action not taken. File name not allowed. */ + + default: + dwCode = ERROR_INTERNET_EXTENDED_ERROR; + break; } INTERNET_SetLastError(dwCode); diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 7bbaf02..fa13fdc 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -125,7 +125,6 @@ static void test_createdir(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); @@ -165,7 +164,6 @@ static void test_deletefile(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); @@ -256,14 +254,13 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_also_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine - { ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ + todo_wine ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); - } + DeleteFileA("should_also_be_non_existing_deadbeef"); /* Same call as the previous but now the local file does exists. Windows just removes the file if the call fails @@ -278,14 +275,13 @@ static void test_getfile(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_also_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine - { ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ + todo_wine ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); - } + DeleteFileA("should_also_be_non_existing_deadbeef"); /* This one should succeed */ @@ -537,7 +533,6 @@ static void test_putfile(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpPutFileA(hFtp, "now_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); @@ -587,7 +582,6 @@ static void test_removedir(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(hFtp, "should_be_non_existing_deadbeef_dir"); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); @@ -595,7 +589,6 @@ static void test_removedir(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(hFtp, "pub"); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError()); @@ -642,7 +635,6 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) SetLastError(0xdeadbeef); bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", "new"); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INTERNET_EXTENDED_ERROR, "Expected ERROR_INTERNET_EXTENDED_ERROR, got %d\n", GetLastError());

1 0

Hans Leidekker : wininet: Implement and test FtpCommand{A, W}.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 9e934ee17889a01242f1bbd5437b59158c2a8adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e934ee17889a01242f1bbd54… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Oct 31 22:54:03 2007 +0100 wininet: Implement and test FtpCommand{A, W}. --- dlls/wininet/ftp.c | 107 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wininet/tests/ftp.c | 42 +++++++++++++++++- 2 files changed, 143 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index c045217..8c0cc5d 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -4,6 +4,7 @@ * Copyright 1999 Corel Corporation * Copyright 2004 Mike McCormack for CodeWeavers * Copyright 2004 Kevin Koltzau + * Copyright 2007 Hans Leidekker * * Ulrich Czekalla * Noureddine Jemmali @@ -1863,10 +1864,34 @@ lend: BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags, LPCSTR lpszCommand, DWORD_PTR dwContext, HINTERNET* phFtpCommand ) { - FIXME("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, + BOOL r; + WCHAR *cmdW; + + TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, debugstr_a(lpszCommand), dwContext, phFtpCommand); - return TRUE; + if (fExpectResponse) + { + FIXME("data connection not supported\n"); + return FALSE; + } + + if (!lpszCommand || !lpszCommand[0]) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(cmdW = WININET_strdup_AtoW(lpszCommand))) + { + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + r = FtpCommandW(hConnect, fExpectResponse, dwFlags, cmdW, dwContext, phFtpCommand); + + HeapFree(GetProcessHeap(), 0, cmdW); + return r; } /*********************************************************************** @@ -1875,10 +1900,82 @@ BOOL WINAPI FtpCommandA( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags, LPCWSTR lpszCommand, DWORD_PTR dwContext, HINTERNET* phFtpCommand ) { - FIXME("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, - debugstr_w(lpszCommand), dwContext, phFtpCommand); + BOOL r = FALSE; + LPWININETFTPSESSIONW lpwfs; + LPSTR cmd = NULL; + DWORD len, nBytesSent= 0; + INT nResCode, nRC = 0; - return TRUE; + TRACE("%p %d 0x%08x %s 0x%08lx %p\n", hConnect, fExpectResponse, dwFlags, + debugstr_w(lpszCommand), dwContext, phFtpCommand); + + if (!lpszCommand || !lpszCommand[0]) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (fExpectResponse) + { + FIXME("data connection not supported\n"); + return FALSE; + } + + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hConnect ); + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) + { + INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + goto lend; + } + + if (lpwfs->download_in_progress != NULL) + { + INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); + goto lend; + } + + len = WideCharToMultiByte(CP_ACP, 0, lpszCommand, -1, NULL, 0, NULL, NULL) + strlen(szCRLF); + if ((cmd = HeapAlloc(GetProcessHeap(), 0, len ))) + WideCharToMultiByte(CP_ACP, 0, lpszCommand, -1, cmd, len, NULL, NULL); + else + { + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + goto lend; + } + + strcat(cmd, szCRLF); + len--; + + TRACE("Sending (%s) len(%d)\n", cmd, len); + while ((nBytesSent < len) && (nRC != -1)) + { + nRC = send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); + if (nRC != -1) + { + nBytesSent += nRC; + TRACE("Sent %d bytes\n", nRC); + } + } + + if (nBytesSent) + { + nResCode = FTP_ReceiveResponse(lpwfs, lpwfs->hdr.dwContext); + if (nResCode > 0 && nResCode < 400) + r = TRUE; + else + FTP_SetResponseError(nResCode); + } + +lend: + WININET_Release( &lpwfs->hdr ); + HeapFree(GetProcessHeap(), 0, cmd); + return r; } /*********************************************************************** diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index fa13fdc..6d03fb8 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -25,7 +25,6 @@ * TODO: * Add W-function tests. * Add missing function tests: - * FtpCommand * FtpFindFirstFile * FtpGetCurrentDirectory * FtpGetFileSize @@ -652,6 +651,46 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } +static void test_command(HINTERNET hFtp, HINTERNET hConnect) +{ + BOOL ret; + DWORD error; + unsigned int i; + static const struct + { + BOOL ret; + DWORD error; + const char *cmd; + } + command_test[] = + { + { FALSE, ERROR_INVALID_PARAMETER, NULL }, + { FALSE, ERROR_INVALID_PARAMETER, "" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "HELO" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " SIZE" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg /welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg " }, + { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, + { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, + { TRUE, ERROR_SUCCESS, "PWD" }, + { TRUE, ERROR_SUCCESS, "PWD\r\n" } + }; + + for (i = 0; i < sizeof(command_test) / sizeof(command_test[0]); i++) + { + SetLastError(0xdeadbeef); + ret = FtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, command_test[i].cmd, 0, NULL); + error = GetLastError(); + + ok(ret == command_test[i].ret, "%d: expected FtpCommandA to %s\n", i, command_test[i].ret ? "succeed" : "fail"); + ok(error == command_test[i].error, "%d: expected error %u, got %u\n", i, command_test[i].error, error); + } +} + START_TEST(ftp) { HANDLE hInternet, hFtp, hHttp; @@ -693,6 +732,7 @@ START_TEST(ftp) test_putfile(hFtp, hHttp); test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); + test_command(hFtp, hHttp); InternetCloseHandle(hHttp); InternetCloseHandle(hFtp);

1 0

Stefan Dösinger : wined3d: Move texture -> drawable blits to LoadLocation.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 948292dbc3930a95252fb5e03321f94a1f475db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948292dbc3930a95252fb5e03… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:38:50 2007 +0100 wined3d: Move texture -> drawable blits to LoadLocation. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/drawprim.c | 125 +--------------------------------------- dlls/wined3d/surface.c | 121 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 - 4 files changed, 119 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=948292dbc3930a95252fb…

1 0

Stefan Dösinger : wined3d: Move memory allocation into a separate function.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 64929cfb33261682e97e19c8b29807a62f284898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64929cfb33261682e97e19c8b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:31:01 2007 +0100 wined3d: Move memory allocation into a separate function. --- dlls/wined3d/surface.c | 93 +++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 50b5258..36f3002 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -37,7 +37,6 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); static void surface_download_data(IWineD3DSurfaceImpl *This) { - if (!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), 0, This->resource.size + 4); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { @@ -630,42 +629,23 @@ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, v } } -static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; - IWineD3DSwapChain *swapchain = NULL; - - TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); - - if (This->Flags & SFLAG_LOCKED) { - WARN("Surface is already locked, returning D3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; - } - if (!(This->Flags & SFLAG_LOCKABLE)) { - /* Note: UpdateTextures calls CopyRects which calls this routine to populate the - texture regions, and since the destination is an unlockable region we need - to tolerate this */ - TRACE("Warning: trying to lock unlockable surf@%p\n", This); - /*return WINED3DERR_INVALIDCALL; */ - } - - pLockedRect->Pitch = IWineD3DSurface_GetPitch(iface); - - /* Mark the surface locked */ - This->Flags |= SFLAG_LOCKED; - - /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, - * or a pbo to map +static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { + /* Performance optimization: Count how often a surface is locked, if it is locked regularly do not throw away the system memory copy. + * This avoids the need to download the surface from opengl all the time. The surface is still downloaded if the opengl texture is + * changed */ - if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); - if(This->Flags & SFLAG_INSYSMEM) { - ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); + if(!(This->Flags & SFLAG_DYNLOCK)) { + This->lockCount++; + /* MAXLOCKCOUNT is defined in wined3d_private.h */ + if(This->lockCount > MAXLOCKCOUNT) { + TRACE("Surface is locked regularly, not freeing the system memory copy any more\n"); + This->Flags |= SFLAG_DYNLOCK; } } /* Create a PBO for dynamically locked surfaces but don't do it for converted or non-pow2 surfaces. - * Also don't create a PBO for systemmem surfaces. */ + * Also don't create a PBO for systemmem surfaces. + */ if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) && (This->resource.pool != WINED3DPOOL_SYSTEMMEM)) { GLenum error; ENTER_GL(); @@ -692,8 +672,41 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->resource.allocatedMemory = NULL; This->Flags |= SFLAG_PBO; LEAVE_GL(); + } else if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { + /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, + * or a pbo to map + */ + This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); + if(This->Flags & SFLAG_INSYSMEM) { + ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); + } + } +} + +static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; + IWineD3DSwapChain *swapchain = NULL; + + TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); + + if (This->Flags & SFLAG_LOCKED) { + WARN("Surface is already locked, returning D3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; + } + if (!(This->Flags & SFLAG_LOCKABLE)) { + /* Note: UpdateTextures calls CopyRects which calls this routine to populate the + texture regions, and since the destination is an unlockable region we need + to tolerate this */ + TRACE("Warning: trying to lock unlockable surf@%p\n", This); + /*return WINED3DERR_INVALIDCALL; */ } + pLockedRect->Pitch = IWineD3DSurface_GetPitch(iface); + + /* Mark the surface locked */ + This->Flags |= SFLAG_LOCKED; + /* Calculate the correct start address to report */ if (NULL == pRect) { This->lockedRect.left = 0; @@ -713,19 +726,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED TRACE("Locking non-power 2 texture\n"); } - /* Performance optimization: Count how often a surface is locked, if it is locked regularly do not throw away the system memory copy. - * This avoids the need to download the surface from opengl all the time. The surface is still downloaded if the opengl texture is - * changed - */ - if(!(This->Flags & SFLAG_DYNLOCK)) { - This->lockCount++; - /* MAXLOCKCOUNT is defined in wined3d_private.h */ - if(This->lockCount > MAXLOCKCOUNT) { - TRACE("Surface is locked regularly, not freeing the system memory copy any more\n"); - This->Flags |= SFLAG_DYNLOCK; - } - } - if (Flags & WINED3DLOCK_DISCARD) { /* Set SFLAG_INSYSMEM, so we'll never try to download the data from the texture. */ TRACE("WINED3DLOCK_DISCARD flag passed, marking local copy as up to date\n"); @@ -734,6 +734,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED if (This->Flags & SFLAG_INSYSMEM) { TRACE("Local copy is up to date, not downloading data\n"); + surface_prepare_system_memory(This); /* Makes sure memory is allocated */ goto lock_end; } @@ -3516,6 +3517,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D myDevice = This->resource.wineD3DDevice; if(flag == SFLAG_INSYSMEM) { + surface_prepare_system_memory(This); + /* Download the surface to system memory */ if(This->Flags & SFLAG_INTEXTURE) { if (0 == This->glDescription.textureName) {

1 0

Alexandre Julliard : user32: SetParent should not make the window topmost.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 86c8860d62ee7731526d1d488b0228c3f0193074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c8860d62ee7731526d1d488… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 18:00:53 2007 +0100 user32: SetParent should not make the window topmost. --- dlls/user32/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c70b0ca..f6f0512 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2599,7 +2599,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) in the x-order and send the expected WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED notification messages. */ - SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, + SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | (was_visible ? SWP_SHOWWINDOW : 0) ); /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler * for WM_WINDOWPOSCHANGED) in Windows, should probably remove SWP_NOMOVE */

1 0

Alexandre Julliard : server: Also return the new extended style in the set_window_pos request.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 917f288f1bb8b51f5a0f2722494fb8f2f2e75983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=917f288f1bb8b51f5a0f27224… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 17:51:05 2007 +0100 server: Also return the new extended style in the set_window_pos request. --- dlls/winex11.drv/winpos.c | 5 ++++- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/trace.c | 3 ++- server/window.c | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index da08bd4..9de341b 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -240,7 +240,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, struct x11drv_win_data *data; RECT new_whole_rect, old_client_rect; WND *win; - DWORD old_style, new_style; + DWORD old_style, new_style, new_ex_style; BOOL ret, make_managed = FALSE; if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; @@ -293,6 +293,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, } ret = !wine_server_call( req ); new_style = reply->new_style; + new_ex_style = reply->new_ex_style; } SERVER_END_REQ; @@ -304,6 +305,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, win->rectWindow = *rectWindow; win->rectClient = *rectClient; win->dwStyle = new_style; + win->dwExStyle = new_ex_style; WIN_ReleasePtr( win ); } return ret; @@ -325,6 +327,7 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, win->rectClient = *rectClient; old_style = win->dwStyle; win->dwStyle = new_style; + win->dwExStyle = new_ex_style; data->window_rect = *rectWindow; TRACE( "win %p window %s client %s style %08x\n", diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e669953..606e814 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2946,6 +2946,7 @@ struct set_window_pos_reply { struct reply_header __header; unsigned int new_style; + unsigned int new_ex_style; }; @@ -4879,6 +4880,6 @@ union generic_reply struct set_completion_info_reply set_completion_info_reply; }; -#define SERVER_PROTOCOL_VERSION 323 +#define SERVER_PROTOCOL_VERSION 324 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 5d8acde..c91e8db 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2171,6 +2171,7 @@ enum message_type VARARG(valid,rectangles); /* valid rectangles from WM_NCCALCSIZE */ @REPLY unsigned int new_style; /* new window style */ + unsigned int new_ex_style; /* new window extended style */ @END diff --git a/server/trace.c b/server/trace.c index 72f9ddb..e63cad9 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2691,7 +2691,8 @@ static void dump_set_window_pos_request( const struct set_window_pos_request *re static void dump_set_window_pos_reply( const struct set_window_pos_reply *req ) { - fprintf( stderr, " new_style=%08x", req->new_style ); + fprintf( stderr, " new_style=%08x,", req->new_style ); + fprintf( stderr, " new_ex_style=%08x", req->new_ex_style ); } static void dump_get_window_rectangles_request( const struct get_window_rectangles_request *req ) diff --git a/server/window.c b/server/window.c index ce5297c..1e81cbf 100644 --- a/server/window.c +++ b/server/window.c @@ -1822,6 +1822,7 @@ DECL_HANDLER(set_window_pos) if (!visible_rect) visible_rect = &req->window; set_window_pos( win, previous, flags, &req->window, &req->client, visible_rect, valid_rects ); reply->new_style = win->style; + reply->new_ex_style = win->ex_style; }

1 0

Alexandre Julliard : user32: Don' t allow changing the WS_EX_TOPMOST style with SetWindowLong.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: ebc686495362525784ab26be67ae412379556439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc686495362525784ab26be6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 17:53:58 2007 +0100 user32: Don't allow changing the WS_EX_TOPMOST style with SetWindowLong. --- dlls/user32/tests/win.c | 9 +++------ dlls/user32/win.c | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 548f13c..49fe766 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -993,12 +993,9 @@ static void test_shell_window(void) /* passes on Win XP, but not on Win98 ok(!ret, "third call to SetShellWindow(hwnd1)\n"); */ - todo_wine - { - SetWindowLong(hwnd1, GWL_EXSTYLE, GetWindowLong(hwnd1,GWL_EXSTYLE)|WS_EX_TOPMOST); - ret = GetWindowLong(hwnd1,GWL_EXSTYLE)&WS_EX_TOPMOST? TRUE: FALSE; - ok(!ret, "SetWindowExStyle(hwnd1, WS_EX_TOPMOST)\n"); - } + SetWindowLong(hwnd1, GWL_EXSTYLE, GetWindowLong(hwnd1,GWL_EXSTYLE)|WS_EX_TOPMOST); + ret = GetWindowLong(hwnd1,GWL_EXSTYLE)&WS_EX_TOPMOST? TRUE: FALSE; + ok(!ret, "SetWindowExStyle(hwnd1, WS_EX_TOPMOST)\n"); ret = DestroyWindow(hwnd1); ok(ret, "DestroyWindow(hwnd1)\n"); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3c077c9..c70b0ca 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1945,6 +1945,8 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B break; case GWL_EXSTYLE: req->flags = SET_WIN_EXSTYLE; + /* WS_EX_TOPMOST can only be changed through SetWindowPos */ + newval = (newval & ~WS_EX_TOPMOST) | (wndPtr->dwExStyle & WS_EX_TOPMOST); req->ex_style = newval; break; case GWLP_ID:

1 0