November 2006 - Wine-Commits

Detlef Riekenberg : winspool/tests: Add tests for EnumPorts.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: d3a1737dac0afdf9cedde6672e5d91f17648e09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3a1737dac0afdf9cedde6672… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Nov 4 00:28:08 2006 +0100 winspool/tests: Add tests for EnumPorts. --- dlls/winspool.drv/tests/info.c | 100 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index bf77e89..ed11765 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -619,6 +619,105 @@ static void test_EnumMonitors(void) } /* for(level ... */ } +/* ########################### */ + +static void test_EnumPorts(void) +{ + DWORD res; + DWORD level; + LPBYTE buffer; + DWORD cbBuf; + DWORD pcbNeeded; + DWORD pcReturned; + + /* valid levels are 1 and 2 */ + for(level = 0; level < 4; level++) { + + cbBuf = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPortsA(NULL, level, NULL, 0, &cbBuf, &pcReturned); + RETURN_ON_DEACTIVATED_SPOOLER(res) + + /* use only a short test, when we test with an invalid level */ + if(!level || (level > 2)) { + /* NT: ERROR_INVALID_LEVEL, 9x: success */ + ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || + (res && (pcReturned == 0)), + "(%d) returned %d with %d and 0x%08x (expected '0' with " \ + "ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", + level, res, GetLastError(), pcReturned); + continue; + } + + + /* Level 2 is not supported on NT 3.x */ + if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { + trace("Level %d not supported, skipping tests\n", level); + continue; + } + + ok((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%d) returned %d with %d (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf *2); + if (buffer == NULL) continue; + + pcbNeeded = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPortsA(NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "(%d) returned %d with %d (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + /* ToDo: Compare the returned Data with the Registry / "win.ini",[Ports] here */ + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPortsA(NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok(res, "(%d) returned %d with %d (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + + pcbNeeded = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPortsA(NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%d) returned %d with %d (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + + /* + Do not add this test: + res = EnumPortsA(NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); + w2k+: RPC_X_NULL_REF_POINTER + NT3.5: ERROR_INVALID_USER_BUFFER + win9x: crash in winspool.drv + */ + + SetLastError(0xdeadbeef); + res = EnumPorts(NULL, level, buffer, cbBuf, NULL, &pcReturned); + /* NT: RPC_X_NULL_REF_POINTER (1780), 9x: success */ + ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER) ) || + ( res && (GetLastError() == ERROR_SUCCESS) ), + "(%d) returned %d with %d (expected '0' with " \ + "RPC_X_NULL_REF_POINTER or '!=0' with NO_ERROR)\n", + level, res, GetLastError()); + + + SetLastError(0xdeadbeef); + res = EnumPorts(NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + /* NT: RPC_X_NULL_REF_POINTER (1780), 9x: success */ + ok( (!res && (GetLastError() == RPC_X_NULL_REF_POINTER) ) || + ( res && (GetLastError() == ERROR_SUCCESS) ), + "(%d) returned %d with %d (expected '0' with " \ + "RPC_X_NULL_REF_POINTER or '!=0' with NO_ERROR)\n", + level, res, GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); + } +} + +/* ########################### */ static void test_GetDefaultPrinter(void) { @@ -1413,6 +1512,7 @@ START_TEST(info) test_EnumForms(NULL); if (default_printer) test_EnumForms(default_printer); test_EnumMonitors(); + test_EnumPorts(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory(); test_GetPrintProcessorDirectory();

1 0

Detlef Riekenberg : winspool: Implement EnumPortsA.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: ecce2d898b8f3aebe350d35b9a6f7904c3bb8a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecce2d898b8f3aebe350d35b9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Nov 4 00:27:31 2006 +0100 winspool: Implement EnumPortsA. --- dlls/winspool.drv/info.c | 232 +++++++++++++++++++++------------------------- 1 files changed, 107 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecce2d898b8f3aebe350d…

1 0

Detlef Riekenberg : winspool: Implement EnumPortsW.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 412acdeb79d4731b62fea9699510954c25042fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412acdeb79d4731b62fea9699… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Nov 4 00:27:16 2006 +0100 winspool: Implement EnumPortsW. --- dlls/winspool.drv/info.c | 221 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 213 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 735662b..9f2f236 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -98,6 +98,10 @@ typedef struct { HMODULE hdll; DWORD refcount; DWORD dwMonitorSize; + LPPORT_INFO_2W cache; /* cached PORT_INFO_2W data */ + DWORD pi1_needed; /* size for PORT_INFO_1W */ + DWORD pi2_needed; /* size for PORT_INFO_2W */ + DWORD returned; /* number of cached PORT_INFO_2W - entries */ } monitor_t; typedef struct { @@ -863,6 +867,26 @@ static void monitor_unload(monitor_t * p } /****************************************************************** + * monitor_unloadall [internal] + * + * release all printmonitors and unload them from memory, when needed + */ + +static void monitor_unloadall(void) +{ + monitor_t * pm; + monitor_t * next; + + EnterCriticalSection(&monitor_handles_cs); + /* iterate through the list, with safety against removal */ + LIST_FOR_EACH_ENTRY_SAFE(pm, next, &monitor_handles, monitor_t, entry) + { + monitor_unload(pm); + } + LeaveCriticalSection(&monitor_handles_cs); +} + +/****************************************************************** * monitor_load [internal] * * load a printmonitor, get the dllname from the registry, when needed @@ -1014,6 +1038,134 @@ cleanup: } /****************************************************************** + * monitor_loadall [internal] + * + * Load all registered monitors + * + */ +static DWORD monitor_loadall(void) +{ + monitor_t * pm; + DWORD registered = 0; + DWORD loaded = 0; + HKEY hmonitors; + WCHAR buffer[MAX_PATH]; + DWORD id = 0; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hmonitors) == ERROR_SUCCESS) { + RegQueryInfoKeyW(hmonitors, NULL, NULL, NULL, &registered, NULL, NULL, + NULL, NULL, NULL, NULL, NULL); + + TRACE("%d monitors registered\n", registered); + + EnterCriticalSection(&monitor_handles_cs); + while (id < registered) { + buffer[0] = '\0'; + RegEnumKeyW(hmonitors, id, buffer, MAX_PATH); + pm = monitor_load(buffer, NULL); + if (pm) loaded++; + id++; + } + LeaveCriticalSection(&monitor_handles_cs); + RegCloseKey(hmonitors); + } + TRACE("%d monitors loaded\n", loaded); + return loaded; +} + +/****************************************************************** + * enumerate the local Ports from all loaded monitors (internal) + * + * returns the needed size (in bytes) for pPorts + * and *lpreturned is set to number of entries returned in pPorts + * + */ +static DWORD get_ports_from_all_monitors(DWORD level, LPBYTE pPorts, DWORD cbBuf, LPDWORD lpreturned) +{ + monitor_t * pm; + LPWSTR ptr; + LPPORT_INFO_2W cache; + LPPORT_INFO_2W out; + DWORD res; + DWORD cacheindex; + DWORD outindex = 0; + DWORD needed = 0; + DWORD numentries; + DWORD entrysize; + + + 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]; + + numentries = 0; + needed = 0; + + LIST_FOR_EACH_ENTRY(pm, &monitor_handles, monitor_t, entry) + { + if ((pm->monitor) && (pm->monitor->pfnEnumPorts)) { + if (pm->cache == NULL) { + res = pm->monitor->pfnEnumPorts(NULL, 2, NULL, 0, &(pm->pi2_needed), &(pm->returned)); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + pm->cache = HeapAlloc(GetProcessHeap(), 0, (pm->pi2_needed)); + res = pm->monitor->pfnEnumPorts(NULL, 2, (LPBYTE) pm->cache, pm->pi2_needed, &(pm->pi2_needed), &(pm->returned)); + } + TRACE("(%s) got %d with %d (cache need %d byte for %d entries)\n", + debugstr_w(pm->name), res, GetLastError(), pm->pi2_needed, pm->returned); + res = FALSE; + } + if (pm->cache && (level == 1) && (pm->pi1_needed == 0) && (pm->returned > 0)) { + cacheindex = 0; + cache = pm->cache; + while (cacheindex < (pm->returned)) { + pm->pi1_needed += sizeof(PORT_INFO_1W); + pm->pi1_needed += (lstrlenW(cache->pPortName) + 1) * sizeof(WCHAR); + cache++; + cacheindex++; + } + TRACE("%d byte for %d cached PORT_INFO_1W entries (%s)\n", + pm->pi1_needed, cacheindex, debugstr_w(pm->name)); + } + numentries += pm->returned; + needed += (level == 1) ? pm->pi1_needed : pm->pi2_needed; + + /* fill the buffer, if we have one */ + if (pPorts && (cbBuf >= needed )) { + cacheindex = 0; + cache = pm->cache; + while (cacheindex < pm->returned) { + out = (LPPORT_INFO_2W) &pPorts[outindex * entrysize]; + out->pPortName = ptr; + lstrcpyW(ptr, cache->pPortName); + ptr += (lstrlenW(ptr)+1); + if (level > 1) { + out->pMonitorName = ptr; + lstrcpyW(ptr, cache->pMonitorName); + ptr += (lstrlenW(ptr)+1); + + out->pDescription = ptr; + lstrcpyW(ptr, cache->pDescription); + ptr += (lstrlenW(ptr)+1); + out->fPortType = cache->fPortType; + out->Reserved = cache->Reserved; + } + cache++; + cacheindex++; + outindex++; + } + } + } + } + + *lpreturned = numentries; + TRACE("need %d byte for %d entries\n", needed, numentries); + return needed; +} + +/****************************************************************** * get_opened_printer_entry * Get the first place empty in the opened printer table * @@ -4685,16 +4837,69 @@ BOOL WINAPI EnumPortsA(LPSTR name,DWORD * Success: TRUE * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small * - * BUGS - * UNICODE-Version is a stub - * */ -BOOL WINAPI EnumPortsW(LPWSTR name,DWORD level,LPBYTE buffer,DWORD bufsize, - LPDWORD bufneeded,LPDWORD bufreturned) + +BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - FIXME("(%s,%d,%p,%d,%p,%p) - stub\n", - debugstr_w(name),level,buffer,bufsize,bufneeded,bufreturned); - return FALSE; + DWORD needed = 0; + DWORD numentries = 0; + BOOL res = FALSE; + + TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts, + cbBuf, pcbNeeded, pcReturned); + + if (pName && (pName[0])) { + FIXME("not implemented for Server %s\n", debugstr_w(pName)); + SetLastError(ERROR_ACCESS_DENIED); + goto emP_cleanup; + } + + /* Level is not checked in win9x */ + if (!Level || (Level > 2)) { + WARN("level (%d) is ignored in win9x\n", Level); + SetLastError(ERROR_INVALID_LEVEL); + goto emP_cleanup; + } + if (!pcbNeeded) { + SetLastError(RPC_X_NULL_REF_POINTER); + goto emP_cleanup; + } + + EnterCriticalSection(&monitor_handles_cs); + monitor_loadall(); + + /* Scan all local Ports */ + numentries = 0; + needed = get_ports_from_all_monitors(Level, NULL, 0, &numentries); + + /* we calculated the needed buffersize. now do the error-checks */ + if (cbBuf < needed) { + monitor_unloadall(); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto emP_cleanup_cs; + } + else if (!pPorts || !pcReturned) { + monitor_unloadall(); + SetLastError(RPC_X_NULL_REF_POINTER); + goto emP_cleanup_cs; + } + + /* Fill the Buffer */ + needed = get_ports_from_all_monitors(Level, pPorts, cbBuf, &numentries); + res = TRUE; + monitor_unloadall(); + +emP_cleanup_cs: + LeaveCriticalSection(&monitor_handles_cs); + +emP_cleanup: + if (pcbNeeded) *pcbNeeded = needed; + if (pcReturned) *pcReturned = (res) ? numentries : 0; + + TRACE("returning %d with %d (%d byte for %d of %d entries)\n", + (res), GetLastError(), needed, (res)? numentries : 0, numentries); + + return (res); } /******************************************************************************

1 0

Detlef Riekenberg : winspool: EnumPorts: Read driver from registry.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 0bd336a5733ea67091e3080b4a0ddfb2872a7511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd336a5733ea67091e3080b4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Nov 4 00:26:20 2006 +0100 winspool: EnumPorts: Read driver from registry. --- dlls/winspool.drv/info.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ced6498..735662b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -915,6 +915,18 @@ static monitor_t * monitor_load(LPWSTR n lstrcpyW(regroot, MonitorsW); lstrcatW(regroot, name); /* Get the Driver from the Registry */ + if (driver == NULL) { + HKEY hroot; + DWORD namesize; + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, regroot, &hroot) == ERROR_SUCCESS) { + if (RegQueryValueExW(hroot, DriverW, NULL, NULL, NULL, + &namesize) == ERROR_SUCCESS) { + driver = HeapAlloc(GetProcessHeap(), 0, namesize); + RegQueryValueExW(hroot, DriverW, NULL, NULL, (LPBYTE) driver, &namesize) ; + } + RegCloseKey(hroot); + } + } } pm->name = strdupW(name);

1 0

Damjan Jovanovic : winex11.drv: Added a basic client-side DIB copy optimization.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 54fd8b3d14a199084119488f20036bc6362e6cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=54fd8b3d14a199084119488f2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat Nov 4 09:54:59 2006 +0200 winex11.drv: Added a basic client-side DIB copy optimization. --- dlls/winex11.drv/bitblt.c | 95 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 61a3ad6..953e8a1 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -2,6 +2,7 @@ * GDI bit-blit operations * * Copyright 1993, 1994 Alexandre Julliard + * Copyright 2006 Damjan Jovanovic * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1526,6 +1527,93 @@ BOOL X11DRV_PatBlt( X11DRV_PDEVICE *phys /*********************************************************************** + * X11DRV_ClientSideDIBCopy + */ +static BOOL X11DRV_ClientSideDIBCopy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, + X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT width, INT height ) +{ + DIBSECTION srcDib, dstDib; + BYTE *srcPtr, *dstPtr; + INT bytesPerPixel; + INT bytesToCopy; + INT y; + static RECT unusedRect; + + if (GetObjectW(physDevSrc->bitmap->hbitmap, sizeof(srcDib), &srcDib) != sizeof(srcDib)) + return FALSE; + if (GetObjectW(physDevDst->bitmap->hbitmap, sizeof(dstDib), &dstDib) != sizeof(dstDib)) + return FALSE; + + /* check for oversized values, just like X11DRV_DIB_CopyDIBSection() */ + if (xSrc > srcDib.dsBm.bmWidth || ySrc > srcDib.dsBm.bmHeight) + return FALSE; + if (xSrc + width > srcDib.dsBm.bmWidth) + width = srcDib.dsBm.bmWidth - xSrc; + if (ySrc + height > srcDib.dsBm.bmHeight) + height = srcDib.dsBm.bmHeight - ySrc; + + if (GetRgnBox(physDevSrc->region, &unusedRect) == COMPLEXREGION || + GetRgnBox(physDevDst->region, &unusedRect) == COMPLEXREGION) + { + /* for simple regions, the clipping was already done by BITBLT_GetVisRectangles */ + FIXME("potential optimization: client-side complex region clipping\n"); + return FALSE; + } + if (dstDib.dsBm.bmBitsPixel <= 8) + { + FIXME("potential optimization: client-side color-index mode DIB copy\n"); + return FALSE; + } + if (!(srcDib.dsBmih.biCompression == BI_BITFIELDS && + dstDib.dsBmih.biCompression == BI_BITFIELDS && + !memcmp(srcDib.dsBitfields, dstDib.dsBitfields, 3*sizeof(DWORD))) + && !(srcDib.dsBmih.biCompression == BI_RGB && + dstDib.dsBmih.biCompression == BI_RGB)) + { + FIXME("potential optimization: client-side compressed DIB copy\n"); + return FALSE; + } + if (srcDib.dsBm.bmHeight < 0 || dstDib.dsBm.bmHeight < 0) + { + FIXME("potential optimization: client-side bottom-up DIB copy\n"); + return FALSE; + } + + switch (dstDib.dsBm.bmBitsPixel) + { + case 15: + case 16: + bytesPerPixel = 2; + break; + case 24: + bytesPerPixel = 3; + break; + case 32: + bytesPerPixel = 4; + break; + default: + FIXME("don't know how to work with a depth of %d\n", physDevSrc->depth); + return FALSE; + } + + bytesToCopy = width * bytesPerPixel; + + srcPtr = &physDevSrc->bitmap->base[ySrc*srcDib.dsBm.bmWidthBytes + xSrc*bytesPerPixel]; + dstPtr = &physDevDst->bitmap->base[yDst*dstDib.dsBm.bmWidthBytes + xDst*bytesPerPixel]; + + for (y = yDst; y < yDst + height; ++y) + { + memcpy(dstPtr, srcPtr, bytesToCopy); + srcPtr += srcDib.dsBm.bmWidthBytes; + dstPtr += dstDib.dsBm.bmWidthBytes; + } + + return TRUE; +} + + +/*********************************************************************** * X11DRV_BitBlt */ BOOL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, @@ -1587,7 +1675,12 @@ BOOL X11DRV_BitBlt( X11DRV_PDEVICE *phys height = visRectDst.bottom - visRectDst.top; if (sDst == DIB_Status_AppMod) { - FIXME("potential optimization - client-side DIB copy\n"); + result = X11DRV_ClientSideDIBCopy( physDevSrc, xSrc, ySrc, + physDevDst, xDst, yDst, + width, height ); + if (result) + goto END; + /* fall back to X server copying */ } X11DRV_CoerceDIBSection( physDevDst, DIB_Status_GdiMod, FALSE );

1 0

Alexandre Julliard : configure: Added missing DiskArbitration/ DiskArbitration.h check.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 66f45a5b7d94f05b51fd0c4920b2d27fd84ae9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f45a5b7d94f05b51fd0c492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 6 13:33:16 2006 +0100 configure: Added missing DiskArbitration/DiskArbitration.h check. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 4 ++++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 090aab8..2e0965e 100755 --- a/configure +++ b/configure @@ -7582,10 +7582,12 @@ done + for ac_header in \ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ + DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/configure.ac b/configure.ac index ffa5f84..a4eb6c2 100644 --- a/configure.ac +++ b/configure.ac @@ -154,6 +154,7 @@ AC_CHECK_HEADERS(\ AudioUnit/AudioUnit.h \ Carbon/Carbon.h \ CoreAudio/CoreAudio.h \ + DiskArbitration/DiskArbitration.h \ IOKit/IOKitLib.h \ alsa/asoundlib.h \ arpa/inet.h \ diff --git a/include/config.h.in b/include/config.h.in index 8bba290..f26735d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -71,6 +71,10 @@ #undef HAVE_DBUS_DBUS_H /* Define to 1 if you have the <direct.h> header file. */ #undef HAVE_DIRECT_H +/* Define to 1 if you have the <DiskArbitration/DiskArbitration.h> header + file. */ +#undef HAVE_DISKARBITRATION_DISKARBITRATION_H + /* Define to 1 if you have the `dladdr' function. */ #undef HAVE_DLADDR

1 0

Alexandre Julliard : loader: Update the reported version from the current git HEAD if available.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 5776a72361c00aba1cd170ca91e080fcf17bdc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5776a72361c00aba1cd170ca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 6 13:33:11 2006 +0100 loader: Update the reported version from the current git HEAD if available. --- loader/.gitignore | 2 ++ loader/Makefile.in | 12 +++++++++--- loader/main.c | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/loader/.gitignore b/loader/.gitignore index e3e92e4..677df33 100644 --- a/loader/.gitignore +++ b/loader/.gitignore @@ -1,3 +1,5 @@ +/version-stamp +/version.c /wine /wine-glibc /wine-kthread diff --git a/loader/Makefile.in b/loader/Makefile.in index 9cb6ba6..94c2428 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -11,8 +11,8 @@ C_SRCS = \ preloader.c \ pthread.c -KTHREAD_OBJS = kthread.o main.o -PTHREAD_OBJS = pthread.o main.o +KTHREAD_OBJS = kthread.o main.o version.o +PTHREAD_OBJS = pthread.o main.o version.o MAIN_BINARY = @MAIN_BINARY@ EXTRA_BINARIES = @EXTRA_BINARIES@ @@ -58,6 +58,12 @@ uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/wine.$(prog_manext) clean:: - $(RM) $(WINE_BINARIES) $(MODULE) + $(RM) $(WINE_BINARIES) $(MODULE) version.c version-stamp + +version-stamp: dummy + (GIT_DIR=$(TOPSRCDIR)/.git git describe 2>/dev/null || echo "wine-(a)PACKAGE_VERSION@") | sed -e 's/$.*$/const char wine_version[] = "\1";/' >$@ || ($(RM) $@ && exit 1) + +version.c: version-stamp + @cmp -s version-stamp $@ || cp version-stamp $@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/loader/main.c b/loader/main.c index dd5d769..5e0f330 100644 --- a/loader/main.c +++ b/loader/main.c @@ -68,7 +68,7 @@ #endif /* __APPLE__ */ */ static void check_command_line( int argc, char *argv[] ) { - static const char version[] = PACKAGE_STRING; + extern const char wine_version[]; static const char usage[] = "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" " wine --help Display this help and exit\n" @@ -86,7 +86,7 @@ static void check_command_line( int argc } if (!strcmp( argv[1], "--version" )) { - printf( "%s\n", version ); + printf( "%s\n", wine_version ); exit(0); } }

1 0

Alexandre Julliard : ntdll: Moved command-line help to the loader binary.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: bda2832d8d95ac7271b241c5749cdcd54aa5265e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda2832d8d95ac7271b241c57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 6 13:04:56 2006 +0100 ntdll: Moved command-line help to the loader binary. --- dlls/ntdll/loader.c | 32 -------------------------------- loader/main.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7e0b43a..87767e5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2319,37 +2319,6 @@ void __wine_init_windows_dir( const WCHA /*********************************************************************** - * check_command_line - * - * Check if command line is one that needs to be handled specially. - */ -static void check_command_line( int argc, char *argv[] ) -{ - static const char version[] = PACKAGE_STRING "\n"; - static const char usage[] = - "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" - " wine --help Display this help and exit\n" - " wine --version Output version information and exit\n"; - - if (argc <= 1) - { - write( 2, usage, sizeof(usage) - 1 ); - exit(1); - } - if (!strcmp( argv[1], "--help" )) - { - write( 1, usage, sizeof(usage) - 1 ); - exit(0); - } - if (!strcmp( argv[1], "--version" )) - { - write( 1, version, sizeof(version) - 1 ); - exit(0); - } -} - - -/*********************************************************************** * __wine_process_init */ void __wine_process_init(void) @@ -2362,7 +2331,6 @@ void __wine_process_init(void) void (* DECLSPEC_NORETURN init_func)(void); extern mode_t FILE_umask; - check_command_line( __wine_main_argc, __wine_main_argv ); main_exe_file = thread_init(); /* retrieve current umask */ diff --git a/loader/main.c b/loader/main.c index 5000add..dd5d769 100644 --- a/loader/main.c +++ b/loader/main.c @@ -61,6 +61,37 @@ static inline void reserve_area( void *a #endif /* __APPLE__ */ +/*********************************************************************** + * check_command_line + * + * Check if command line is one that needs to be handled specially. + */ +static void check_command_line( int argc, char *argv[] ) +{ + static const char version[] = PACKAGE_STRING; + static const char usage[] = + "Usage: wine PROGRAM [ARGUMENTS...] Run the specified program\n" + " wine --help Display this help and exit\n" + " wine --version Output version information and exit"; + + if (argc <= 1) + { + fprintf( stderr, "%s\n", usage ); + exit(1); + } + if (!strcmp( argv[1], "--help" )) + { + printf( "%s\n", usage ); + exit(0); + } + if (!strcmp( argv[1], "--version" )) + { + printf( "%s\n", version ); + exit(0); + } +} + + /********************************************************************** * main */ @@ -69,6 +100,7 @@ int main( int argc, char *argv[] ) char error[1024]; int i; + check_command_line( argc, argv ); if (wine_main_preload_info) { for (i = 0; wine_main_preload_info[i].size; i++)

1 0

Alexandre Julliard : msi: Fixed definition of the MSIITERHANDLE type.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 36c4ec8f33d2d4493b0fc25e3d2f298383464555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c4ec8f33d2d4493b0fc25e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 6 13:02:47 2006 +0100 msi: Fixed definition of the MSIITERHANDLE type. --- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2e4f5d2..8fe25d6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -109,7 +109,7 @@ typedef struct tagMSIRECORD MSIFIELD fields[1]; /* nb. array size is count+1 */ } MSIRECORD; -typedef void *MSIITERHANDLE; +typedef const struct tagMSICOLUMNHASHENTRY *MSIITERHANDLE; typedef struct tagMSIVIEWOPS { diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 2282f08..c66048a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1587,12 +1587,12 @@ static UINT TABLE_find_matching_rows( st if( !*handle ) entry = tv->columns[col-1].hash_table[val % MSITABLE_HASH_TABLE_SIZE]; else - entry = ((const MSICOLUMNHASHENTRY *)*handle)->next; + entry = (*handle)->next; while (entry && entry->value != val) entry = entry->next; - *handle = (MSIITERHANDLE)entry; + *handle = entry; if (!entry) return ERROR_NO_MORE_ITEMS;

1 0

Damjan Jovanovic : icmp: Changed select to poll.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 0cc74835b9ec45cdcfc49eb4f98e4621e04dc21a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc74835b9ec45cdcfc49eb4f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Nov 6 08:29:27 2006 +0200 icmp: Changed select to poll. --- dlls/icmp/icmp_main.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/icmp/icmp_main.c b/dlls/icmp/icmp_main.c index b463a82..31bd0c1 100644 --- a/dlls/icmp/icmp_main.c +++ b/dlls/icmp/icmp_main.c @@ -61,6 +61,9 @@ #endif #ifdef HAVE_ARPA_INET_H # include <arpa/inet.h> #endif +#ifdef HAVE_SYS_POLL_H +# include <sys/poll.h> +#endif #include "windef.h" #include "winbase.h" @@ -209,8 +212,7 @@ DWORD WINAPI IcmpSendEcho( char* endbuf; int ip_header_len; int maxlen; - fd_set fdr; - struct timeval timeout; + struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; unsigned int addrlen; @@ -291,10 +293,8 @@ DWORD WINAPI IcmpSendEcho( /* Get ready for receiving the reply * Do it before we send the request to minimize the risk of introducing delays */ - FD_ZERO(&fdr); - FD_SET(icp->sid,&fdr); - timeout.tv_sec=Timeout/1000; - timeout.tv_usec=(Timeout % 1000)*1000; + fdr.fd = icp->sid; + fdr.events = POLLIN; addrlen=sizeof(addr); ier=ReplyBuffer; ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); @@ -338,7 +338,7 @@ #endif /* Get the reply */ ip_header_len=0; /* because gcc was complaining */ - while ((res=select(icp->sid+1,&fdr,NULL,NULL,&timeout))>0) { + while ((res=poll(&fdr,1,Timeout))>0) { recv_time = GetTickCount(); res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); @@ -433,10 +433,8 @@ #endif * Decrease the timeout so that we don't enter an endless loop even * if we get flooded with ICMP packets that are not for us. */ - int t = Timeout - (recv_time - send_time); - if (t < 0) t = 0; - timeout.tv_sec = t / 1000; - timeout.tv_usec = (t % 1000) * 1000; + Timeout -= (recv_time - send_time); + if (Timeout < 0) Timeout = 0; continue; } else { /* This is a reply to our packet */ @@ -467,11 +465,8 @@ #endif maxlen=endbuf-(char*)ip_header; /* Check out whether there is more but don't wait this time */ - timeout.tv_sec=0; - timeout.tv_usec=0; + Timeout=0; } - FD_ZERO(&fdr); - FD_SET(icp->sid,&fdr); } res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0)

1 0