February 2007 - Wine-commits

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

20 Feb '07

Module: wine Branch: master Commit: 8316b93386d3d4074d28c7665cde6008c3648071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8316b93386d3d4074d28c7665… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 19 19:34:58 2007 +0100 wininet/ftp.c: Fix some returned error codes. --- dlls/wininet/ftp.c | 19 ++++++++++++++++--- dlls/wininet/tests/ftp.c | 18 ++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 6bc21ff..ed49af8 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1027,12 +1027,26 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, debugstr_w(lpszFileName), fdwAccess, dwFlags, dwContext); lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession ); - 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; } + if ((!lpszFileName) || + ((fdwAccess != GENERIC_READ) && (fdwAccess != GENERIC_WRITE)) || + ((dwFlags & 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; @@ -1060,8 +1074,7 @@ HINTERNET WINAPI FtpOpenFileW(HINTERNET hFtpSession, } 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 840d91b..770fdeb 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -409,7 +409,6 @@ static void test_openfile(void) SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(NULL, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); ok ( !hOpenFile, "Expected FtpOpenFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); InternetCloseHandle(hOpenFile); /* Just in case */ @@ -429,7 +428,6 @@ static void test_openfile(void) SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, NULL, GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); ok ( !hOpenFile, "Expected FtpOpenFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); InternetCloseHandle(hOpenFile); /* Just in case */ @@ -438,7 +436,6 @@ static void test_openfile(void) SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", 0, FTP_TRANSFER_TYPE_ASCII, 0); ok ( !hOpenFile, "Expected FtpOpenFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); InternetCloseHandle(hOpenFile); /* Just in case */ @@ -447,7 +444,6 @@ static void test_openfile(void) SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ|GENERIC_WRITE, FTP_TRANSFER_TYPE_ASCII, 0); ok ( !hOpenFile, "Expected FtpOpenFileA to fail\n"); - todo_wine ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); InternetCloseHandle(hOpenFile); /* Just in case */ @@ -455,28 +451,23 @@ static void test_openfile(void) /* Illegal condition flags */ SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, 5, 0); - todo_wine - { ok ( !hOpenFile, "Expected FtpOpenFileA to fail\n"); ok ( GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - } InternetCloseHandle(hOpenFile); /* Just in case */ /* All OK */ SetLastError(0xdeadbeef); hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - todo_wine - { ok ( hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n"); /* For some strange/unknown reason, win98 returns ERROR_FILE_NOT_FOUND */ ok ( GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND (win98), got %d\n", GetLastError()); - } if (hOpenFile) { BOOL bRet; + HINTERNET hOpenFile2; /* We have a handle so all ftp calls should fail (TODO: Put more ftp-calls in here) */ SetLastError(0xdeadbeef); @@ -485,6 +476,13 @@ static void test_openfile(void) ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); DeleteFileA("should_be_non_existing_deadbeef"); /* Just in case */ + + SetLastError(0xdeadbeef); + hOpenFile2 = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); + ok ( bRet == FALSE, "Expected FtpOpenFileA to fail\n"); + ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + InternetCloseHandle(hOpenFile); /* Just in case */ } InternetCloseHandle(hOpenFile);

1 0

Mikołaj Zalewski : comctl32: rebar: Rewrite the layout code.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: f0a7a74666e2cf9aa1213ea638c4d899f86f19e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a7a74666e2cf9aa1213ea63… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 19 13:56:51 2007 +0100 comctl32: rebar: Rewrite the layout code. --- dlls/comctl32/rebar.c | 1737 +++++++++++++------------------------------ dlls/comctl32/tests/rebar.c | 420 ++++++++++- 2 files changed, 902 insertions(+), 1255 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a7a74666e2cf9aa1213…

1 0

Alexandre Julliard : widl: 'control' is an attribute not a keyword.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 77292a8c8299cac88f0799f6b1ad7c1a6c620761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77292a8c8299cac88f0799f6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 16:40:34 2007 +0100 widl: 'control' is an attribute not a keyword. --- tools/widl/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 0dfe301..7ddcedd 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -194,7 +194,6 @@ static const struct keyword keywords[] = { {"code", tCODE}, {"comm_status", tCOMMSTATUS}, {"const", tCONST}, - {"control", tCONTROL}, {"cpp_quote", tCPPQUOTE}, {"default", tDEFAULT}, {"dispinterface", tDISPINTERFACE}, @@ -245,6 +244,7 @@ static const struct keyword attr_keywords[] = {"context_handle", tCONTEXTHANDLE}, {"context_handle_noserialize", tCONTEXTHANDLENOSERIALIZE}, {"context_handle_serialize", tCONTEXTHANDLENOSERIALIZE}, + {"control", tCONTROL}, {"defaultcollelem", tDEFAULTCOLLELEM}, {"defaultvalue", tDEFAULTVALUE}, {"defaultvtable", tDEFAULTVTABLE},

1 0

Hans Leidekker : wininet: Don' t discard the extra info part of a URL in InternetOpenUrl.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 316383dd493dd9329e58336fd8874f6a84d723bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=316383dd493dd9329e58336fd… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Feb 19 11:08:52 2007 +0100 wininet: Don't discard the extra info part of a URL in InternetOpenUrl. --- dlls/wininet/internet.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 80ddc24..436dd8b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2857,7 +2857,24 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr userName, password, dwFlags, dwContext, INET_OPENURL); if(client == NULL) break; - client1 = HttpOpenRequestW(client, NULL, path, NULL, NULL, accept, dwFlags, dwContext); + + if (urlComponents.dwExtraInfoLength) { + WCHAR *path_extra; + DWORD size = urlComponents.dwUrlPathLength + urlComponents.dwExtraInfoLength + 1; + + if (!(path_extra = HeapAlloc(GetProcessHeap(), 0, size))) + { + InternetCloseHandle(client); + break; + } + strcpyW(path_extra, urlComponents.lpszUrlPath); + strcatW(path_extra, urlComponents.lpszExtraInfo); + client1 = HttpOpenRequestW(client, NULL, path_extra, NULL, NULL, accept, dwFlags, dwContext); + HeapFree(GetProcessHeap(), 0, path_extra); + } + else + client1 = HttpOpenRequestW(client, NULL, path, NULL, NULL, accept, dwFlags, dwContext); + if(client1 == NULL) { InternetCloseHandle(client); break;

1 0

Rob Shearman : ole32: Make an error message more useful by printing the returned error code.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 3047ea9e78de86f39fbb0f63dc5b38db783d2f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3047ea9e78de86f39fbb0f63d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 19 15:11:32 2007 +0000 ole32: Make an error message more useful by printing the returned error code. --- dlls/ole32/marshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index e79e93d..490b762 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -123,7 +123,8 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno IPSFactoryBuffer_Release(psfb); if (hr != S_OK) { - ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s\n", debugstr_guid(riid)); + ERR("Failed to create an IRpcStubBuffer from IPSFactory for %s with error 0x%08x\n", + debugstr_guid(riid), hr); IUnknown_Release(iobject); return hr; }

1 0

lostwages/wwn wn20070219_322.xml
by WineHQ 20 Feb '07

20 Feb '07

ChangeSet ID: 30934 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/02/19 21:41:25 Modified files: wwn : wn20070219_322.xml Log message: WWN #322: give credit for freedesktop menu compliance Patch: http://cvs.winehq.org/patch.py?id=30934 Old revision New revision Changes Path 1.1 1.2 +7 -2 lostwages/wwn/wn20070219_322.xml Index: lostwages/wwn/wn20070219_322.xml diff -u -p lostwages/wwn/wn20070219_322.xml:1.1 lostwages/wwn/wn20070219_322.xml:1.2 --- lostwages/wwn/wn20070219_322.xml:1.1 20 Feb 2007 3:41:25 -0000 +++ lostwages/wwn/wn20070219_322.xml 20 Feb 2007 3:41:25 -0000 @@ -408,7 +408,7 @@ freedesktop.org specs: related to this in the bugzilla :( </quote> -Mike HEarn briefly described what to do: +Mike Hearn briefly described what to do: <quote who="Mike Hearn"> Sounds great! To submit those files, you need to make a patch ... git can do this but I don't remember the exact command to use (depends on @@ -418,8 +418,13 @@ directly. Feel free to ask if you'd like Once you have a patch, email it to wine-patches at winehq.org so Alexandre and the others can review it, suggest improvements etc. Good luck! -</quote> + +</quote> +This work builds on the +<a href="http://www.winehq.com/pipermail/wine-cvs/2006-November/028090.html">foundation</a> +laid by Vitaliy Margolen in November for using the Freedesktop standard to +create Wine's menu structure. </section> <section

1 0

lostwages/ news/2007021901.xml wwn/wn20070219_ ...
by WineHQ 19 Feb '07

19 Feb '07

ChangeSet ID: 30933 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2007/02/19 16:34:52 Added files: news : 2007021901.xml wwn : wn20070219_322.xml Log message: WWN #322 Patch: http://cvs.winehq.org/patch.py?id=30933 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2007021901.xml Added 1.1 +0 -0 lostwages/wwn/wn20070219_322.xml

1 0

Kovács András : winuser.h: Declare some raw input related structures.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: a55b005fe4eca00c9bd41304425cf1938ab5ffc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55b005fe4eca00c9bd413044… Author: Kovács András <andras(a)csevego.net> Date: Mon Feb 19 10:13:48 2007 +0100 winuser.h: Declare some raw input related structures. --- include/winuser.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 7533312..c3056d2 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -444,6 +444,48 @@ typedef struct tagINPUT } INPUT, *PINPUT, *LPINPUT; +typedef struct tagRAWINPUTDEVICE { + USHORT usUsagePage; + USHORT usUsage; + DWORD dwFlags; + HWND hwndTarget; +} RAWINPUTDEVICE, *PRAWINPUTDEVICE, *LPRAWINPUTDEVICE; + +typedef struct tagRID_DEVICE_INFO_MOUSE { + DWORD dwId; + DWORD dwNumberOfButtons; + DWORD dwSampleRate; + BOOL fHasHorizontalWheel; +} RID_DEVICE_INFO_MOUSE, *PRID_DEVICE_INFO_MOUSE; + +typedef struct tagRID_DEVICE_INFO_KEYBOARD { + DWORD dwType; + DWORD dwSubType; + DWORD dwKeyboardMode; + DWORD dwNumberOfFunctionKeys; + DWORD dwNumberOfIndicators; + DWORD dwNumberOfKeysTotal; +} RID_DEVICE_INFO_KEYBOARD, *PRID_DEVICE_INFO_KEYBOARD; + +typedef struct tagRID_DEVICE_INFO_HID { + DWORD dwVendorId; + DWORD dwProductId; + DWORD dwVersionNumber; + USHORT usUsagePage; + USHORT usUsage; +} RID_DEVICE_INFO_HID, *PRID_DEVICE_INFO_HID; + +typedef struct tagRID_DEVICE_INFO { + DWORD cbSize; + DWORD dwType; + union { + RID_DEVICE_INFO_MOUSE mouse; + RID_DEVICE_INFO_KEYBOARD keyboard; + RID_DEVICE_INFO_HID hid; + } DUMMYUNIONNAME; +} RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO; + + typedef struct tagGUITHREADINFO { DWORD cbSize; @@ -1083,6 +1125,9 @@ BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define WM_NCXBUTTONUP 0x00ac #define WM_NCXBUTTONDBLCLK 0x00ad + /* Raw input */ +#define WM_INPUT 0x00ff + /* Keyboard messages */ #define WM_KEYDOWN 0x0100 #define WM_KEYUP 0x0101

1 0

Detlef Riekenberg : regedit: Enable WM_RBUTTONDOWN to set the splitbar.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 10d825aaa3d1fcb4ec596a194200a3b913390055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d825aaa3d1fcb4ec596a194… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Feb 18 17:14:39 2007 +0100 regedit: Enable WM_RBUTTONDOWN to set the splitbar. --- programs/regedit/childwnd.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 6a56e82..659bc73 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -30,8 +30,9 @@ #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(regedit); - + ChildWnd* g_pChildWnd; +static int last_split; /******************************************************************************* * Local module support methods @@ -162,6 +163,24 @@ static void OnTreeSelectionChanged(HWND hwndTV, HWND hwndLV, HTREEITEM hItem, BO } /******************************************************************************* + * finish_splitbar [internal] + * + * make the splitbar invisible and resize the windows + * (helper for ChildWndProc) + */ +static void finish_splitbar(HWND hWnd, int x) +{ + RECT rt; + + draw_splitbar(hWnd, last_split); + last_split = -1; + GetClientRect(hWnd, &rt); + g_pChildWnd->nSplitPos = x; + ResizeWnd(rt.right, rt.bottom); + ReleaseCapture(); +} + +/******************************************************************************* * * FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) * @@ -203,8 +222,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) */ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - static int last_split; - switch (message) { case WM_CREATE: g_pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); @@ -253,16 +270,11 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; } + /* WM_RBUTTONDOWN sets the splitbar the same way as WM_LBUTTONUP */ case WM_LBUTTONUP: + case WM_RBUTTONDOWN: if (GetCapture() == hWnd) { - RECT rt; - int x = LOWORD(lParam); - draw_splitbar(hWnd, last_split); - last_split = -1; - GetClientRect(hWnd, &rt); - g_pChildWnd->nSplitPos = x; - ResizeWnd(rt.right, rt.bottom); - ReleaseCapture(); + finish_splitbar(hWnd, LOWORD(lParam)); } break;

1 0

Stefan Dösinger : wined3d: Only scream about unsupported vertex blending when it is used.
by Alexandre Julliard 19 Feb '07

19 Feb '07

Module: wine Branch: master Commit: 762e227994b4bcd71a9f230efcf89e92dea40b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=762e227994b4bcd71a9f230ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 16 19:15:15 2007 +0100 wined3d: Only scream about unsupported vertex blending when it is used. --- dlls/wined3d/state.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 16fddf7..257757f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2396,8 +2396,10 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte #endif } else { - /* TODO: support blends in fixupVertices */ - FIXME("unsupported blending in openGl\n"); + /* TODO: support blends in drawStridedSlow + * No need to write a FIXME here, this is done after the general vertex decl decoding + */ + WARN("unsupported blending in openGl\n"); } } else { if (GL_SUPPORT(ARB_VERTEX_BLEND)) { @@ -2785,8 +2787,11 @@ static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVer /* Generate some fixme's if unsupported functionality is being used */ #define BUFFER_OR_DATA(_attribute) dataLocations->u.s._attribute.lpData /* TODO: Either support missing functionality in fixupVertices or by creating a shader to replace the pipeline. */ - if (!useVertexShaderFunction && (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) { - FIXME("Blending data is only valid with vertex shaders %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData); + if (!useVertexShaderFunction && + stateblock->renderState[WINED3DRS_VERTEXBLEND] && + (BUFFER_OR_DATA(blendMatrixIndices) || BUFFER_OR_DATA(blendWeights))) { + FIXME("Vertex Blending is not implemented yet %p %p\n",dataLocations->u.s.blendWeights.lpData,dataLocations->u.s.blendWeights.lpData); + /* TODO: Implement it using GL_ARB_vertex_blend or software emulation in drawStridedSlow */ } if (!useVertexShaderFunction && (BUFFER_OR_DATA(position2) || BUFFER_OR_DATA(normal2))) { FIXME("Tweening is only valid with vertex shaders\n");

1 0