June 2006 - Wine-Commits - list.winehq.org

appdb/ admin/addAppNote.php admin/editAppNote. ...
by WineHQ June 30, 2006

June 30, 2006

ChangeSet ID: 26156 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/30 14:48:33 Modified files: admin : addAppNote.php editAppNote.php include : note.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Cleanup note editing. Improve previewing of notes during addition and editing. Rename note related variables to have the proper prefix. Patch: http://cvs.winehq.org/patch.py?id=26156 Old revision New revision Changes Path 1.24 1.25 +27 -42 appdb/admin/addAppNote.php 1.23 1.24 +28 -50 appdb/admin/editAppNote.php 1.12 1.13 +79 -26 appdb/include/note.php 1.62 1.63 +5 -5 appdb/include/version.php

1 0

appdb/ include/image.php unit_test/run_tests.p ...
by WineHQ June 30, 2006

June 30, 2006

ChangeSet ID: 26155 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/30 14:42:39 Modified files: include : image.php unit_test : run_tests.php Added files: unit_test : test_image.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Rename image class variables to match our current naming convention. Implement a unit test for the image class Patch: http://cvs.winehq.org/patch.py?id=26155 Old revision New revision Changes Path 1.5 1.6 +165 -148 appdb/include/image.php 1.2 1.3 +4 -1 appdb/unit_test/run_tests.php Added 1.1 +0 -0 appdb/unit_test/test_image.php

1 0

Andrew Talbot : setupapi/tests: Add trailing '\n's to ok() calls.
by Alexandre Julliard June 30, 2006

June 30, 2006

Module: wine Branch: refs/heads/master Commit: cd9202d05b22c367c74ebc72f92c3bbed6bcf9ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd9202d05b22c367c74ebc7… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Jun 30 18:15:10 2006 +0100 setupapi/tests: Add trailing '\n's to ok() calls. --- dlls/setupapi/tests/devinst.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ad4aea0..4181858 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -44,7 +44,7 @@ static void test_Device_Info_List(void) error = GetLastError(); ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); - ok(error == ERROR_INVALID_PARAMETER, "GetLastError returned wrong value : %ld, (expected %d)", error, ERROR_INVALID_PARAMETER); + ok(error == ERROR_INVALID_PARAMETER, "GetLastError returned wrong value : %ld, (expected %d)\n", error, ERROR_INVALID_PARAMETER); SetLastError(0xdeadbeef); /* create empty DeviceInfoList, but set MachineName to something */ @@ -52,7 +52,7 @@ static void test_Device_Info_List(void) error = GetLastError(); ok(devlist == INVALID_HANDLE_VALUE, "SetupDiCreateDeviceInfoListExW failed : %p %ld (expected %p)\n", devlist, error, INVALID_HANDLE_VALUE); - ok(error == ERROR_INVALID_MACHINENAME, "GetLastError returned wrong value : %ld, (expected %d)", error, ERROR_INVALID_MACHINENAME); + ok(error == ERROR_INVALID_MACHINENAME, "GetLastError returned wrong value : %ld, (expected %d)\n", error, ERROR_INVALID_MACHINENAME); /* create empty DeviceInfoList */ devlist = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); @@ -60,7 +60,7 @@ static void test_Device_Info_List(void) /* destroy DeviceInfoList */ ret = SetupDiDestroyDeviceInfoList(devlist); - ok(ret, "SetupDiDestroyDeviceInfoList failed : %ld", error); + ok(ret, "SetupDiDestroyDeviceInfoList failed : %ld\n", error); } START_TEST(devinst)

1 0

Paul Vriens : Use the return value of register_key_guid.
by Alexandre Julliard June 30, 2006

June 30, 2006

1 0

Piotr Caban : oleview: Added base TypeLib Viewer menu functionality.
by Alexandre Julliard June 30, 2006

June 30, 2006

Module: wine Branch: refs/heads/master Commit: b3e9a3ba9f207793edb97c7336b1fe99f3b24ca2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3e9a3ba9f207793edb97c7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jun 30 18:43:40 2006 +0200 oleview: Added base TypeLib Viewer menu functionality. --- programs/oleview/En.rc | 2 +- programs/oleview/typelib.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index da6edb6..b792716 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -83,7 +83,7 @@ IDM_TYPELIB MENU MENUITEM "&Group by type kind", IDM_GROUP MENUITEM SEPARATOR MENUITEM "&Toolbar", IDM_TOOLBAR - MENUITEM "&Status Bar", IDM_STATUSBAR + MENUITEM "&Status Bar", IDM_STATUSBAR,CHECKED } } diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 8d5442a..f6b3e23 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -77,6 +77,25 @@ void TypeLibResizeChild(void) client.right, client.bottom-stat.bottom, TRUE); } +void TypeLibMenuCommand(WPARAM wParam, HWND hWnd) +{ + BOOL vis; + + switch(wParam) + { + case IDM_STATUSBAR: + vis = IsWindowVisible(typelib.hStatusBar); + ShowWindow(typelib.hStatusBar, vis ? SW_HIDE : SW_SHOW); + CheckMenuItem(GetMenu(hWnd), LOWORD(wParam), + vis ? MF_UNCHECKED : MF_CHECKED); + TypeLibResizeChild(); + break; + case IDM_CLOSE: + DestroyWindow(hWnd); + break; + } +} + void UpdateTypeLibStatusBar(int itemID) { WCHAR info[MAX_LOAD_STRING]; @@ -109,6 +128,8 @@ LRESULT CALLBACK TypeLibProc(HWND hWnd, SetFocus(typelib.hTree); break; } + case WM_COMMAND: + TypeLibMenuCommand(LOWORD(wParam), hWnd); case WM_MENUSELECT: UpdateTypeLibStatusBar(LOWORD(wParam)); break;

1 0

Piotr Caban : oleview: Added status bar to TypeLib Viewer.
by Alexandre Julliard June 30, 2006

June 30, 2006

Module: wine Branch: refs/heads/master Commit: 49c779f06f0d3c7f058bcc8a0405e4557ef3034f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49c779f06f0d3c7f058bcc8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jun 30 18:42:14 2006 +0200 oleview: Added status bar to TypeLib Viewer. --- programs/oleview/En.rc | 4 ++++ programs/oleview/main.h | 1 + programs/oleview/typelib.c | 42 +++++++++++++++++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/programs/oleview/En.rc b/programs/oleview/En.rc index 3f981d5..da6edb6 100644 --- a/programs/oleview/En.rc +++ b/programs/oleview/En.rc @@ -117,6 +117,10 @@ STRINGTABLE IDM_REFRESH, "Refresh all lists" IDM_ABOUT, "Display program information, version number and copyright" + IDM_SAVEAS, "Save as an .IDL or .H file" + IDM_CLOSE, "Close window" + IDM_GROUP, "Group typeinfos by kind" + IDS_TREE_OC, "ObjectClasses" IDS_TREE_GBCC, "Grouped by Component Category" IDS_TREE_O1O, "OLE 1.0 Objects" diff --git a/programs/oleview/main.h b/programs/oleview/main.h index fd76b20..ad200fb 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -107,6 +107,7 @@ typedef struct HWND hPaneWnd; HWND hTree; HWND hEdit; + HWND hStatusBar; }TYPELIB; extern GLOBALS globals; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 08b47ad..8d5442a 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -62,6 +62,31 @@ void PopulateTree(void) ITypeLib_Release(pTypeLib); } +void TypeLibResizeChild(void) +{ + RECT client, stat; + + MoveWindow(typelib.hStatusBar, 0, 0, 0, 0, TRUE); + + if(IsWindowVisible(typelib.hStatusBar)) + GetClientRect(typelib.hStatusBar, &stat); + else stat.bottom = 0; + + GetClientRect(globals.hTypeLibWnd, &client); + MoveWindow(typelib.hPaneWnd, 0, 0, + client.right, client.bottom-stat.bottom, TRUE); +} + +void UpdateTypeLibStatusBar(int itemID) +{ + WCHAR info[MAX_LOAD_STRING]; + + if(!LoadString(globals.hMainInst, itemID, info, sizeof(WCHAR[MAX_LOAD_STRING]))) + LoadString(globals.hMainInst, IDS_READY, info, sizeof(WCHAR[MAX_LOAD_STRING])); + + SendMessage(typelib.hStatusBar, SB_SETTEXT, 0, (LPARAM)info); +} + LRESULT CALLBACK TypeLibProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch(uMsg) @@ -81,11 +106,18 @@ LRESULT CALLBACK TypeLibProc(HWND hWnd, SetRight(typelib.hPaneWnd, typelib.hEdit); PopulateTree(); + SetFocus(typelib.hTree); break; } + case WM_MENUSELECT: + UpdateTypeLibStatusBar(LOWORD(wParam)); + break; + case WM_SETFOCUS: + SetFocus(typelib.hTree); + break; case WM_SIZE: - MoveWindow(typelib.hPaneWnd, 0, 0, - LOWORD(lParam), HIWORD(lParam), TRUE); + if(wParam == SIZE_MINIMIZED) break; + TypeLibResizeChild(); break; case WM_DESTROY: break; @@ -119,7 +151,11 @@ BOOL CreateTypeLibWindow(HINSTANCE hInst globals.hTypeLibWnd = CreateWindow(wszTypeLib, wszTitle, WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, NULL, NULL, hInst, NULL); - if(!globals.hTypeLibWnd) return FALSE; + + typelib.hStatusBar = CreateStatusWindow(WS_VISIBLE|WS_CHILD, + (LPWSTR)wszTitle, globals.hTypeLibWnd, 0); + + TypeLibResizeChild(); return TRUE; }

1 0

Piotr Caban : oleview: Added TypeLib Viewer base.
by Alexandre Julliard June 30, 2006

June 30, 2006

Module: wine Branch: refs/heads/master Commit: 03c5387f924bf0b21f0b4335a8505db22d6d6535 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03c5387f924bf0b21f0b433… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jun 30 17:29:56 2006 +0200 oleview: Added TypeLib Viewer base. - Added TypeLib Viewer base. - Fixed multiple instance of pane window functionality. - Added field with TypeLib path to ITEM_INFO structure. --- programs/oleview/En.rc | 17 ++++++ programs/oleview/Makefile.in | 3 + programs/oleview/main.h | 19 ++++++ programs/oleview/oleview.c | 3 + programs/oleview/pane.c | 10 +++ programs/oleview/resource.h | 5 ++ programs/oleview/tree.c | 37 ++++++++---- programs/oleview/typelib.c | 125 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 200 insertions(+), 19 deletions(-) create mode 100644 programs/oleview/typelib.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=03c5387f924bf0b21f0…

1 0

Stefan Dösinger : wined3d: Perform sanity checks on the rectangle in LockRect.
by Alexandre Julliard June 30, 2006

June 30, 2006

Module: wine Branch: refs/heads/master Commit: 77448f588b888ecc724c7ead9f28629f3f661d27 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77448f588b888ecc724c7ea… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Jun 29 21:13:12 2006 +0200 wined3d: Perform sanity checks on the rectangle in LockRect. --- dlls/wined3d/surface.c | 11 +++++++++++ dlls/wined3d/surface_gdi.c | 11 +++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index da8f766..e3c8682 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -348,6 +348,17 @@ static HRESULT WINAPI IWineD3DSurfaceImp } else { TRACE("Lock Rect (%p) = l %ld, t %ld, r %ld, b %ld\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); + if ((pRect->top < 0) || + (pRect->left < 0) || + (pRect->left >= pRect->right) || + (pRect->top >= pRect->bottom) || + (pRect->right > This->currentDesc.Width) || + (pRect->bottom > This->currentDesc.Height)) + { + WARN(" Invalid values in pRect !!!\n"); + return D3DERR_INVALIDCALL; + } + if (This->resource.format == WINED3DFMT_DXT1) { /* DXT1 is half byte per pixel */ pLockedRect->pBits = This->resource.allocatedMemory + (pLockedRect->Pitch * pRect->top) + ((pRect->left * This->bytesPerPixel / 2)); } else { diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index e1d082d..ddea727 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -196,6 +196,17 @@ IWineGDISurfaceImpl_LockRect(IWineD3DSur TRACE("Lock Rect (%p) = l %ld, t %ld, r %ld, b %ld\n", pRect, pRect->left, pRect->top, pRect->right, pRect->bottom); + if ((pRect->top < 0) || + (pRect->left < 0) || + (pRect->left >= pRect->right) || + (pRect->top >= pRect->bottom) || + (pRect->right > This->currentDesc.Width) || + (pRect->bottom > This->currentDesc.Height)) + { + WARN(" Invalid values in pRect !!!\n"); + return D3DERR_INVALIDCALL; + } + if (This->resource.format == WINED3DFMT_DXT1) { /* DXT1 is half byte per pixel */

1 0

Piotr Caban : ddraw: Added missing '\n' in debug traces.
by Alexandre Julliard June 30, 2006

June 30, 2006

Module: wine Branch: refs/heads/master Commit: 2abfc391b4901bcfacf93ed2d2edb2867f010af0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2abfc391b4901bcfacf93ed… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jun 30 13:40:05 2006 +0200 ddraw: Added missing '\n' in debug traces. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b9e7f32..f6be8bc 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -186,7 +186,7 @@ IDirectDrawImpl_QueryInterface(IDirectDr /* Unknown interface */ else { - ERR("(%p)->(%s, %p): No interface found", This, debugstr_guid(refiid), obj); + ERR("(%p)->(%s, %p): No interface found\n", This, debugstr_guid(refiid), obj); return E_NOINTERFACE; }

1 0

Piotr Caban : quartz: Fixed crash in releasing uninitializes pAlloc and pReader.
by Alexandre Julliard June 30, 2006

June 30, 2006

Module: wine Branch: refs/heads/master Commit: 02479df343973872fdaf94aea0a70c982cb8b4be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02479df343973872fdaf94a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jun 30 13:37:19 2006 +0200 quartz: Fixed crash in releasing uninitializes pAlloc and pReader. --- dlls/quartz/pin.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 57dc385..057ca3e 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1131,8 +1131,10 @@ ULONG WINAPI PullPin_Release(IPin * ifac { if (This->hThread) PullPin_StopProcessing(This); - IMemAllocator_Release(This->pAlloc); - IAsyncReader_Release(This->pReader); + if(This->pAlloc) + IMemAllocator_Release(This->pAlloc); + if(This->pReader) + IAsyncReader_Release(This->pReader); CloseHandle(This->hEventStateChanged); CoTaskMemFree(This); return 0;

1 0