February 2006 - Wine-commits

Alexandre Julliard : widl: Make sure the token variables are always initialized properly.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 0f2a642d70c200283d9d0fb8ca7307f06e12fab7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f2a642d70c200283d9d0fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 13:22:47 2006 +0100 widl: Make sure the token variables are always initialized properly. --- tools/widl/widl.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 02e7eee..765fe06 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -132,6 +132,15 @@ static char *make_token(const char *name return token; } +/* duplicate a basename into a valid C token */ +static char *dup_basename_token(const char *name, const char *ext) +{ + char *p, *ret = dup_basename( name, ext ); + /* map invalid characters to '_' */ + for (p = ret; *p; p++) if (!isalnum(*p)) *p = '_'; + return ret; +} + int main(int argc,char *argv[]) { extern char* optarg; @@ -244,22 +253,23 @@ int main(int argc,char *argv[]) if (!proxy_name && do_proxies) { proxy_name = dup_basename(input_name, ".idl"); - proxy_token = xstrdup(proxy_name); strcat(proxy_name, "_p.c"); } if (!client_name && do_client) { client_name = dup_basename(input_name, ".idl"); - client_token = xstrdup(client_name); strcat(client_name, "_c.c"); } if (!server_name && do_server) { server_name = dup_basename(input_name, ".idl"); - server_token = xstrdup(server_name); strcat(server_name, "_s.c"); } + if (do_proxies) proxy_token = dup_basename_token(proxy_name,"_p.c"); + if (do_client) client_token = dup_basename_token(client_name,"_c.c"); + if (do_server) server_token = dup_basename_token(server_name,"_s.c"); + wpp_add_cmdline_define("__WIDL__"); atexit(rm_tempfile);

1 0

Johan Dahlin : ntdll: RtlIpv4AddressToStringExW/RtlIpv4StringToAddressExW stubs.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: e21aff07669e01bd573b6f900b2ba8d370f23799 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e21aff07669e01bd573b6f9… Author: Johan Dahlin <jdahlin(a)async.com.br> Date: Thu Feb 2 13:21:26 2006 +0100 ntdll: RtlIpv4AddressToStringExW/RtlIpv4StringToAddressExW stubs. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3304ead..e10d7ca 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -684,11 +684,11 @@ # @ stub RtlInvertRangeList # @ stub RtlIpv4AddressToStringA # @ stub RtlIpv4AddressToStringExA -# @ stub RtlIpv4AddressToStringExW +@ stdcall RtlIpv4AddressToStringExW(ptr ptr ptr ptr) # @ stub RtlIpv4AddressToStringW # @ stub RtlIpv4StringToAddressA # @ stub RtlIpv4StringToAddressExA -# @ stub RtlIpv4StringToAddressExW +@ stdcall RtlIpv4StringToAddressExW(ptr ptr wstr ptr) # @ stub RtlIpv4StringToAddressW # @ stub RtlIpv6AddressToStringA # @ stub RtlIpv6AddressToStringExA diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 0881c97..e4492c0 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -860,3 +860,19 @@ void WINAPI RtlCopyLuidAndAttributesArra for (i = 0; i < Count; i++) Dest[i] = Src[i]; } + +NTSTATUS WINAPI RtlIpv4StringToAddressExW(PULONG IP, PULONG Port, + LPCWSTR Buffer, PULONG MaxSize) +{ + FIXME("(%p,%p,%p,%p): stub\n", IP, Port, Buffer, MaxSize); + + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI RtlIpv4AddressToStringExW (PULONG IP, PULONG Port, + LPWSTR Buffer, PULONG MaxSize) +{ + FIXME("(%p,%p,%p,%p): stub\n", IP, Port, Buffer, MaxSize); + + return STATUS_SUCCESS; +}

1 0

Mike McCormack : kernel32: FindFirstChangeNotification needs a static IO_STATUS_BLOCK.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: d77baf358b2ba376d68ed9f590fe1d413e9f12c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d77baf358b2ba376d68ed9f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Feb 2 13:20:58 2006 +0100 kernel32: FindFirstChangeNotification needs a static IO_STATUS_BLOCK. --- dlls/kernel/change.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index 573e94c..2323917 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -47,6 +47,13 @@ HANDLE WINAPI FindFirstChangeNotificatio return FindFirstChangeNotificationW( pathW, bWatchSubtree, dwNotifyFilter ); } +/* + * NtNotifyChangeDirectoryFile may write back to the IO_STATUS_BLOCK + * asynchronously. We don't care about the contents, but it can't + * be placed on the stack since it will go out of scope when we return. + */ +static IO_STATUS_BLOCK FindFirstChange_iosb; + /**************************************************************************** * FindFirstChangeNotificationW (KERNEL32.@) */ @@ -55,7 +62,6 @@ HANDLE WINAPI FindFirstChangeNotificatio { UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; - IO_STATUS_BLOCK io; NTSTATUS status; HANDLE handle = INVALID_HANDLE_VALUE; @@ -74,7 +80,8 @@ HANDLE WINAPI FindFirstChangeNotificatio attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, + status = NtOpenFile( &handle, FILE_LIST_DIRECTORY | SYNCHRONIZE, + &attr, &FindFirstChange_iosb, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &nt_name ); @@ -85,7 +92,8 @@ HANDLE WINAPI FindFirstChangeNotificatio return INVALID_HANDLE_VALUE; } - status = NtNotifyChangeDirectoryFile( handle, NULL, NULL, NULL, &io, + status = NtNotifyChangeDirectoryFile( handle, NULL, NULL, NULL, + &FindFirstChange_iosb, NULL, 0, dwNotifyFilter, bWatchSubtree ); if (status != STATUS_PENDING) { @@ -101,12 +109,12 @@ HANDLE WINAPI FindFirstChangeNotificatio */ BOOL WINAPI FindNextChangeNotification( HANDLE handle ) { - IO_STATUS_BLOCK io; NTSTATUS status; TRACE("%p\n",handle); - status = NtNotifyChangeDirectoryFile( handle, NULL, NULL, NULL, &io, + status = NtNotifyChangeDirectoryFile( handle, NULL, NULL, NULL, + &FindFirstChange_iosb, NULL, 0, FILE_NOTIFY_CHANGE_SIZE, 0 ); if (status != STATUS_PENDING) {

1 0

Tobias Loew : gdi: Extended pens do not work correct with StrokePath.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 58331121aa791f39ec19aea0d421f11e13654e96 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=58331121aa791f39ec19aea… Author: Tobias Loew <tobi(a)die-loews.de> Date: Thu Feb 2 13:21:10 2006 +0100 gdi: Extended pens do not work correct with StrokePath. --- dlls/gdi/path.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi/path.c b/dlls/gdi/path.c index 6df155a..1e98fe5 100644 --- a/dlls/gdi/path.c +++ b/dlls/gdi/path.c @@ -1678,8 +1678,12 @@ static BOOL PATH_StrokePath(DC *dc, GdiP lb.lbStyle = elp.elpBrushStyle; lb.lbColor = elp.elpColor; lb.lbHatch = elp.elpHatch; - hNewPen = ExtCreatePen(elp.elpPenStyle, elp.elpWidth, &lb, - elp.elpNumEntries, elp.elpStyleEntry); + if(elp.elpPenStyle & PS_USERSTYLE) + hNewPen = ExtCreatePen(elp.elpPenStyle, elp.elpWidth, &lb, + elp.elpNumEntries, elp.elpStyleEntry); + else + hNewPen = ExtCreatePen(elp.elpPenStyle, elp.elpWidth, &lb, + 0, NULL); } else /* OBJ_PEN */ { LOGPEN lp; GetObjectW(hOldPen, sizeof(LOGPEN), &lp);

1 0

Michael Jung : unixfs: Use realpath instead of canonicalize_file_name for portability
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: dc9789fbddf469a94fe1cb3f3978d968610d126f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc9789fbddf469a94fe1cb3… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Thu Feb 2 13:20:49 2006 +0100 unixfs: Use realpath instead of canonicalize_file_name for portability reasons. --- dlls/shell32/shfldr_unixfs.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index b0a513a..c0d7f87 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -422,7 +422,7 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR int cDriveSymlinkLen; TRACE("(pszDosPath=%s, pszCanonicalPath=%p)\n", debugstr_w(pszDosPath), pszCanonicalPath); - + if (!pszDosPath || pszDosPath[1] != ':') return FALSE; @@ -431,12 +431,10 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszUnixPath = wine_get_unix_file_name(wszDrive); if (!pszUnixPath) return FALSE; cDriveSymlinkLen = strlen(pszUnixPath); - pElement = canonicalize_file_name(pszUnixPath); + pElement = realpath(pszUnixPath, szPath); HeapFree(GetProcessHeap(), 0, pszUnixPath); if (!pElement) return FALSE; - strcpy(szPath, pElement); if (szPath[strlen(szPath)-1] != '/') strcat(szPath, "/"); - free(pElement); /* Append the part relative to the drive symbolic link target. */ pszUnixPath = wine_get_unix_file_name(pszDosPath);

1 0

Stefan Leichter : shlwapi: Added stub for ShellMessageBoxWrapW.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: cfcc9a755d554f6ff15bb11a4523bb66b2c2d888 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfcc9a755d554f6ff15bb11… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Thu Feb 2 13:20:04 2006 +0100 shlwapi: Added stub for ShellMessageBoxWrapW. --- dlls/shlwapi/ordinal.c | 25 +++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 384c2ee..36d7173 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4395,3 +4395,28 @@ DWORD WINAPI GetUIVersion(void) } return version; } + +/*********************************************************************** + * ShellMessageBoxWrapW [SHLWAPI.388] + * + * loads a string resource for a module, displays the string in a + * message box and writes it into the logfile + * + * PARAMS + * mod [I] the module containing the string resource + * unknown1 [I] FIXME + * uId [I] the id of the string resource + * title [I] the title of the message box + * unknown2 [I] FIXME + * filename [I] name of the logfile + * + * RETURNS + * FIXME + */ +BOOL WINAPI ShellMessageBoxWrapW(HMODULE mod, DWORD unknown1, UINT uId, + LPCWSTR title, DWORD unknown2, LPCWSTR filename) +{ + FIXME("%p %lx %d %s %lx %s\n", + mod, unknown1, uId, debugstr_w(title), unknown2, debugstr_w(filename)); + return TRUE; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 4a04e0f..0ab4c7b 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 stub -noname ShellMessageBoxWrapW +388 stdcall -noname ShellMessageBoxWrapW(ptr long long wstr long wstr) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long)

1 0

Michael Kaufmann : commdlg: File open dialog: Use the specified instance handle for
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 62725d685c769d1b5c38c8ae56f4128ced649bf0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=62725d685c769d1b5c38c8a… Author: Michael Kaufmann <hallo(a)michael-kaufmann.ch> Date: Thu Feb 2 13:20:23 2006 +0100 commdlg: File open dialog: Use the specified instance handle for custom dialog templates. --- dlls/commdlg/filedlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index 014e9f3..e4a0463 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -739,7 +739,7 @@ static HWND CreateTemplateDialog(FileOpe HINSTANCE hinst; if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE) { - hinst = 0; + hinst = COMDLG32_hInstance; if( !(template = LockResource( fodInfos->ofnInfos->hInstance))) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); @@ -771,7 +771,7 @@ static HWND CreateTemplateDialog(FileOpe return NULL; } } - hChildDlg = CreateDialogIndirectParamA(COMDLG32_hInstance, template, hwnd, + hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd, IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate, (LPARAM)fodInfos->ofnInfos); if(hChildDlg)

1 0

Stefan Leichter : wine.inf: Add HKLM,%CurrentVersionNT%,CurrentType.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 9f100c15dcb963d9916931452e3d908e1ccd42d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f100c15dcb963d99169314… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Thu Feb 2 13:20:36 2006 +0100 wine.inf: Add HKLM,%CurrentVersionNT%,"CurrentType". --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 8a81989..f0978d6 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2402,6 +2402,7 @@ HKLM,%CurrentVersionNT%\Time Zones\Tasma HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.0" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 4" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2195" +HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x400 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0

Ulrich Czekalla : oleaut32: Prevent freeing of random memory.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 37f1d4cb54d568bdb3bdc5a00752e62419628d67 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37f1d4cb54d568bdb3bdc5a… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Feb 2 13:18:43 2006 +0100 oleaut32: Prevent freeing of random memory. Don't assign type to variant until we're sure we are assigning a value. --- dlls/oleaut32/variant.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 4a2dd90..a40f3d0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2952,7 +2952,6 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LP /* Do the math */ hres = S_OK; - V_VT(&tv) = tvt; V_VT(result) = resvt; switch (tvt) { case VT_DECIMAL: @@ -2973,10 +2972,13 @@ HRESULT WINAPI VarAdd(LPVARIANT left, LP V_VT(result) = VT_R8; V_R8(result) = r8res; goto end; - } else + } else { + V_VT(&tv) = tvt; V_I8(&tv) = V_I8(&lv) + V_I8(&rv); + } break; case VT_R8: + V_VT(&tv) = tvt; /* FIXME: overflow detection */ V_R8(&tv) = V_R8(&lv) + V_R8(&rv); break;

1 0

Ulrich Czekalla : advapi32: Add stub for ObjectDeleteAuditAlarmW.
by Alexandre Julliard 02 Feb '06

02 Feb '06

Module: wine Branch: refs/heads/master Commit: 5ceb274724d310bea692162147c03240fdb1515e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ceb274724d310bea692162… Author: Ulrich Czekalla <ulrich(a)codeweavers.com> Date: Thu Feb 2 13:19:11 2006 +0100 advapi32: Add stub for ObjectDeleteAuditAlarmW. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 325a7be..61eb2c9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -419,7 +419,7 @@ @ stdcall ObjectCloseAuditAlarmA(str ptr long) @ stdcall ObjectCloseAuditAlarmW(wstr ptr long) # @ stub ObjectDeleteAuditAlarmA -# @ stub ObjectDeleteAuditAlarmW +@ stdcall ObjectDeleteAuditAlarmW(wstr ptr long) @ stdcall ObjectOpenAuditAlarmA(str ptr str str ptr long long long ptr long long ptr) @ stdcall ObjectOpenAuditAlarmW(wstr ptr wstr wstr ptr long long long ptr long long ptr) @ stdcall ObjectPrivilegeAuditAlarmA(str ptr long long ptr long) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ff525f1..cd61f53 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1894,6 +1894,13 @@ BOOL WINAPI ObjectCloseAuditAlarmW(LPCWS return TRUE; } +BOOL WINAPI ObjectDeleteAuditAlarmW(LPCWSTR SubsystemName, LPVOID HandleId, BOOL GenerateOnClose) +{ + FIXME("stub (%s,%p,%x)\n", debugstr_w(SubsystemName), HandleId, GenerateOnClose); + + return TRUE; +} + BOOL WINAPI ObjectOpenAuditAlarmA(LPCSTR SubsystemName, LPVOID HandleId, LPSTR ObjectTypeName, LPSTR ObjectName, PSECURITY_DESCRIPTOR pSecurityDescriptor, HANDLE ClientToken, DWORD DesiredAccess, DWORD GrantedAccess, PPRIVILEGE_SET Privileges, BOOL ObjectCreation, BOOL AccessGranted,

1 0