October 2006 - Wine-commits

Detlef Riekenberg : localspl: Implement EnumPortsW.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 90714b8893ebdf32511d505b653d741b5501ab20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90714b8893ebdf32511d505b6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 27 19:24:07 2006 +0200 localspl: Implement EnumPortsW. --- dlls/localspl/Makefile.in | 2 +- dlls/localspl/localmon.c | 179 +++++++++++++++++++++++++++++++++++++- dlls/localspl/localspl.rc | 3 + dlls/localspl/localspl_private.h | 3 + dlls/localspl/spl_En.rc | 28 ++++++ 5 files changed, 213 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index 1e468b9..06830de 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = localspl.dll -IMPORTS = kernel32 +IMPORTS = user32 advapi32 kernel32 C_SRCS = \ localmon.c \ diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 1af54c5..30681fe 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -33,12 +33,186 @@ #include "winnls.h" #include "winspool.h" #include "ddk/winsplp.h" +#include "localspl_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(localspl); +/*****************************************************/ + +static const WCHAR WinNT_CV_PortsW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'P','o','r','t','s',0}; + +/****************************************************************** + * enumerate the local Ports from the Registry (internal) + * + * See localmon_EnumPortsW. + * + * NOTES + * returns the needed size (in bytes) for pPorts + * and *lpreturned is set to number of entries returned in pPorts + * + */ + +static DWORD get_ports_from_reg(DWORD level, LPBYTE pPorts, DWORD cbBuf, LPDWORD lpreturned) +{ + HKEY hroot = 0; + LPWSTR ptr; + LPPORT_INFO_2W out; + WCHAR portname[MAX_PATH]; + WCHAR res_PortW[32]; + WCHAR res_MonitorW[32]; + INT reslen_PortW; + INT reslen_MonitorW; + DWORD len; + DWORD res; + DWORD needed = 0; + DWORD numentries; + DWORD entrysize; + DWORD id = 0; + + TRACE("(%d, %p, %d, %p)\n", level, pPorts, cbBuf, lpreturned); + + entrysize = (level == 1) ? sizeof(PORT_INFO_1W) : sizeof(PORT_INFO_2W); + + numentries = *lpreturned; /* this is 0, when we scan the registry */ + needed = entrysize * numentries; + ptr = (LPWSTR) &pPorts[needed]; + + if (needed > cbBuf) pPorts = NULL; /* No buffer for the structs */ + + numentries = 0; + needed = 0; + + /* we do not check more parameters as done in windows */ + if ((level < 1) || (level > 2)) { + goto getports_cleanup; + } + + /* "+1" for '\0' */ + reslen_MonitorW = LoadStringW(LOCALSPL_hInstance, IDS_LOCALMONITOR, res_MonitorW, 32) + 1; + reslen_PortW = LoadStringW(LOCALSPL_hInstance, IDS_LOCALPORT, res_PortW, 32) + 1; + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, WinNT_CV_PortsW, &hroot); + if (res == ERROR_SUCCESS) { + + /* Scan all Port-Names */ + while (res == ERROR_SUCCESS) { + len = MAX_PATH; + portname[0] = '\0'; + res = RegEnumValueW(hroot, id, portname, &len, NULL, NULL, NULL, NULL); + + if ((res == ERROR_SUCCESS) && (portname[0])) { + numentries++; + /* calsulate the required size */ + needed += entrysize; + needed += (len + 1) * sizeof(WCHAR); + if (level > 1) { + needed += (reslen_MonitorW + reslen_PortW) * sizeof(WCHAR); + } + + /* Now fill the user-buffer, if available */ + if (pPorts && (cbBuf >= needed)){ + out = (LPPORT_INFO_2W) pPorts; + pPorts += entrysize; + TRACE("%p: writing PORT_INFO_%dW #%d (%s)\n", out, level, numentries, debugstr_w(portname)); + out->pPortName = ptr; + lstrcpyW(ptr, portname); /* Name of the Port */ + ptr += (len + 1); + if (level > 1) { + out->pMonitorName = ptr; + lstrcpyW(ptr, res_MonitorW); /* Name of the Monitor */ + ptr += reslen_MonitorW; + + out->pDescription = ptr; + lstrcpyW(ptr, res_PortW); /* Port Description */ + ptr += reslen_PortW; + + out->fPortType = PORT_TYPE_WRITE; + out->Reserved = 0; + } + } + id++; + } + } + RegCloseKey(hroot); + } + else + { + ERR("failed with %d for %s\n", res, debugstr_w(WinNT_CV_PortsW)); + SetLastError(res); + } + +getports_cleanup: + *lpreturned = numentries; + TRACE("need %d byte for %d entries (%d)\n", needed, numentries, GetLastError()); + return needed; +} + +/***************************************************** + * localmon_EnumPortsW [exported through MONITOREX] + * + * Enumerate all local Ports + * + * PARAMS + * pName [I] Servername (ignored) + * level [I] Structure-Level (1 or 2) + * pPorts [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pPorts + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / required for pPorts + * pcReturned [O] PTR to DWORD that receives the number of Ports in pPorts + * + * RETURNS + * Success: TRUE + * Failure: FALSE and in pcbNeeded the Bytes required for pPorts, if cbBuf is too small + * + * NOTES + *| Windows ignores pName + *| Windows crash the app, when pPorts, pcbNeeded or pcReturned are NULL + *| Windows >NT4.0 does not check for illegal levels (TRUE is returned) + * + * ToDo + * "HCU\Software\Wine\Spooler\<portname>" - redirection + * + */ +BOOL WINAPI localmon_EnumPortsW(LPWSTR pName, DWORD level, LPBYTE pPorts, + DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) +{ + BOOL res = FALSE; + DWORD needed; + DWORD numentries; + + TRACE("(%s, %d, %p, %d, %p, %p)\n", + debugstr_w(pName), level, pPorts, cbBuf, pcbNeeded, pcReturned); + + numentries = 0; + needed = get_ports_from_reg(level, NULL, 0, &numentries); + /* we calculated the needed buffersize. now do the error-checks */ + if (cbBuf < needed) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto cleanup; + } + + /* fill the buffer with the Port-Names */ + needed = get_ports_from_reg(level, pPorts, cbBuf, &numentries); + res = TRUE; + + if (pcReturned) *pcReturned = numentries; + +cleanup: + if (pcbNeeded) *pcbNeeded = needed; + + TRACE("returning %d with %d (%d byte for %d entries)\n", + res, GetLastError(), needed, numentries); + + return (res); +} + /***************************************************** * InitializePrintMonitor (LOCALSPL.@) * @@ -62,7 +236,10 @@ LPMONITOREX WINAPI InitializePrintMonito { static MONITOREX mymonitorex = { - sizeof(MONITOREX) - sizeof(DWORD) + sizeof(MONITOREX) - sizeof(DWORD), + { + localmon_EnumPortsW + } }; TRACE("(%s)\n", debugstr_w(regroot)); diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index 4098452..fece280 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" #include "winver.h" +#include "localspl_private.h" #define WINE_FILENAME_STR "localspl.dll" #define WINE_FILEDESCRIPTION_STR "Wine Printer spooler component" @@ -34,3 +35,5 @@ #define WINE_PRODUCTVERSION 5,1,260 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180" #include "wine/wine_common_ver.rc" + +#include "spl_En.rc" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 63ca891..00d697a 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -25,5 +25,8 @@ #define __WINE_LOCALSPL_PRIVATE__ /* ## DLL-wide Globals ## */ extern HINSTANCE LOCALSPL_hInstance; +/* ## Resource-ID ## */ +#define IDS_LOCALPORT 500 +#define IDS_LOCALMONITOR 507 #endif /* __WINE_LOCALSPL_PRIVATE__ */ diff --git a/dlls/localspl/spl_En.rc b/dlls/localspl/spl_En.rc new file mode 100644 index 0000000..c9d12f4 --- /dev/null +++ b/dlls/localspl/spl_En.rc @@ -0,0 +1,28 @@ +/* + * English resources for localspl + * + * Copyright 2005 Huw Davies + * Copyright 2006 Detlef Riekenberg + * + * 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 + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Local Port" + IDS_LOCALMONITOR "Local Monitor" +}

1 0

Detlef Riekenberg : localspl: Add German resources.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: bffcdd0d3aa43be74bbf117b61a86384c281daca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffcdd0d3aa43be74bbf117b6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Oct 28 13:28:06 2006 +0200 localspl: Add German resources. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_De.rc | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index fece280..299023f 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -37,3 +37,4 @@ #define WINE_PRODUCTVERSION_STR "5.1.260 #include "wine/wine_common_ver.rc" #include "spl_En.rc" +#include "spl_De.rc" diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc new file mode 100644 index 0000000..0501c4e --- /dev/null +++ b/dlls/localspl/spl_De.rc @@ -0,0 +1,28 @@ +/* + * German resources for localspl + * + * Copyright 2005 Henning Gerhardt + * Copyright 2006 Detlef Riekenberg + * + * 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 + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Lokaler Anschlu�" + IDS_LOCALMONITOR "Lokaler Monitor" +}

1 0

Detlef Riekenberg : localspl/tests: Add tests for EnumPorts.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 74a09f90caaa85851bf18cb80c5b192eb28f661d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a09f90caaa85851bf18cb80… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 27 19:20:13 2006 +0200 localspl/tests: Add tests for EnumPorts. --- dlls/localspl/tests/localmon.c | 92 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index d71fb64..8cacf31 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -59,6 +59,7 @@ static DWORD (WINAPI *pXcvDataPort)(HAND static BOOL (WINAPI *pXcvClosePort)(HANDLE); static WCHAR emptyW[] = {0}; +static WCHAR invalid_serverW[] = {'\\','\\','i','n','v','a','l','i','d','_','s','e','r','v','e','r',0}; static WCHAR Monitors_LocalPortW[] = { \ 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -69,6 +70,96 @@ static WCHAR Monitors_LocalPortW[] = { \ /* ##### */ +static void test_EnumPorts(void) +{ + DWORD res; + DWORD level; + LPBYTE buffer; + DWORD cbBuf; + DWORD pcbNeeded; + DWORD pcReturned; + + if (!pEnumPorts) return; + + /* valid levels are 1 and 2 */ + for(level = 0; level < 4; level++) { + + cbBuf = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pEnumPorts(NULL, level, NULL, 0, &cbBuf, &pcReturned); + + /* use only a short test, when we test with an invalid level */ + if(!level || (level > 2)) { + /* NT4 fails with ERROR_INVALID_LEVEL (as expected) + XP succeeds with ERROR_SUCCESS () */ + ok( (cbBuf == 0) && (pcReturned == 0), + "(%d) returned %d with %d and %d, %d (expected 0, 0)\n", + level, res, GetLastError(), cbBuf, pcReturned); + continue; + } + + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%d) returned %d with %d and %d, %d (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", + level, res, GetLastError(), cbBuf, pcReturned); + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf * 2); + if (buffer == NULL) continue; + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", + level, res, GetLastError(), cbBuf, pcReturned); + /* We can compare the returned Data with the Registry / "win.ini",[Ports] here */ + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pEnumPorts(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", + level, res, GetLastError(), cbBuf, pcReturned); + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pEnumPorts(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%d) returned %d with %d and %d, %d (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", + level, res, GetLastError(), cbBuf, pcReturned); + +#if 0 + /* The following tests crash this app with native localmon/localspl */ + res = pEnumPorts(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + res = pEnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); + res = pEnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); +#endif + + /* The Servername is ignored */ + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pEnumPorts(emptyW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", + level, res, GetLastError(), cbBuf, pcReturned); + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pEnumPorts(invalid_serverW, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok( res, "(%d) returned %d with %d and %d, %d (expected '!= 0')\n", + level, res, GetLastError(), cbBuf, pcReturned); + + HeapFree(GetProcessHeap(), 0, buffer); + } +} + +/* ########################### */ + + static void test_InitializePrintMonitor(void) { LPMONITOREX res; @@ -150,4 +241,5 @@ START_TEST(localmon) GET_MONITOR_FUNC(XcvClosePort); } test_InitializePrintMonitor(); + test_EnumPorts(); }

1 0

Kirill K. Smirnov : wine.inf: Associate .hlp files with winhelp.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 1b039cc3ba6646e3d6c43863fb242fc603cea95f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b039cc3ba6646e3d6c43863f… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Oct 30 15:44:21 2006 +0300 wine.inf: Associate .hlp files with winhelp. --- tools/wine.inf | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index e16b1b0..af6e545 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -87,6 +87,7 @@ HKCR,.avi,"Content Type",2,"video/avi" HKCR,.dll,"Content Type",2,"application/x-msdownload" HKCR,.exe,,2,"exefile" HKCR,.exe,"Content Type",2,"application/x-msdownload" +HKCR,.hlp,,2,"hlpfile" HKCR,.htm,,2,"htmlfile" HKCR,.htm,"Content Type",2,"text/html" HKCR,.html,,2,"htmlfile" @@ -106,6 +107,7 @@ HKCR,exefile\shell\open\command,,2,"""%1 HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" +HKCR,hlpfile\shell\open\command,,2,"%10%\winhelp.exe %1" HKCR,htmlfile\shell\open\command,,2,"winebrowser" HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1"

1 0

Aric Stewart : shell32: ABM_NEW was using parameters that are not set.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 418d093325b09dacdae57c0a1737a3c3fa2280b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=418d093325b09dacdae57c0a1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 27 10:44:13 2006 -0500 shell32: ABM_NEW was using parameters that are not set. --- dlls/shell32/shell32_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index cd9dea9..0c0c3b8 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -864,8 +864,8 @@ UINT WINAPI SHAppBarMessage(DWORD msg, P data->hWnd=GetActiveWindow(); return TRUE; case ABM_NEW: - SetWindowPos(data->hWnd,HWND_TOP,rec.left,rec.top, - width,height,SWP_SHOWWINDOW); + /* cbSize, hWnd, and uCallbackMessage are used. All other ignored */ + SetWindowPos(data->hWnd,HWND_TOP,0,0,0,0,SWP_SHOWWINDOW|SWP_NOMOVE|SWP_NOSIZE); return TRUE; case ABM_QUERYPOS: GetWindowRect(data->hWnd, &(data->rc));

1 0

Alexandre Julliard : winecrt0: Fix delay load structure types for Win64.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: fd15a1d4beeb4d97f3a350d175a91912ca81f132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd15a1d4beeb4d97f3a350d17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 30 17:43:03 2006 +0100 winecrt0: Fix delay load structure types for Win64. --- dlls/winecrt0/delay_load.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index e43f694..5926770 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -24,14 +24,14 @@ #include "winbase.h" struct ImgDelayDescr { - DWORD grAttrs; + DWORD_PTR grAttrs; LPCSTR szName; HMODULE *phmod; IMAGE_THUNK_DATA *pIAT; const IMAGE_THUNK_DATA *pINT; const IMAGE_THUNK_DATA *pBoundIAT; const IMAGE_THUNK_DATA *pUnloadIAT; - DWORD dwTimeStamp; + DWORD_PTR dwTimeStamp; }; extern struct ImgDelayDescr __wine_spec_delay_imports[];

1 0

Alexandre Julliard : user32: SetWindowRgn should call SetWindowPos, not RedrawWindow.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 93825eab3e0938f65e9bdcc14519a05cc3def4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93825eab3e0938f65e9bdcc14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 30 17:43:38 2006 +0100 user32: SetWindowRgn should call SetWindowPos, not RedrawWindow. --- dlls/user/tests/msg.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user/winpos.c | 8 +++++- 2 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 14a7bdd..6149170 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -7996,6 +7996,73 @@ #undef track_query #undef track_hover_cancel } + +static const struct message WmSetWindowRgn[] = { + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_NCPAINT, sent }, /* wparam != 1 */ + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { 0 } +}; + +static const struct message WmSetWindowRgn_no_redraw[] = { + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { 0 } +}; + +static const struct message WmSetWindowRgn_clear[] = { + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCCALCSIZE, sent|wparam, 1 }, + { WM_NCPAINT, sent }, /* wparam != 1 */ + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOZORDER|SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_NCPAINT, sent|optional }, /* wparam != 1 */ + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { 0 } +}; + +static void test_SetWindowRgn(void) +{ + HRGN hrgn; + HWND hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok( hwnd != 0, "Failed to create overlapped window\n" ); + + ShowWindow( hwnd, SW_SHOW ); + UpdateWindow( hwnd ); + flush_events(); + flush_sequence(); + + trace("testing SetWindowRgn\n"); + hrgn = CreateRectRgn( 0, 0, 150, 150 ); + SetWindowRgn( hwnd, hrgn, TRUE ); + ok_sequence( WmSetWindowRgn, "WmSetWindowRgn", FALSE ); + + hrgn = CreateRectRgn( 30, 30, 160, 160 ); + SetWindowRgn( hwnd, hrgn, FALSE ); + ok_sequence( WmSetWindowRgn_no_redraw, "WmSetWindowRgn_no_redraw", FALSE ); + + hrgn = CreateRectRgn( 0, 0, 180, 180 ); + SetWindowRgn( hwnd, hrgn, TRUE ); + ok_sequence( WmSetWindowRgn, "WmSetWindowRgn2", FALSE ); + + SetWindowRgn( hwnd, 0, TRUE ); + ok_sequence( WmSetWindowRgn_clear, "WmSetWindowRgn_clear", FALSE ); + + DestroyWindow( hwnd ); +} + START_TEST(msg) { BOOL ret; @@ -8060,6 +8127,7 @@ #endif test_edit_messages(); test_quit_message(); test_TrackMouseEvent(); + test_SetWindowRgn(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent) diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index fbc99a2..55716ba 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -265,7 +265,13 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN if (ret) ret = USER_Driver->pSetWindowRgn( hwnd, hrgn, bRedraw ); - if (ret && bRedraw) RedrawWindow( hwnd, NULL, 0, RDW_FRAME | RDW_INVALIDATE | RDW_ERASE ); + if (ret) + { + UINT swp_flags = SWP_NOSIZE|SWP_NOMOVE|SWP_NOZORDER|SWP_NOACTIVATE|SWP_FRAMECHANGED; + if (hrgn) swp_flags |= SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE; + if (!bRedraw) swp_flags |= SWP_NOREDRAW; + SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); + } return ret; }

1 0

Paul Vriens : crypt32: Input parameter checking.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: c8da5149d0c14efc3d30f2bb25e44d65a1cdb6e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8da5149d0c14efc3d30f2bb2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Oct 30 12:10:37 2006 +0100 crypt32: Input parameter checking. --- dlls/crypt32/sip.c | 7 +++++++ dlls/crypt32/tests/sip.c | 15 ++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 8fe4b07..87fcc07 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -383,6 +383,13 @@ BOOL WINAPI CryptSIPLoad (const GUID *pgSubject, DWORD dwFlags, SIP_DISPATCH_INFO *pSipDispatch) { FIXME("(%s %d %p) stub!\n", debugstr_guid(pgSubject), dwFlags, pSipDispatch); + + if (!pgSubject || dwFlags != 0 || !pSipDispatch) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return FALSE; } diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 231b852..e34221f 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -272,17 +272,15 @@ static void test_SIPLoad(void) SetLastError(0xdeadbeef); ret = CryptSIPLoad(NULL, 0, NULL); ok ( !ret, "Expected CryptSIPLoad to fail\n"); - todo_wine - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError()); /* Only pSipDispatch NULL */ SetLastError(0xdeadbeef); ret = CryptSIPLoad(&subject, 0, NULL); ok ( !ret, "Expected CryptSIPLoad to fail\n"); - todo_wine - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError()); /* No NULLs, but nonexistent pgSubject */ SetLastError(0xdeadbeef); @@ -405,9 +403,8 @@ static void test_SIPLoad(void) sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; ret = CryptSIPLoad(&unknown, 1, &sdi); ok ( !ret, "Expected CryptSIPLoad to fail\n"); - todo_wine - ok ( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError()); + ok ( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError()); ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n"); }

1 0

Dmitry Timoshkov : user32: Add a test for CreateWindow/ DestroyWindow behaviour with WS_CHILD | WS_POPUP style, make it pass under Wine.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 5b43d41a2b6429384930ab3ac3e152d42a13160b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b43d41a2b6429384930ab3ac… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 30 16:41:24 2006 +0800 user32: Add a test for CreateWindow/DestroyWindow behaviour with WS_CHILD | WS_POPUP style, make it pass under Wine. --- dlls/user/tests/win.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/user/win.c | 7 ++-- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 9d8ae6c..6821832 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -3712,6 +3712,7 @@ #define expect_ex_style(window, ex_style SetLastError(0xdeadbeef); ok(IsMenu(hmenu), "IsMenu error %d\n", GetLastError()); + /* WS_CHILD */ SetLastError(0xdeadbeef); hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD, 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); @@ -3748,6 +3749,7 @@ #define expect_ex_style(window, ex_style expect_ex_style(hwnd, WS_EX_WINDOWEDGE); DestroyWindow(hwnd); + /* WS_POPUP */ SetLastError(0xdeadbeef); hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, 0, 0, 100, 100, parent, hmenu, 0, NULL); @@ -3777,12 +3779,12 @@ #define expect_ex_style(window, ex_style hmenu = CreateMenu(); assert(hmenu != 0); SetLastError(0xdeadbeef); - hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_POPUP, + hwnd = CreateWindowEx(0, "static", NULL, WS_POPUP, 0, 0, 100, 100, parent, hmenu, 0, NULL); ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError()); expect_menu(hwnd, hmenu); expect_style(hwnd, WS_POPUP | WS_CLIPSIBLINGS); - expect_ex_style(hwnd, WS_EX_APPWINDOW); + expect_ex_style(hwnd, 0); DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); @@ -3802,20 +3804,87 @@ #define expect_ex_style(window, ex_style ok(!IsMenu(hmenu), "IsMenu should fail\n"); ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + /* WS_CHILD | WS_POPUP */ + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(!hwnd, "CreateWindowEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + hmenu = CreateMenu(); assert(hmenu != 0); SetLastError(0xdeadbeef); - hwnd = CreateWindowEx(0, "static", NULL, WS_POPUP, + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP, 0, 0, 100, 100, parent, hmenu, 0, NULL); ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError()); expect_menu(hwnd, hmenu); - expect_style(hwnd, WS_POPUP | WS_CLIPSIBLINGS); + expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, WS_EX_APPWINDOW); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(!hwnd, "CreateWindowEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + + hmenu = CreateMenu(); + assert(hmenu != 0); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(WS_EX_APPWINDOW, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_POPUP, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(!hwnd, "CreateWindowEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + + hmenu = CreateMenu(); + assert(hmenu != 0); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_POPUP, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CLIPSIBLINGS); expect_ex_style(hwnd, 0); DestroyWindow(hwnd); SetLastError(0xdeadbeef); ok(!IsMenu(hmenu), "IsMenu should fail\n"); ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION, + 0, 0, 100, 100, parent, (HMENU)1, 0, NULL); + ok(!hwnd, "CreateWindowEx should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + + hmenu = CreateMenu(); + assert(hmenu != 0); + SetLastError(0xdeadbeef); + hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_POPUP | WS_CAPTION, + 0, 0, 100, 100, parent, hmenu, 0, NULL); + ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError()); + expect_menu(hwnd, hmenu); + expect_style(hwnd, WS_CHILD | WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS); + expect_ex_style(hwnd, WS_EX_WINDOWEDGE); + DestroyWindow(hwnd); + SetLastError(0xdeadbeef); + ok(!IsMenu(hmenu), "IsMenu should fail\n"); + ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); + #undef expect_menu #undef expect_style #undef expect_ex_style diff --git a/dlls/user/win.c b/dlls/user/win.c index 6eac41c..d355a13 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -626,7 +626,8 @@ LRESULT WIN_DestroyWindow( HWND hwnd ) /* free resources associated with the window */ if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0; - if (!(wndPtr->dwStyle & WS_CHILD)) menu = (HMENU)wndPtr->wIDmenu; + if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) + menu = (HMENU)wndPtr->wIDmenu; sys_menu = wndPtr->hSysMenu; WIN_ReleasePtr( wndPtr ); @@ -1012,7 +1013,7 @@ static HWND WIN_CreateWindowEx( CREATEST * It affects only the style loaded into the WIN structure. */ - if (!(wndPtr->dwStyle & WS_CHILD)) + if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) { wndPtr->dwStyle |= WS_CLIPSIBLINGS; if (!(wndPtr->dwStyle & WS_POPUP)) @@ -1048,7 +1049,7 @@ static HWND WIN_CreateWindowEx( CREATEST /* Set the window menu */ - if (!(wndPtr->dwStyle & WS_CHILD)) + if ((wndPtr->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) { if (cs->hMenu) {

1 0

lostwages/ wwn/wn20060526_314.xml wwn/wn200605 ...
by Alexandre Julliard 30 Oct '06

30 Oct '06

ChangeSet ID: 29369 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2006/10/30 11:44:43 Modified files: wwn : wn20060526_314.xml wn20060515_313.xml wn20060402_310.xml wn20060324_309.xml wn20060305_307.xml wn20060122_303.xml wn20051223_302.xml wn20051211_301.xml wn20051125_299.xml wn20050114_257.xml wn20041203_251.xml wn20041022_245.xml wn20040917_240.xml wn20040820_236.xml wn20040723_232.xml news : 2006102901.xml 2006102501.xml 2006100201.xml 2006091301.xml 2006083101.xml 2006081002.xml 2006072701.xml 2006071002.xml 2006062101.xml 2006060801.xml 2006052401.xml 2006051201.xml 2006041301.xml 2006033101.xml 2006031501.xml 2006030301.xml 2006021501.xml 2006020401.xml 2006012001.xml 2006010501.xml 2005122201.xml 2005121101.xml 2005112201.xml 2005110901.xml 2005093002.xml 2005083002.xml 2005072501.xml 2005062801.xml 2005052401.xml 2005041901.xml 2005031001.xml 2005021102.xml 2005011401.xml 2004120101.xml 2004102001.xml 2004091501.xml 2004081501.xml 2004072001.xml 2004061601.xml 2004051001.xml 2004041001.xml 2004030901.xml 2004021302.xml 2004012101.xml 2003121202.xml 2003111801.xml 2003101601.xml 2003091101.xml 2003081301.xml 2003071001.xml 2003061801.xml 2003050801.xml 2003040901.xml 2003031801.xml . : site Log message: Get the ANNOUNCE file from gitweb instead of cvsweb. This allows using the actual release number instead of the CVS revision. Patch: http://cvs.winehq.org/patch.py?id=29369 Old revision New revision Changes Path 1.4 1.5 +1 -1 lostwages/wwn/wn20060526_314.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20060515_313.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20060402_310.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20060324_309.xml 1.2 1.3 +2 -2 lostwages/wwn/wn20060305_307.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20060122_303.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20051223_302.xml 1.5 1.6 +1 -1 lostwages/wwn/wn20051211_301.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20051125_299.xml 1.2 1.3 +1 -1 lostwages/wwn/wn20050114_257.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20041203_251.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20041022_245.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20040917_240.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20040820_236.xml 1.3 1.4 +1 -1 lostwages/wwn/wn20040723_232.xml 1.1 1.2 +1 -1 lostwages/news/2006102901.xml 1.1 1.2 +1 -1 lostwages/news/2006102501.xml 1.2 1.3 +1 -1 lostwages/news/2006100201.xml 1.1 1.2 +1 -1 lostwages/news/2006091301.xml 1.1 1.2 +1 -1 lostwages/news/2006083101.xml 1.2 1.3 +1 -1 lostwages/news/2006081002.xml 1.2 1.3 +1 -1 lostwages/news/2006072701.xml 1.2 1.3 +1 -1 lostwages/news/2006071002.xml 1.2 1.3 +1 -1 lostwages/news/2006062101.xml 1.2 1.3 +1 -1 lostwages/news/2006060801.xml 1.1 1.2 +1 -1 lostwages/news/2006052401.xml 1.2 1.3 +1 -1 lostwages/news/2006051201.xml 1.1 1.2 +1 -1 lostwages/news/2006041301.xml 1.1 1.2 +1 -1 lostwages/news/2006033101.xml 1.1 1.2 +1 -1 lostwages/news/2006031501.xml 1.2 1.3 +1 -1 lostwages/news/2006030301.xml 1.1 1.2 +1 -1 lostwages/news/2006021501.xml 1.1 1.2 +1 -1 lostwages/news/2006020401.xml 1.1 1.2 +1 -1 lostwages/news/2006012001.xml 1.1 1.2 +1 -1 lostwages/news/2006010501.xml 1.1 1.2 +1 -1 lostwages/news/2005122201.xml 1.1 1.2 +1 -1 lostwages/news/2005121101.xml 1.1 1.2 +1 -1 lostwages/news/2005112201.xml 1.2 1.3 +1 -1 lostwages/news/2005110901.xml 1.1 1.2 +1 -1 lostwages/news/2005093002.xml 1.1 1.2 +1 -1 lostwages/news/2005083002.xml 1.2 1.3 +1 -1 lostwages/news/2005072501.xml 1.1 1.2 +1 -1 lostwages/news/2005062801.xml 1.2 1.3 +1 -1 lostwages/news/2005052401.xml 1.1 1.2 +1 -1 lostwages/news/2005041901.xml 1.1 1.2 +1 -1 lostwages/news/2005031001.xml 1.2 1.3 +1 -1 lostwages/news/2005021102.xml 1.1 1.2 +1 -1 lostwages/news/2005011401.xml 1.1 1.2 +1 -1 lostwages/news/2004120101.xml 1.1 1.2 +1 -1 lostwages/news/2004102001.xml 1.1 1.2 +1 -1 lostwages/news/2004091501.xml 1.2 1.3 +1 -1 lostwages/news/2004081501.xml 1.2 1.3 +1 -1 lostwages/news/2004072001.xml 1.2 1.3 +1 -1 lostwages/news/2004061601.xml 1.2 1.3 +1 -1 lostwages/news/2004051001.xml 1.1 1.2 +1 -1 lostwages/news/2004041001.xml 1.1 1.2 +1 -1 lostwages/news/2004030901.xml 1.1 1.2 +1 -1 lostwages/news/2004021302.xml 1.2 1.3 +1 -1 lostwages/news/2004012101.xml 1.2 1.3 +1 -1 lostwages/news/2003121202.xml 1.2 1.3 +1 -1 lostwages/news/2003111801.xml 1.2 1.3 +1 -1 lostwages/news/2003101601.xml 1.1 1.2 +1 -1 lostwages/news/2003091101.xml 1.1 1.2 +2 -2 lostwages/news/2003081301.xml 1.2 1.3 +1 -1 lostwages/news/2003071001.xml 1.2 1.3 +1 -1 lostwages/news/2003061801.xml 1.1 1.2 +1 -1 lostwages/news/2003050801.xml 1.1 1.2 +1 -1 lostwages/news/2003040901.xml 1.1 1.2 +1 -1 lostwages/news/2003031801.xml 1.9 1.10 +2 -2 lostwages/site

1 0