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

Huw Davies : gdi32: Fix return values in BitBlt/StretchBlt.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: 7f8ad07ee0c482802e8e44c3dc0a5bb1ecbf469c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f8ad07ee0c482802e8e44c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 18 22:12:15 2006 +0100 gdi32: Fix return values in BitBlt/StretchBlt. --- dlls/gdi/bitblt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/bitblt.c b/dlls/gdi/bitblt.c index 25053e6..0d78465 100644 --- a/dlls/gdi/bitblt.c +++ b/dlls/gdi/bitblt.c @@ -112,7 +112,7 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst width, height, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); HeapFree(GetProcessHeap(), 0, bits); - return (lines == bm.bmHeight); + return (lines == height); } else if(dcDst) GDI_ReleaseObj( hdcDst ); @@ -190,7 +190,7 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT widthSrc, heightSrc, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); HeapFree(GetProcessHeap(), 0, bits); - return (lines == bm.bmHeight); + return (lines == heightSrc); } else if(dcDst) GDI_ReleaseObj( hdcDst );

1 0

Mike McCormack : ntdll: Stub implementations of NtCreateIoCompletion, NtSetIoCompletion, and NtRemoveIoCompletion.
by Alexandre Julliard April 19, 2006

April 19, 2006

Module: wine Branch: refs/heads/master Commit: 9aa468d884759a56224c58d0c6cd141113834616 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9aa468d884759a56224c58d… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 17:26:11 2006 +0900 ntdll: Stub implementations of NtCreateIoCompletion, NtSetIoCompletion, and NtRemoveIoCompletion. Based on a patch by Rob Shearman. --- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/sync.c | 26 ++++++++++++++++++++++++++ include/winternl.h | 10 ++++++++-- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9a6de16..38ded31 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -124,7 +124,7 @@ # @ stub NtCreateDebugObject @ stdcall NtCreateEvent(long long long long long) @ stub NtCreateEventPair @ stdcall NtCreateFile(ptr long ptr ptr long long long ptr long long ptr) -@ stub NtCreateIoCompletion +@ stdcall NtCreateIoCompletion(ptr long ptr long) # @ stub NtCreateJobObject # @ stub NtCreateJobSet @ stdcall NtCreateKey(ptr long ptr long ptr long long) @@ -285,7 +285,7 @@ # @ stub NtReleaseKeyedEvent @ stdcall NtReleaseMutant(long ptr) @ stub NtReleaseProcessMutant @ stdcall NtReleaseSemaphore(long long ptr) -@ stub NtRemoveIoCompletion +@ stdcall NtRemoveIoCompletion(ptr ptr ptr ptr ptr) # @ stub NtRemoveProcessDebug # @ stub NtRenameKey @ stdcall NtReplaceKey(ptr long ptr) @@ -328,7 +328,7 @@ # @ stub NtSetInformationJobObject @ stdcall NtSetInformationThread(long long ptr long) @ stdcall NtSetInformationToken(long long ptr long) @ stdcall NtSetIntervalProfile(long long) -@ stub NtSetIoCompletion +@ stdcall NtSetIoCompletion(ptr long ptr long long) @ stub NtSetLdtEntries @ stub NtSetLowEventPair @ stub NtSetLowWaitHighEventPair diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 3cf448f..eb4341b 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -842,3 +842,29 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEA } return STATUS_SUCCESS; } + +NTSTATUS WINAPI NtCreateIoCompletion( PHANDLE CompletionPort, ACCESS_MASK DesiredAccess, + POBJECT_ATTRIBUTES ObjectAttributes, ULONG NumberOfConcurrentThreads ) +{ + FIXME("(%p, %lx, %p, %ld)\n", CompletionPort, DesiredAccess, + ObjectAttributes, NumberOfConcurrentThreads); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI NtSetIoCompletion( HANDLE CompletionPort, ULONG_PTR CompletionKey, + PIO_STATUS_BLOCK iosb, ULONG NumberOfBytesTransferred, + ULONG NumberOfBytesToTransfer ) +{ + FIXME("(%p, %lx, %p, %ld, %ld)\n", CompletionPort, CompletionKey, + iosb, NumberOfBytesTransferred, NumberOfBytesToTransfer); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI NtRemoveIoCompletion( HANDLE CompletionPort, PULONG_PTR CompletionKey, + PIO_STATUS_BLOCK iosb, PULONG OperationStatus, + PLARGE_INTEGER WaitTime ) +{ + FIXME("(%p, %p, %p, %p, %p)\n", CompletionPort, CompletionKey, + iosb, OperationStatus, WaitTime); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/winternl.h b/include/winternl.h index e3548d4..973f3e7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1848,7 +1848,7 @@ NTSTATUS WINAPI NtReadVirtualMemory(HAN NTSTATUS WINAPI NtRegisterThreadTerminatePort(HANDLE); NTSTATUS WINAPI NtReleaseMutant(HANDLE,PLONG); NTSTATUS WINAPI NtReleaseSemaphore(HANDLE,ULONG,PULONG); -NTSTATUS WINAPI NtRemoveIoCompletion(HANDLE,PULONG,PULONG,PIO_STATUS_BLOCK,PLARGE_INTEGER); +NTSTATUS WINAPI NtRemoveIoCompletion(HANDLE,PULONG_PTR,PIO_STATUS_BLOCK,PULONG,PLARGE_INTEGER); NTSTATUS WINAPI NtReplaceKey(POBJECT_ATTRIBUTES,HANDLE,POBJECT_ATTRIBUTES); NTSTATUS WINAPI NtReplyPort(HANDLE,PLPC_MESSAGE); NTSTATUS WINAPI NtReplyWaitReceivePort(HANDLE,PULONG,PLPC_MESSAGE,PLPC_MESSAGE); @@ -1877,7 +1877,7 @@ NTSTATUS WINAPI NtSetInformationProcess NTSTATUS WINAPI NtSetInformationThread(HANDLE,THREADINFOCLASS,LPCVOID,ULONG); NTSTATUS WINAPI NtSetInformationToken(HANDLE,TOKEN_INFORMATION_CLASS,PVOID,ULONG); NTSTATUS WINAPI NtSetIntervalProfile(ULONG,KPROFILE_SOURCE); -NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG,ULONG,NTSTATUS,ULONG); +NTSTATUS WINAPI NtSetIoCompletion(HANDLE,ULONG_PTR,PIO_STATUS_BLOCK,ULONG,ULONG); NTSTATUS WINAPI NtSetLdtEntries(ULONG,LDT_ENTRY,ULONG,LDT_ENTRY); NTSTATUS WINAPI NtSetLowEventPair(HANDLE); NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE); @@ -2331,6 +2331,12 @@ NTSTATUS WINAPI LdrQueryProcessModuleInf NTSTATUS WINAPI LdrUnloadDll(HMODULE); NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG); +typedef struct _FILE_COMPLETION_INFORMATION { + HANDLE CompletionPort; + ULONG_PTR CompletionKey; +} FILE_COMPLETION_INFORMATION; +typedef FILE_COMPLETION_INFORMATION *PFILE_COMPLETION_INFORMATION; + /* list manipulation macros */ #define InitializeListHead(le) (void)((le)->Flink = (le)->Blink = (le)) #define InsertHeadList(le,e) do { PLIST_ENTRY f = (le)->Flink; (e)->Flink = f; (e)->Blink = (le); f->Blink = (e); (le)->Flink = (e); } while (0)

1 0

Huw Davies : gdi32: Fix {Bit,Stretch}Blt fallbacks to StretchDIBits.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: bf23ad0da7430afe69d2aff2a2b0549c05458db9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bf23ad0da7430afe69d2aff… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 18 20:00:13 2006 +0100 gdi32: Fix {Bit,Stretch}Blt fallbacks to StretchDIBits. --- dlls/gdi/bitblt.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi/bitblt.c b/dlls/gdi/bitblt.c index 221fc6d..25053e6 100644 --- a/dlls/gdi/bitblt.c +++ b/dlls/gdi/bitblt.c @@ -108,8 +108,8 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst GetDIBits(hdcSrc, hbm, 0, bm.bmHeight, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS); SelectObject(hdcSrc, hbm); - lines = StretchDIBits(hdcDst, xDst, yDst, width, height, xSrc, ySrc, width, height, - bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); + lines = StretchDIBits(hdcDst, xDst, yDst, width, height, xSrc, bm.bmHeight - height - ySrc, + width, height, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); HeapFree(GetProcessHeap(), 0, bits); return (lines == bm.bmHeight); @@ -186,8 +186,8 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT GetDIBits(hdcSrc, hbm, 0, bm.bmHeight, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS); SelectObject(hdcSrc, hbm); - lines = StretchDIBits(hdcDst, xDst, yDst, widthDst, heightDst, xSrc, ySrc, widthSrc, heightSrc, - bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); + lines = StretchDIBits(hdcDst, xDst, yDst, widthDst, heightDst, xSrc, bm.bmHeight - heightSrc - ySrc, + widthSrc, heightSrc, bits, (BITMAPINFO*)&info_hdr, DIB_RGB_COLORS, rop); HeapFree(GetProcessHeap(), 0, bits); return (lines == bm.bmHeight);

1 0

Mikołaj Zalewski : comctl32: header: Remove the unused bUnicode.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: a49da0b719740f48f30b69602d2bced4cb8154a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a49da0b719740f48f30b696… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Apr 18 19:45:29 2006 +0200 comctl32: header: Remove the unused bUnicode. --- dlls/comctl32/header.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index d80441b..9f856cf 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -77,7 +77,6 @@ typedef struct BOOL bCaptured; /* Is the mouse captured? */ BOOL bPressed; /* Is a header item pressed (down)? */ BOOL bTracking; /* Is in tracking mode? */ - BOOL bUnicode; /* Unicode flag */ INT iMoveItem; /* index of tracked item. (Tracking mode) */ INT xTrackOffset; /* distance between the right side of the tracked item and the cursor */ INT xOldTrack; /* track offset (see above) after the last WM_MOUSEMOVE */ @@ -170,7 +169,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT HTHEME theme = GetWindowTheme (hwnd); NMCUSTOMDRAW nmcd; - TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, infoPtr->bUnicode); + TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, (infoPtr->nNotifyFormat == NFR_UNICODE)); if (!infoPtr->bRectsValid) HEADER_SetItemBounds(hwnd); @@ -1292,7 +1291,6 @@ HEADER_Create (HWND hwnd, WPARAM wParam, infoPtr->iMoveItem = 0; infoPtr->himl = 0; infoPtr->iHotItem = -1; - infoPtr->bUnicode = IsWindowUnicode (hwnd); infoPtr->iMargin = 3*GetSystemMetrics(SM_CXEDGE); infoPtr->nNotifyFormat = SendMessageW (infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);

1 0

Mikołaj Zalewski : comctl32: header: Correct WM_[GS] ETUNICODEFORMAT.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 7a7f80e9d100bb3e7837c7cac8b45740c16098a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a7f80e9d100bb3e7837c7c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Apr 18 19:44:09 2006 +0200 comctl32: header: Correct WM_[GS]ETUNICODEFORMAT. --- dlls/comctl32/header.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ed235e8..d80441b 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -947,7 +947,7 @@ inline static LRESULT HEADER_GetUnicodeFormat (HWND hwnd) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - return infoPtr->bUnicode; + return (infoPtr->nNotifyFormat == NFR_UNICODE); } @@ -1259,9 +1259,9 @@ inline static LRESULT HEADER_SetUnicodeFormat (HWND hwnd, WPARAM wParam) { HEADER_INFO *infoPtr = HEADER_GetInfoPtr (hwnd); - BOOL bTemp = infoPtr->bUnicode; + BOOL bTemp = (infoPtr->nNotifyFormat == NFR_UNICODE); - infoPtr->bUnicode = (BOOL)wParam; + infoPtr->nNotifyFormat = ((BOOL)wParam ? NFR_UNICODE : NFR_ANSI); return bTemp; }

1 0

Mike McCormack : msi: Clean up memset usage.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 3a94011ab65fc87dc7f8d6788bfec4bc4d6c3d7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a94011ab65fc87dc7f8d67… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 02:29:03 2006 +0900 msi: Clean up memset usage. --- dlls/msi/action.c | 11 ++++------- dlls/msi/classes.c | 3 +-- dlls/msi/msi.c | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 66d75f9..270e9ae 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -573,8 +573,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *pac MSI_SetPropertyW(package, szAction, szInstall); - package->script = msi_alloc(sizeof(MSISCRIPT)); - memset(package->script,0,sizeof(MSISCRIPT)); + package->script = msi_alloc_zero(sizeof(MSISCRIPT)); package->script->InWhatSequence = SEQUENCE_INSTALL; @@ -3383,7 +3382,7 @@ static UINT ACTION_PublishFeatures(MSIPA MSICOMPONENT* component = cl->component; WCHAR buf[21]; - memset(buf,0,sizeof(buf)); + buf[0] = 0; if (component->ComponentId) { TRACE("From %s\n",debugstr_w(component->ComponentId)); @@ -3914,8 +3913,7 @@ static LPWSTR load_ttfname_from(LPCWSTR ttRecord.uStringOffset + ttNTHeader.uStorageOffset, NULL, FILE_BEGIN); - buf = msi_alloc( ttRecord.uStringLength + 1 + strlen(tt) ); - memset(buf, 0, ttRecord.uStringLength + 1 + strlen(tt)); + buf = msi_alloc_zero( ttRecord.uStringLength + 1 + strlen(tt) ); ReadFile(handle, buf, ttRecord.uStringLength, &dwRead, NULL); if (strlen(buf) > 0) { @@ -4080,8 +4078,7 @@ static UINT ITERATE_PublishComponent(MSI sz+=3; sz *= sizeof(WCHAR); - output = msi_alloc(sz); - memset(output,0,sz); + output = msi_alloc_zero(sz); strcpyW(output,advertise); msi_free(advertise); diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 45bd616..743ac86 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1160,8 +1160,7 @@ static UINT register_verb(MSIPACKAGE *pa size += strlenW(verb->Argument); size += 4; - command = msi_alloc(size * sizeof (WCHAR)); - memset(command,0,size*sizeof(WCHAR)); + command = msi_alloc_zero(size * sizeof (WCHAR)); strcpyW(command,advertise); if (verb->Argument) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b2038a1..1c22ac3 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1891,29 +1891,29 @@ UINT WINAPI MsiReinstallFeatureW( LPCWST FIXME("%s %s %li\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); - memset(reinstallmode,0,sizeof(reinstallmode)); ptr = reinstallmode; if (dwReinstallMode & REINSTALLMODE_FILEMISSING) - { *ptr = 'p'; ptr++; } + *ptr++ = 'p'; if (dwReinstallMode & REINSTALLMODE_FILEOLDERVERSION) - { *ptr = 'o'; ptr++; } + *ptr++ = 'o'; if (dwReinstallMode & REINSTALLMODE_FILEEQUALVERSION) - { *ptr = 'w'; ptr++; } + *ptr++ = 'w'; if (dwReinstallMode & REINSTALLMODE_FILEEXACT) - { *ptr = 'd'; ptr++; } + *ptr++ = 'd'; if (dwReinstallMode & REINSTALLMODE_FILEVERIFY) - { *ptr = 'c'; ptr++; } + *ptr++ = 'c'; if (dwReinstallMode & REINSTALLMODE_FILEREPLACE) - { *ptr = 'a'; ptr++; } + *ptr++ = 'a'; if (dwReinstallMode & REINSTALLMODE_USERDATA) - { *ptr = 'u'; ptr++; } + *ptr++ = 'u'; if (dwReinstallMode & REINSTALLMODE_MACHINEDATA) - { *ptr = 'm'; ptr++; } + *ptr++ = 'm'; if (dwReinstallMode & REINSTALLMODE_SHORTCUT) - { *ptr = 's'; ptr++; } + *ptr++ = 's'; if (dwReinstallMode & REINSTALLMODE_PACKAGE) - { *ptr = 'v'; ptr++; } + *ptr++ = 'v'; + *ptr = 0; sz = sizeof(sourcepath); MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED,

1 0

Mike McCormack : msi: Fix a regression caused by some bad logic.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: edb58a6d0588b05307d187ae4155224d72814be6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edb58a6d0588b05307d187a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 02:29:33 2006 +0900 msi: Fix a regression caused by some bad logic. --- dlls/msi/classes.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 75a0ffa..45bd616 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -832,7 +832,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE static const WCHAR szInprocServer32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0}; HKEY hkey,hkey2,hkey3; - BOOL install_on_demand = FALSE; MSICLASS *cls; load_classes_and_such(package); @@ -863,9 +862,9 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE * yes. MSDN says that these are based on _Feature_ not on * Component. So verify the feature is to be installed */ - if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL ) || - !(install_on_demand && - ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED ))) + if (!ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_LOCAL )) + /* && !(install_on_demand && + ACTION_VerifyFeatureForAction( feature, INSTALLSTATE_ADVERTISED ))) */ { TRACE("Skipping class %s reg due to disabled feature %s\n", debugstr_w(cls->clsid),

1 0

Alexandre Julliard : explorer: Reuse drives that point to the same device to avoid memory leaks.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 67394207a9af5429758b53bd22ad0dbf6664f433 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67394207a9af5429758b53b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 21:12:43 2006 +0200 explorer: Reuse drives that point to the same device to avoid memory leaks. Also print a warning if HAL support is not compiled in. --- programs/explorer/hal.c | 95 ++++++++++++++++++++++++++--------------------- 1 files changed, 53 insertions(+), 42 deletions(-) diff --git a/programs/explorer/hal.c b/programs/explorer/hal.c index e2e7233..f604a8a 100644 --- a/programs/explorer/hal.c +++ b/programs/explorer/hal.c @@ -21,14 +21,11 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_LIBHAL - #include <assert.h> #include <errno.h> #include <stdarg.h> +#include <stdio.h> #include <sys/time.h> -#include <dbus/dbus.h> -#include <hal/libhal.h> #include "windef.h" #include "winbase.h" @@ -44,6 +41,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); +#ifdef HAVE_LIBHAL + +#include <dbus/dbus.h> +#include <hal/libhal.h> + struct dos_drive { struct list entry; @@ -142,7 +144,7 @@ static char *get_dosdevices_path(void) } /* find or create a DOS drive for the corresponding device */ -static int add_drive( const char *device, const char *mount_point, const char *type ) +static int add_drive( const char *device, const char *type ) { char *path, *p; char in_use[26]; @@ -189,7 +191,7 @@ static int add_drive( const char *device { in_use[drive] = 1; if (!S_ISBLK( drive_st.st_mode )) continue; - if (dev_st.st_rdev == drive_st.st_rdev) goto update_mount_point; + if (dev_st.st_rdev == drive_st.st_rdev) goto done; } } if (avail != -1) @@ -197,33 +199,39 @@ static int add_drive( const char *device /* try to use the one we found */ drive = avail; *p = 'a' + drive; - if (symlink( device, path ) != -1) goto update_mount_point; + if (symlink( device, path ) != -1) goto done; /* failed, retry the search */ } } - HeapFree( GetProcessHeap(), 0, path ); - return -1; + drive = -1; -update_mount_point: - p[2] = 0; - unlink( path ); - if (mount_point[0]) symlink( mount_point, path ); - WINE_TRACE( "added drive %c: dev %s at %s\n", - 'a' + drive, wine_dbgstr_a(device), wine_dbgstr_a(mount_point) ); +done: HeapFree( GetProcessHeap(), 0, path ); return drive; } -static void remove_drive( int drive ) +static void set_mount_point( struct dos_drive *drive, const char *mount_point ) { char *path, *p; + struct stat path_st, mnt_st; + if (drive->drive == -1) return; if (!(path = get_dosdevices_path())) return; p = path + strlen(path) - 3; - *p = 'a' + drive; + *p = 'a' + drive->drive; p[2] = 0; - unlink( path ); - /* we keep the device link around in case the device gets mounted again */ + + if (mount_point[0]) + { + /* try to avoid unlinking if already set correctly */ + if (stat( path, &path_st ) == -1 || stat( mount_point, &mnt_st ) == -1 || + path_st.st_dev != mnt_st.st_dev || path_st.st_ino != mnt_st.st_ino) + { + unlink( path ); + symlink( mount_point, path ); + } + } + else unlink( path ); HeapFree( GetProcessHeap(), 0, path ); } @@ -233,6 +241,12 @@ static void add_dos_device( const char * { struct dos_drive *drive; + /* first check if it already exists */ + LIST_FOR_EACH_ENTRY( drive, &drives_list, struct dos_drive, entry ) + { + if (!strcmp( udi, drive->udi )) goto found; + } + if (!(drive = HeapAlloc( GetProcessHeap(), 0, sizeof(*drive) ))) return; if (!(drive->udi = HeapAlloc( GetProcessHeap(), 0, strlen(udi)+1 ))) { @@ -240,24 +254,20 @@ static void add_dos_device( const char * return; } strcpy( drive->udi, udi ); + list_add_tail( &drives_list, &drive->entry ); - drive->drive = add_drive( device, mount_point, type ); - - if (drive->drive == -1) - { - HeapFree( GetProcessHeap(), 0, drive->udi ); - HeapFree( GetProcessHeap(), 0, drive ); - } - else +found: + drive->drive = add_drive( device, type ); + if (drive->drive != -1) { HKEY hkey; + set_mount_point( drive, mount_point ); + WINE_TRACE( "added device %c: udi %s for %s on %s type %s\n", 'a' + drive->drive, wine_dbgstr_a(udi), wine_dbgstr_a(device), wine_dbgstr_a(mount_point), wine_dbgstr_a(type) ); - list_add_tail( &drives_list, &drive->entry ); - /* hack: force the drive type in the registry */ if (!RegCreateKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) { @@ -276,18 +286,21 @@ static void remove_dos_device( struct do { HKEY hkey; - remove_drive( drive->drive ); - - /* clear the registry key too */ - if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) + if (drive->drive != -1) { - char name[3] = "a:"; - name[0] += drive->drive; - RegDeleteValueA( hkey, name ); - RegCloseKey( hkey ); - } + set_mount_point( drive, "" ); - send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); + /* clear the registry key too */ + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Drives", &hkey )) + { + char name[3] = "a:"; + name[0] += drive->drive; + RegDeleteValueA( hkey, name ); + RegCloseKey( hkey ); + } + + send_notify( drive->drive, DBT_DEVICEREMOVECOMPLETE ); + } list_remove( &drive->entry ); HeapFree( GetProcessHeap(), 0, drive->udi ); @@ -302,9 +315,6 @@ static void new_device( LibHalContext *c p_dbus_error_init( &error ); - if (!(mount_point = p_libhal_device_get_property_string( ctx, udi, "volume.mount_point", &error ))) - goto done; - if (!(device = p_libhal_device_get_property_string( ctx, udi, "block.device", &error ))) goto done; @@ -433,6 +443,7 @@ void initialize_hal(void) void initialize_hal(void) { + WINE_WARN( "HAL support not compiled in\n" ); } #endif /* HAVE_LIBHAL */

1 0

Mike McCormack : msi: Don't fall back to the folder' s parent if the folder doesn't exist.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 1da2fbce95fde8c2fffd099430ce746b9d59c468 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1da2fbce95fde8c2fffd099… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 19 02:28:05 2006 +0900 msi: Don't fall back to the folder's parent if the folder doesn't exist. --- dlls/msi/helpers.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 9eadcfd..6d3d7e3 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -380,17 +380,6 @@ LPWSTR resolve_folder(MSIPACKAGE *packag } } - /* try the parent folder's path */ - if (!path) - { - path = strdupW(p); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) - { - msi_free( path ); - path = NULL; - } - } - /* try the root of the install */ if (!path) path = get_source_root( package );

1 0

Alexandre Julliard : winebuild: Disable linking to external symbols by default.
by Alexandre Julliard April 18, 2006

April 18, 2006

Module: wine Branch: refs/heads/master Commit: 88bf4d61c3588753dd7741b8a851bd4d0f3ccde1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88bf4d61c3588753dd7741b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 20:49:29 2006 +0200 winebuild: Disable linking to external symbols by default. --- tools/winebuild/build.h | 2 ++ tools/winebuild/import.c | 21 +++++++++++++++++++-- tools/winebuild/main.c | 34 +++++++++++++++++++++------------- tools/winebuild/winebuild.man.in | 8 ++++++++ 4 files changed, 50 insertions(+), 15 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index c100b2c..a899a1e 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -85,6 +85,7 @@ typedef struct typedef struct { + char *src_name; /* file name of the source spec file */ char *file_name; /* file name of the dll */ char *dll_name; /* internal name of the dll */ char *init_func; /* initialization routine */ @@ -214,6 +215,7 @@ extern int display_warnings; extern int kill_at; extern int verbose; extern int save_temps; +extern int link_ext_symbols; extern char *input_file_name; extern char *spec_file_name; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 7eafe47..7f228e5 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -440,8 +440,25 @@ static void check_undefined_exports( DLL if (odp->flags & FLAG_FORWARD) continue; if (find_name( odp->link_name, &undef_symbols )) { - odp->flags |= FLAG_EXT_LINK; - add_name( &ext_link_imports, odp->link_name ); + switch(odp->type) + { + case TYPE_PASCAL: + case TYPE_STDCALL: + case TYPE_CDECL: + case TYPE_VARARGS: + if (link_ext_symbols) + { + odp->flags |= FLAG_EXT_LINK; + add_name( &ext_link_imports, odp->link_name ); + } + else error( "%s:%d: function '%s' not defined\n", + spec->src_name, odp->lineno, odp->link_name ); + break; + default: + error( "%s:%d: external symbol '%s' is not a function\n", + spec->src_name, odp->lineno, odp->link_name ); + break; + } } } } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 98da643..87625e9 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -47,6 +47,7 @@ int display_warnings = 0; int kill_at = 0; int verbose = 0; int save_temps = 0; +int link_ext_symbols = 0; #ifdef __i386__ enum target_cpu target_cpu = CPU_x86; @@ -246,8 +247,9 @@ static const char usage_str[] = " --as-cmd=AS Command to use for assembling (default: as)\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" -" -E, --export=FILE Export the symbols defined in the .spec or .def file\n" " -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" +" -E, --export=FILE Export the symbols defined in the .spec or .def file\n" +" --external-symbols Allow linking to external symbols\n" " -f FLAGS Compiler flags (only -fPIC is supported)\n" " -F, --filename=DLLFILE Set the DLL filename (default: from input file name)\n" " -h, --help Display this help message\n" @@ -285,6 +287,7 @@ enum long_options_values LONG_OPT_DEF, LONG_OPT_EXE, LONG_OPT_ASCMD, + LONG_OPT_EXTERNAL_SYMS, LONG_OPT_LDCMD, LONG_OPT_NMCMD, LONG_OPT_RELAY16, @@ -299,18 +302,19 @@ static const char short_options[] = "C:D static const struct option long_options[] = { - { "dll", 0, 0, LONG_OPT_DLL }, - { "def", 0, 0, LONG_OPT_DEF }, - { "exe", 0, 0, LONG_OPT_EXE }, - { "as-cmd", 1, 0, LONG_OPT_ASCMD }, - { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, - { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, - { "relay16", 0, 0, LONG_OPT_RELAY16 }, - { "relay32", 0, 0, LONG_OPT_RELAY32 }, - { "save-temps",0, 0, LONG_OPT_SAVE_TEMPS }, - { "subsystem",1, 0, LONG_OPT_SUBSYSTEM }, - { "target", 1, 0, LONG_OPT_TARGET }, - { "version", 0, 0, LONG_OPT_VERSION }, + { "dll", 0, 0, LONG_OPT_DLL }, + { "def", 0, 0, LONG_OPT_DEF }, + { "exe", 0, 0, LONG_OPT_EXE }, + { "as-cmd", 1, 0, LONG_OPT_ASCMD }, + { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, + { "ld-cmd", 1, 0, LONG_OPT_LDCMD }, + { "nm-cmd", 1, 0, LONG_OPT_NMCMD }, + { "relay16", 0, 0, LONG_OPT_RELAY16 }, + { "relay32", 0, 0, LONG_OPT_RELAY32 }, + { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, + { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, + { "target", 1, 0, LONG_OPT_TARGET }, + { "version", 0, 0, LONG_OPT_VERSION }, /* aliases for short options */ { "delay-lib", 1, 0, 'd' }, { "export", 1, 0, 'E' }, @@ -466,6 +470,9 @@ static char **parse_options( int argc, c case LONG_OPT_ASCMD: as_command = xstrdup( optarg ); break; + case LONG_OPT_EXTERNAL_SYMS: + link_ext_symbols = 1; + break; case LONG_OPT_LDCMD: ld_command = xstrdup( optarg ); break; @@ -554,6 +561,7 @@ static int parse_input_file( DLLSPEC *sp char *extension = strrchr( spec_file_name, '.' ); int result; + spec->src_name = xstrdup( input_file_name ); if (extension && !strcmp( extension, ".def" )) result = parse_def_file( input_file, spec ); else diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 78e10a2..3b6d0c7 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -85,6 +85,14 @@ Specify a .spec file (see \fBSPEC FILE S or a standard Windows .def file that defines the exports of the DLL or executable that is being built. .TP +.B \--external-symbols +Allow linking to external symbols directly from the spec +file. Normally symbols exported by a dll have to be defined in the dll +itself; this option makes it possible to use symbols defined in +another Unix library (for symbols defined in another dll, a +.I forward +specification must be used instead). +.TP .BI \-f\ flags Ignored for compatibility with the C compiler. .TP

1 0