wine-commits February 2007

wine-commits@winehq.org

4 participants
839 discussions

Stefan Dösinger : wined3d: Use the context manager to prepare for blitting.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: f22d37e4dd959b268b7e0823be0f1020ffdcaeee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22d37e4dd959b268b7e0823b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:18:41 2007 +0100 wined3d: Use the context manager to prepare for blitting. --- dlls/wined3d/context.c | 159 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/surface.c | 168 +--------------------------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 161 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f22d37e4dd959b268b7e0…

1 0

Stefan Dösinger : wined3d: Use the context manager to prepare for drawing.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: c1623d4e7b95ef5c0a668a4a70e1b31908df182a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1623d4e7b95ef5c0a668a4a7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:18:36 2007 +0100 wined3d: Use the context manager to prepare for drawing. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/context.c | 82 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 18 +-------- dlls/wined3d/wined3d_private.h | 13 +++++- 4 files changed, 96 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 0cdd967..4700483 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ arb_program_shader.c \ baseshader.c \ basetexture.c \ + context.c \ cubetexture.c \ device.c \ directx.c \ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c new file mode 100644 index 0000000..3090538 --- /dev/null +++ b/dlls/wined3d/context.c @@ -0,0 +1,82 @@ +/* + * Context and render target management in wined3d + * + * Copyright 2007 Stefan D�singer for CodeWeavers + * + * 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 "config.h" +#include <stdio.h> +#ifdef HAVE_FLOAT_H +# include <float.h> +#endif +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +/***************************************************************************** + * ActivateContext + * + * Finds a rendering context and drawable matching the device and render + * target for the current thread, activates them and puts them into the + * requested state. + * + * Params: + * This: Device to activate the context for + * target: Requested render target + * usage: Prepares the context for blitting, drawing or other actions + * + *****************************************************************************/ +void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextUsage usage) { + DWORD tid = This->createParms.BehaviorFlags & D3DCREATE_MULTITHREADED ? GetCurrentThreadId() : 0; + int i; + DWORD dirtyState, idx; + BYTE shift; + WineD3DContext *context; + + TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); + /* TODO: Render target selection */ + + /* TODO: Thread selection */ + + /* TODO: Activate the opengl context */ + context = &This->contexts[This->activeContext]; + + switch(usage) { + case CTXUSAGE_RESOURCELOAD: + /* This does not require any special states to be set up */ + break; + + case CTXUSAGE_DRAWPRIM: + /* This needs all dirty states applied */ + for(i=0; i < context->numDirtyEntries; i++) { + dirtyState = context->dirtyArray[i]; + idx = dirtyState >> 5; + shift = dirtyState & 0x1f; + context->isStateDirty[idx] &= ~(1 << shift); + StateTable[dirtyState].apply(dirtyState, This->stateBlock, context); + } + context->numDirtyEntries = 0; /* This makes the whole list clean */ + break; + + case CTXUSAGE_BLIT: + FIXME("Setting up for blitting not supported yet\n"); + break; + + default: + FIXME("Unexpected context usage requested\n"); + } +} diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0d6adf0..dcf6d26 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1178,10 +1178,7 @@ void drawPrimitive(IWineD3DDevice *iface IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSwapChainImpl *swapchain; - int i; - DWORD dirtyState, idx; - BYTE shift; - WineD3DContext *context; + int i; /* Signals other modules that a drawing is in progress and the stateblock finalized */ This->isInDraw = TRUE; @@ -1198,18 +1195,7 @@ void drawPrimitive(IWineD3DDevice *iface /* Ok, we will be updating the screen from here onwards so grab the lock */ ENTER_GL(); - /* TODO: Find the correct context for the render target / thread */ - context = &This->contexts[This->activeContext]; - - /* Apply dirty states */ - for(i=0; i < context->numDirtyEntries; i++) { - dirtyState = context->dirtyArray[i]; - idx = dirtyState >> 5; - shift = dirtyState & 0x1f; - context->isStateDirty[idx] &= ~(1 << shift); - StateTable[dirtyState].apply(dirtyState, This->stateBlock, context); - } - context->numDirtyEntries = 0; /* This makes the whole list clean */ + ActivateContext(This, This->render_targets[0], CTXUSAGE_DRAWPRIM); if (TRACE_ON(d3d_draw) && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { check_fbo_status(iface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76bf29c..ab3e947 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -290,6 +290,7 @@ do { typedef struct IWineD3DStateBlockImpl IWineD3DStateBlockImpl; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; typedef struct IWineD3DPaletteImpl IWineD3DPaletteImpl; +typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; /* Tracking */ @@ -478,6 +479,14 @@ struct WineD3DContext { GLenum tracking_parm; /* Which source is tracking current colour */ }; +typedef enum ContextUsage { + CTXUSAGE_RESOURCELOAD = 1, /* Only loads textures: No State is applied */ + CTXUSAGE_DRAWPRIM = 2, /* OpenGL states are set up for blitting DirectDraw surfacs */ + CTXUSAGE_BLIT = 3, /* OpenGL states are set up 3D drawing */ +} ContextUsage; + +void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); + /* Routine to fill gl caps for swapchains and IWineD3D */ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display); @@ -575,7 +584,7 @@ void dumpResources(ResourceList *resourc /***************************************************************************** * IWineD3DDevice implementation structure */ -typedef struct IWineD3DDeviceImpl +struct IWineD3DDeviceImpl { /* IUnknown fields */ const IWineD3DDeviceVtbl *lpVtbl; @@ -688,7 +697,7 @@ typedef struct IWineD3DDeviceImpl WineD3DContext contexts[1]; /* Dynamic array later */ UINT activeContext; /* Only 0 for now */ UINT numContexts; /* Always 1 for now */ -} IWineD3DDeviceImpl; +}; extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl;

1 0

Stefan Dösinger : wined3d: Store dirty states per context.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 380930dc54337ba2e486e295714edb13c569f3ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=380930dc54337ba2e486e2957… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:18:31 2007 +0100 wined3d: Store dirty states per context. --- dlls/wined3d/device.c | 18 +++++++++--- dlls/wined3d/drawprim.c | 8 +++--- dlls/wined3d/state.c | 53 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 57 ++++++++++++++++++++------------------- 4 files changed, 73 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=380930dc54337ba2e486e…

1 0

Stefan Dösinger : wined3d: Store state optmization members in the context.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: e6c9a073b02101f0ebe818e94e8369388aab98dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c9a073b02101f0ebe818e94… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:18:27 2007 +0100 wined3d: Store state optmization members in the context. --- dlls/wined3d/device.c | 4 +- dlls/wined3d/state.c | 70 ++++++++++++++++++++-------------------- dlls/wined3d/surface.c | 4 +- dlls/wined3d/wined3d_private.h | 25 ++++++-------- 4 files changed, 49 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6c9a073b02101f0ebe81…

1 0

Stefan Dösinger : wined3d: Add a per context structure for context management.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: c739c387b60d02156cb269adad7b419a07489c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c739c387b60d02156cb269ada… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:18:22 2007 +0100 wined3d: Add a per context structure for context management. --- dlls/wined3d/drawprim.c | 6 +- dlls/wined3d/state.c | 192 ++++++++++++++++++++-------------------- dlls/wined3d/surface.c | 8 +- dlls/wined3d/wined3d_private.h | 17 +++- 4 files changed, 119 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c739c387b60d02156cb26…

1 0

Hans Leidekker : wininet: Fix a test that fails on Windows.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 890f63a1d84199e1cae6e7a3d7e43b08db5cc27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=890f63a1d84199e1cae6e7a3d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Feb 12 15:27:36 2007 +0100 wininet: Fix a test that fails on Windows. --- dlls/wininet/tests/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 664447d..d6e9bb4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -549,7 +549,7 @@ static void InternetTimeToSystemTimeW_te ret = InternetTimeToSystemTimeW( string, NULL, 0 ); ok( !ret, "InternetTimeToSystemTimeW succeeded (%u)\n", GetLastError() ); - ret = InternetTimeToSystemTimeW( string, &time, 1 ); + ret = InternetTimeToSystemTimeW( string, &time, 0 ); ok( ret, "InternetTimeToSystemTimeW failed (%u)\n", GetLastError() ); ret = InternetTimeToSystemTimeW( string, &time, 0 );

1 0

Hans Leidekker : wininet: Skip empty accept type strings in HttpOpenRequest .
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 2024f687535edeb0413e0f86ca15877982573762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2024f687535edeb0413e0f86c… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Feb 12 15:19:17 2007 +0100 wininet: Skip empty accept type strings in HttpOpenRequest. --- dlls/wininet/http.c | 15 ++++++++++----- dlls/wininet/tests/http.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8a34749..17e48c9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -803,11 +803,11 @@ HINTERNET WINAPI HttpOpenRequestA(HINTER if (lpszAcceptTypes) { /* find out how many there are */ - while (lpszAcceptTypes[acceptTypesCount]) + while (lpszAcceptTypes[acceptTypesCount] && *lpszAcceptTypes[acceptTypesCount]) acceptTypesCount++; szAcceptTypes = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * (acceptTypesCount+1)); acceptTypesCount = 0; - while (lpszAcceptTypes[acceptTypesCount]) + while (lpszAcceptTypes[acceptTypesCount] && *lpszAcceptTypes[acceptTypesCount]) { len = MultiByteToWideChar(CP_ACP, 0, lpszAcceptTypes[acceptTypesCount], -1, NULL, 0 ); @@ -1111,12 +1111,17 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L if (NULL != lpszReferrer && strlenW(lpszReferrer)) HTTP_ProcessHeader(lpwhr, HTTP_REFERER, lpszReferrer, HTTP_ADDHDR_FLAG_COALESCE); - if(lpszAcceptTypes!=NULL) + if (lpszAcceptTypes) { int i; - for(i=0;lpszAcceptTypes[i]!=NULL;i++) + for (i = 0; lpszAcceptTypes[i]; i++) + { + if (!*lpszAcceptTypes[i]) continue; HTTP_ProcessHeader(lpwhr, HTTP_ACCEPT, lpszAcceptTypes[i], - HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA|HTTP_ADDHDR_FLAG_REQ|(i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0)); + HTTP_ADDHDR_FLAG_COALESCE_WITH_COMMA | + HTTP_ADDHDR_FLAG_REQ | + (i == 0 ? HTTP_ADDHDR_FLAG_REPLACE : 0)); + } } if (NULL == lpszVerb) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 876e616..664447d 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -632,6 +632,45 @@ done: ok(InternetCloseHandle(hSession), "Close session handle failed\n"); } +static void InternetOpenRequest_test(void) +{ + HINTERNET session, connect, request; + static const char *types[] = { "*", "", NULL }; + static const WCHAR slash[] = {'/', 0}, any[] = {'*', 0}, empty[] = {0}; + static const WCHAR *typesW[] = { any, empty, NULL }; + BOOL ret; + + session = InternetOpenA("Wine Regression Test", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + ok(session != NULL ,"Unable to open Internet session\n"); + + connect = InternetConnectA(session, "winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, + INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "Unable to connect to http://winehq.org\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, types, INTERNET_FLAG_NO_CACHE_WRITE, 0); + if (!request && GetLastError() == ERROR_INTERNET_NAME_NOT_RESOLVED) + { + trace( "Network unreachable, skipping test\n" ); + goto done; + } + ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + ok(InternetCloseHandle(request), "Close request handle failed\n"); + + request = HttpOpenRequestW(connect, NULL, slash, NULL, NULL, typesW, INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "Failed to open request handle err %u\n", GetLastError()); + + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + ok(InternetCloseHandle(request), "Close request handle failed\n"); + +done: + ok(InternetCloseHandle(connect), "Close connect handle failed\n"); + ok(InternetCloseHandle(session), "Close session handle failed\n"); +} + static void HttpHeaders_test(void) { HINTERNET hSession; @@ -1092,6 +1131,7 @@ START_TEST(http) InternetReadFile_test(INTERNET_FLAG_ASYNC); InternetReadFile_test(0); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); + InternetOpenRequest_test(); InternetOpenUrlA_test(); InternetTimeFromSystemTimeA_test(); InternetTimeFromSystemTimeW_test();

1 0

Paul Vriens : wininet/ftp.c: Fix some returned error codes.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: f0f3e15ac2bde9cb7a0bbbdbb8dc98cb373b0019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f3e15ac2bde9cb7a0bbbdbb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 12 11:33:26 2007 +0100 wininet/ftp.c: Fix some returned error codes. --- dlls/wininet/ftp.c | 29 ++++++++++++++++++++++++++--- dlls/wininet/tests/ftp.c | 12 +----------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 56fade1..e8a31b4 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1193,6 +1193,8 @@ static void AsyncFtpGetFileProc(WORKREQU HeapFree(GetProcessHeap(), 0, req->lpszNewFile); } +#define FTP_CONDITION_MASK 0x0007 + BOOL WINAPI FtpGetFileW(HINTERNET hInternet, LPCWSTR lpszRemoteFile, LPCWSTR lpszNewFile, BOOL fFailIfExists, DWORD dwLocalFlagsAttribute, DWORD dwInternetFlags, DWORD dwContext) @@ -1201,13 +1203,35 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInter LPWININETAPPINFOW hIC = NULL; BOOL r = FALSE; + if (!lpszRemoteFile || !lpszNewFile) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hInternet ); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) + if (!lpwfs) + { + INTERNET_SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (WH_HFTPSESSION != lpwfs->hdr.htype) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); goto lend; } + /* Testing shows that Windows only accepts dwInternetFlags where the last + * 3 (yes 3) bits define FTP_TRANSFER_TYPE_UNKNOWN, FTP_TRANSFER_TYPE_ASCII or FTP_TRANSFER_TYPE_BINARY. + */ + + if ((dwInternetFlags & FTP_CONDITION_MASK) > FTP_TRANSFER_TYPE_BINARY) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + goto lend; + } + if (lpwfs->download_in_progress != NULL) { INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); goto lend; @@ -1238,8 +1262,7 @@ BOOL WINAPI FtpGetFileW(HINTERNET hInter } lend: - if( lpwfs ) - WININET_Release( &lpwfs->hdr ); + WININET_Release( &lpwfs->hdr ); return r; } diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index ae33560..43be942 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -249,7 +249,6 @@ static void test_getfile(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(NULL, NULL, "should_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_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -257,7 +256,6 @@ static void test_getfile(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(NULL, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, 5, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); @@ -281,21 +279,16 @@ static void test_getfile(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, NULL, "should_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_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Currently Wine always creates the local file (even on failure) which is not correct, hence the test */ ok (GetFileAttributesA("should_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); - } DeleteFileA("should_be_non_existing_deadbeef"); /* No local file */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", NULL, FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -317,13 +310,10 @@ static void test_getfile(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, 5, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - todo_wine - { ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); ok (GetFileAttributesA("should_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); - } DeleteFileA("should_be_non_existing_deadbeef"); /* Remote file doesn't exist */ @@ -334,6 +324,7 @@ static void test_getfile(void) { 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 */ ok (GetFileAttributesA("should_also_be_non_existing_deadbeef") == INVALID_FILE_ATTRIBUTES, "Local file should not have been created\n"); } @@ -390,7 +381,6 @@ static void test_getfile(void) SetLastError(0xdeadbeef); bRet = FtpGetFileA(hConnect, NULL, "should_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_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Paul Vriens : wininet/ftp.c: Add tests to show the order of parameter checking.
by Alexandre Julliard 13 Feb '07

13 Feb '07

Module: wine Branch: master Commit: 00b7b29c3a18f864aa6130c72bed7274673fc339 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b7b29c3a18f864aa6130c72… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 12 10:55:13 2007 +0100 wininet/ftp.c: Add tests to show the order of parameter checking. --- dlls/wininet/tests/ftp.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index f0c59ba..ae33560 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -237,21 +237,29 @@ static void test_getfile(void) BOOL bRet; HINTERNET hInternet, hFtp, hConnect; - /* Invalid internet handle, the other is a valid parameter */ + /* The order of checking is: + * + * All parameters except 'session handle' and 'condition flags' + * Session handle + * Session handle type + * Condition flags + */ + + /* Test to show existence of local file is tested first (together with 'remote file') */ SetLastError(0xdeadbeef); - bRet = FtpGetFileA(NULL, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); + bRet = FtpGetFileA(NULL, NULL, "should_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_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Test to show that FtpGetFileA checks the parameters before the handle */ + /* Test to show session handle is checked before 'condition flags' */ SetLastError(0xdeadbeef); - bRet = FtpGetFileA(NULL, NULL, NULL, FALSE, 0, 5, 0); + bRet = FtpGetFileA(NULL, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, 5, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); todo_wine - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); hInternet = InternetOpen(NULL, 0, NULL, NULL, 0); hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); @@ -378,7 +386,15 @@ static void test_getfile(void) hConnect = InternetConnect(hInternet, "www.winehq.org", INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - /* One small test to show that handle type is checked before parameters */ + /* Test to show existence of local file is tested before 'session handle type' */ + SetLastError(0xdeadbeef); + bRet = FtpGetFileA(hConnect, NULL, "should_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_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Test to show that 'session handle type' is checked before 'condition flags' */ SetLastError(0xdeadbeef); bRet = FtpGetFileA(hConnect, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, 5, 0); ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n");

1 0

Rob Shearman : rpcrt4: The format structures used in the marshaling code should have 1-byte alignment .
by Alexandre Julliard 12 Feb '07

12 Feb '07

Module: wine Branch: master Commit: b6d8b27be596f167f60d7ae4558d1b54b9b19d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d8b27be596f167f60d7ae45… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 12 13:29:04 2007 +0000 rpcrt4: The format structures used in the marshaling code should have 1-byte alignment. --- dlls/rpcrt4/ndr_marshall.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3dc5265..7fce001 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2933,6 +2933,7 @@ void WINAPI NdrConvert2( PMIDL_STUB_MESS is to raise an exception */ } +#include "pshpack1.h" typedef struct _NDR_CSTRUCT_FORMAT { unsigned char type; @@ -2940,6 +2941,7 @@ typedef struct _NDR_CSTRUCT_FORMAT unsigned short memory_size; short offset_to_array_description; } NDR_CSTRUCT_FORMAT, NDR_CVSTRUCT_FORMAT; +#include "poppack.h" /*********************************************************************** * NdrConformantStructMarshall [RPCRT4.@] @@ -3509,6 +3511,7 @@ void WINAPI NdrConformantVaryingStructFr EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } +#include "pshpack1.h" typedef struct { unsigned char type; @@ -3522,6 +3525,7 @@ typedef struct unsigned char alignment; unsigned long total_size; } NDR_LGFARRAY_FORMAT; +#include "poppack.h" /*********************************************************************** * NdrFixedArrayMarshall [RPCRT4.@]

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
84
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 February 2007