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

Alexandre Julliard : ntdll: Fix a race condition at thread exit.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 25d6383a29dcbe064623c5c570c3bce159e25172 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=25d6383a29dcbe064623c5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 4 12:04:39 2006 +0200 ntdll: Fix a race condition at thread exit. --- dlls/ntdll/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 841604a..97be8ec 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -156,6 +156,7 @@ void server_exit_thread( int status ) fds[1] = ntdll_get_thread_data()->wait_fd[1]; fds[2] = ntdll_get_thread_data()->reply_fd; fds[3] = ntdll_get_thread_data()->request_fd; + pthread_functions.sigprocmask( SIG_BLOCK, &block_set, NULL ); size = 0; NtFreeVirtualMemory( GetCurrentProcess(), &info.stack_base, &size, MEM_RELEASE | MEM_SYSTEM ); @@ -165,7 +166,6 @@ void server_exit_thread( int status ) NtFreeVirtualMemory( GetCurrentProcess(), &info.teb_base, &size, MEM_RELEASE | MEM_SYSTEM ); info.teb_size = size; - pthread_functions.sigprocmask( SIG_BLOCK, &block_set, NULL ); close( fds[0] ); close( fds[1] ); close( fds[2] );

1 0

Benjamin Arai : oleaut32: Removes extra string allocation for varformat: VarMonthName.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 0227b8cba228b17159a6ca392b801eda38815dca URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0227b8cba228b17159a6ca3… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Aug 3 19:59:22 2006 -0700 oleaut32: Removes extra string allocation for varformat:VarMonthName. --- dlls/oleaut32/varformat.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index d515bc3..836fa69 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2471,7 +2471,6 @@ HRESULT WINAPI VarMonthName(INT iMonth, { DWORD localeValue; INT size; - WCHAR *str; if ((iMonth < 1) || (iMonth > 12)) return E_INVALIDARG; @@ -2489,18 +2488,14 @@ HRESULT WINAPI VarMonthName(INT iMonth, ERR("GetLocaleInfo 0x%lx failed.\n", localeValue); return HRESULT_FROM_WIN32(GetLastError()); } - str = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*size); - if (!str) + *pbstrOut = SysAllocStringLen(NULL,size - 1); + if (!*pbstrOut) return E_OUTOFMEMORY; - size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, str, size); + size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, *pbstrOut, size); if (!size) { ERR("GetLocaleInfo of 0x%lx failed in 2nd stage?!\n", localeValue); - HeapFree(GetProcessHeap(),0,str); + SysFreeString(*pbstrOut); return HRESULT_FROM_WIN32(GetLastError()); } - *pbstrOut = SysAllocString(str); - HeapFree(GetProcessHeap(),0,str); - if (!*pbstrOut) - return E_OUTOFMEMORY; return S_OK; }

1 0

Hwang YunSong(황윤성) : oledlg: Updated Korean resource.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 18ce38311be2b303f154c69f0a1e92ce218faae0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18ce38311be2b303f154c69… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Fri Aug 4 09:00:29 2006 +0900 oledlg: Updated Korean resource. --- dlls/oledlg/oledlg_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/oledlg_Ko.rc b/dlls/oledlg/oledlg_Ko.rc index 29827cc..b29ef98 100644 --- a/dlls/oledlg/oledlg_Ko.rc +++ b/dlls/oledlg/oledlg_Ko.rc @@ -51,5 +51,5 @@ STRINGTABLE DISCARDABLE IDS_RESULTFILEOBJDESC "�ۼ�� Ǯ�׸�� Ͽ� Ȱ��ȭ��ų�� ִ� ��ü�� Ͻÿ�." IDS_BROWSE "ã��" IDS_NOTOLEMOD "�� ùٸ� OLE�� ƴѰŷ� ��Դϴ�. OLE��Ʈ�� Ҽ� ��ϴ�." - IDS_NOTOLEMODCAPTION "��Ʈ�� ߰�" + IDS_NOTOLEMODCAPTION "��Ʈ�� ϱ�" }

1 0

Robert Shearman : ntdll: Add an optimisation for NtQueryDirectoryFile to not read the
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: f5cc0f7d09a1e6a89c9a5754d42884065d53aca0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f5cc0f7d09a1e6a89c9a575… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Aug 3 20:25:28 2006 +0100 ntdll: Add an optimisation for NtQueryDirectoryFile to not read the whole directory if the mask doesn't contain any wildcards and the file exists on in the directory with the same case as the mask. --- dlls/ntdll/directory.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index faeca6c..47d018a 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1126,6 +1126,74 @@ static void read_directory_readdir( int else io->u.Status = restart_scan ? STATUS_NO_SUCH_FILE : STATUS_NO_MORE_FILES; } +/*********************************************************************** + * read_directory_stat + * + * Read a single file from a directory by determining whether the file + * identified by mask exists using stat. + */ +static int read_directory_stat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG length, + BOOLEAN single_entry, const UNICODE_STRING *mask, + BOOLEAN restart_scan ) +{ + int unix_len, ret, used_default; + char *unix_name; + struct stat st; + + TRACE("trying optimisation for file %s\n", debugstr_us( mask )); + + unix_len = ntdll_wcstoumbs( 0, mask->Buffer, mask->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); + if (!(unix_name = RtlAllocateHeap( GetProcessHeap(), 0, unix_len ))) + { + io->u.Status = STATUS_NO_MEMORY; + return 0; + } + ret = ntdll_wcstoumbs( 0, mask->Buffer, mask->Length / sizeof(WCHAR), unix_name, unix_len, + NULL, &used_default ); + if (ret > 0 && !used_default) + { + if (restart_scan) + { + lseek( fd, 0, SEEK_SET ); + } + else if (lseek( fd, 0, SEEK_CUR ) != 0) + { + io->u.Status = STATUS_NO_MORE_FILES; + ret = 0; + goto done; + } + + ret = stat( unix_name, &st ); + if (!ret) + { + FILE_BOTH_DIR_INFORMATION *info = append_entry( buffer, &io->Information, length, unix_name, NULL, mask ); + if (info) + { + info->NextEntryOffset = 0; + if ((char *)info->FileName + info->FileNameLength > (char *)buffer + length) + io->u.Status = STATUS_BUFFER_OVERFLOW; + else + lseek( fd, 1, SEEK_CUR ); + } + } + } + else ret = -1; + +done: + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + + TRACE("returning %d\n", ret); + + return ret; +} + + +static inline WCHAR *mempbrkW( const WCHAR *ptr, const WCHAR *accept, size_t n ) +{ + const WCHAR *end; + for (end = ptr + n; ptr < end; ptr++) if (strchrW( accept, *ptr )) return (WCHAR *)ptr; + return NULL; +} /****************************************************************************** * NtQueryDirectoryFile [NTDLL.@] @@ -1141,6 +1209,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HA BOOLEAN restart_scan ) { int cwd, fd; + static const WCHAR wszWildcards[] = { '*','?',0 }; TRACE("(%p %p %p %p %p %p 0x%08lx 0x%08x 0x%08x %s 0x%08x\n", handle, event, apc_routine, apc_context, io, buffer, @@ -1171,14 +1240,20 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HA if ((cwd = open(".", O_RDONLY)) != -1 && fchdir( fd ) != -1) { + if (mask && !mempbrkW( mask->Buffer, wszWildcards, mask->Length / sizeof(WCHAR) ) && + read_directory_stat( fd, io, buffer, length, single_entry, mask, restart_scan ) != -1) + goto done; #ifdef VFAT_IOCTL_READDIR_BOTH - if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan )) == -1) + if ((read_directory_vfat( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1) + goto done; #endif #ifdef USE_GETDENTS - if ((read_directory_getdents( fd, io, buffer, length, single_entry, mask, restart_scan )) == -1) + if ((read_directory_getdents( fd, io, buffer, length, single_entry, mask, restart_scan )) != -1) + goto done; #endif - read_directory_readdir( fd, io, buffer, length, single_entry, mask, restart_scan ); + read_directory_readdir( fd, io, buffer, length, single_entry, mask, restart_scan ); + done: if (fchdir( cwd ) == -1) chdir( "/" ); } else io->u.Status = FILE_GetNtStatus();

1 0

Robert Reif : advapi32: Add a computer SID to the registry.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 1b8cfc5151885e3c2abb28fe7dfadd6d55e94a7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b8cfc5151885e3c2abb28f… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Aug 3 21:47:50 2006 -0400 advapi32: Add a computer SID to the registry. --- dlls/advapi32/lsa.c | 13 ++++--------- dlls/advapi32/security.c | 39 +++++++++++++++++++++++++++++++++------ include/ntsecapi.h | 4 ++++ 3 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index c5c5e84..42221f3 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -462,17 +462,12 @@ NTSTATUS WINAPI LsaQueryInformationPolic /* read the computer SID from the registry */ if (!ADVAPI_GetComputerSid(&(xdi->sid))) { - SID_IDENTIFIER_AUTHORITY localSidAuthority = {SECURITY_NT_AUTHORITY}; + HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, xdi); - xdi->sid.Revision = SID_REVISION; - xdi->sid.SubAuthorityCount = 4; - xdi->sid.IdentifierAuthority = localSidAuthority; - xdi->sid.SubAuthority[0] = SECURITY_NT_NON_UNIQUE; - xdi->sid.SubAuthority[1] = 0; - xdi->sid.SubAuthority[2] = 0; - xdi->sid.SubAuthority[3] = 0; + WARN("Computer SID not found\n"); - WARN("Computer SID not found in registry\n"); + return STATUS_UNSUCCESSFUL; } TRACE("setting SID to %s\n", debugstr_sid(&xdi->sid)); diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 53b2210..2eade3e 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -332,7 +332,7 @@ BOOL ADVAPI_IsLocalComputer(LPCWSTR Serv if (!ServerName || !ServerName[0]) return TRUE; - + buf = HeapAlloc(GetProcessHeap(), 0, dwSize * sizeof(WCHAR)); Result = GetComputerNameW(buf, &dwSize); if (Result && (ServerName[0] == '\\') && (ServerName[1] == '\\')) @@ -352,12 +352,12 @@ BOOL ADVAPI_GetComputerSid(PSID sid) { HKEY key; LONG ret; - - if ((ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "SECURITY\\SAM\\Domains\\Account", 0, + static const WCHAR Account[] = { 'S','E','C','U','R','I','T','Y','\\','S','A','M','\\','D','o','m','a','i','n','s','\\','A','c','c','o','u','n','t',0 }; + static const WCHAR V[] = { 'V',0 }; + + if ((ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, Account, 0, KEY_READ, &key)) == ERROR_SUCCESS) { - static const WCHAR V[] = { 'V',0 }; DWORD size = 0; ret = RegQueryValueExW(key, V, NULL, NULL, NULL, &size); if (ret == ERROR_MORE_DATA || ret == ERROR_SUCCESS) @@ -370,13 +370,40 @@ BOOL ADVAPI_GetComputerSid(PSID sid) { /* the SID is in the last 24 bytes of the binary data */ CopyMemory(sid, &data[size-24], 24); + HeapFree(GetProcessHeap(), 0, data); + RegCloseKey(key); return TRUE; } + HeapFree(GetProcessHeap(), 0, data); } } RegCloseKey(key); } - + + /* create a new random SID */ + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, Account, + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL) == ERROR_SUCCESS) + { + PSID new_sid; + SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; + DWORD id[3]; + + if (RtlGenRandom(&id, sizeof(id))) + { + if (AllocateAndInitializeSid(&identifierAuthority, 4, SECURITY_NT_NON_UNIQUE, id[0], id[1], id[2], 0, 0, 0, 0, &new_sid)) + { + if (RegSetValueExW(key, V, 0, REG_BINARY, new_sid, GetLengthSid(new_sid)) == ERROR_SUCCESS) + { + FreeSid(new_sid); + RegCloseKey(key); + return CopySid(GetLengthSid(new_sid), sid, &new_sid); + } + FreeSid(new_sid); + } + } + RegCloseKey(key); + } + return FALSE; } diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 7fa3c44..4ed878e 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -290,6 +290,10 @@ typedef enum _POLICY_NOTIFICATION_INFORM PolicyNotifyMachineAccountPasswordInformation } POLICY_NOTIFICATION_INFORMATION_CLASS, *PPOLICY_NOTIFICATION_INFORMATION_CLASS; +#define RtlGenRandom SystemFunction036 + +BOOLEAN WINAPI RtlGenRandom(PVOID,ULONG); + NTSTATUS WINAPI LsaAddAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING,ULONG); NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE,ULONG,PVOID,ULONG,PVOID*,PULONG,PNTSTATUS); NTSTATUS WINAPI LsaClose(LSA_HANDLE);

1 0

Roderick Colenbrander : wined3d: Surface pitch fix.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: a7c2ab3e90c052b4b8945164a6f77d7c899253b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7c2ab3e90c052b4b894516… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 3 23:29:51 2006 +0200 wined3d: Surface pitch fix. --- dlls/wined3d/surface.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 011ee4f..c6412de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1868,13 +1868,18 @@ static HRESULT WINAPI IWineD3DSurfaceImp d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp); if((convert != NO_CONVERSION) && This->resource.allocatedMemory) { - int width = This->glRect.right - This->glRect.left; int height = This->glRect.bottom - This->glRect.top; - int pitch = IWineD3DSurface_GetPitch(iface); + int pitch; - mem = HeapAlloc(GetProcessHeap(), 0, width * height * bpp); + /* Set the pitch in 'length' not in bytes */ + if (NP2_REPACK == wined3d_settings.nonpower2_mode || This->resource.usage & WINED3DUSAGE_RENDERTARGET) + pitch = This->currentDesc.Width; + else + pitch = This->pow2Width; + + mem = HeapAlloc(GetProcessHeap(), 0, pitch * height * bpp); if(!mem) { - ERR("Out of memory %d, %d!\n", width, height); + ERR("Out of memory %d, %d!\n", pitch, height); return WINED3DERR_OUTOFVIDEOMEMORY; } @@ -2005,6 +2010,7 @@ #endif This->resource.allocatedMemory = NULL; } + glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); } return WINED3D_OK;

1 0

Robert Reif : ntdll: Fix some function arguments.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 46d2886dd06b87c8ceec021a3584fb3356ddfd4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46d2886dd06b87c8ceec021… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Aug 3 18:54:14 2006 -0400 ntdll: Fix some function arguments. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 22 ++++++++++++++++------ include/winternl.h | 4 ++-- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4b5549f..5a75cec 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -517,7 +517,7 @@ # @ stub RtlDecodeSystemPointer @ stub RtlDeleteRange @ stdcall RtlDeleteRegistryValue(long ptr ptr) @ stdcall RtlDeleteResource(ptr) -@ stdcall RtlDeleteSecurityObject(long) +@ stdcall RtlDeleteSecurityObject(ptr) # @ stub RtlDeleteTimer # @ stub RtlDeleteTimerQueue # @ stub RtlDeleteTimerQueueEx @@ -738,7 +738,7 @@ # @ stub RtlMultiAppendUnicodeStringBuff @ stdcall RtlMultiByteToUnicodeSize(ptr str long) @ stub RtlNewInstanceSecurityObject @ stub RtlNewSecurityGrantedAccess -@ stdcall RtlNewSecurityObject(long long long long long long) +@ stdcall RtlNewSecurityObject(ptr ptr ptr long ptr ptr) # @ stub RtlNewSecurityObjectEx # @ stub RtlNewSecurityObjectWithMultipleInheritance @ stdcall RtlNormalizeProcessParams(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index ca02cdb..f4c52c9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -372,17 +372,27 @@ VOID WINAPI RtlReleasePebLock(void) /****************************************************************************** * RtlNewSecurityObject [NTDLL.@] */ -DWORD WINAPI RtlNewSecurityObject(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6) { - FIXME("(0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx,0x%08lx),stub!\n",x1,x2,x3,x4,x5,x6); - return 0; +NTSTATUS WINAPI +RtlNewSecurityObject( PSECURITY_DESCRIPTOR ParentDescriptor, + PSECURITY_DESCRIPTOR CreatorDescriptor, + PSECURITY_DESCRIPTOR *NewDescriptor, + BOOLEAN IsDirectoryObject, + HANDLE Token, + PGENERIC_MAPPING GenericMapping ) +{ + FIXME("(%p %p %p %d %p %p) stub!\n", ParentDescriptor, CreatorDescriptor, + NewDescriptor, IsDirectoryObject, Token, GenericMapping); + return STATUS_NOT_IMPLEMENTED; } /****************************************************************************** * RtlDeleteSecurityObject [NTDLL.@] */ -DWORD WINAPI RtlDeleteSecurityObject(DWORD x1) { - FIXME("(0x%08lx),stub!\n",x1); - return 0; +NTSTATUS WINAPI +RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor ) +{ + FIXME("(%p) stub!\n", ObjectDescriptor); + return STATUS_NOT_IMPLEMENTED; } /************************************************************************** diff --git a/include/winternl.h b/include/winternl.h index 5177348..193e02a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2006,7 +2006,7 @@ NTSTATUS WINAPI RtlDeleteAtomFromAtomTa NTSTATUS WINAPI RtlDeleteCriticalSection(RTL_CRITICAL_SECTION *); NTSTATUS WINAPI RtlDeleteRegistryValue(ULONG, PCWSTR, PCWSTR); void WINAPI RtlDeleteResource(LPRTL_RWLOCK); -DWORD WINAPI RtlDeleteSecurityObject(DWORD); +NTSTATUS WINAPI RtlDeleteSecurityObject(PSECURITY_DESCRIPTOR*); PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); NTSTATUS WINAPI RtlDestroyAtomTable(RTL_ATOM_TABLE); NTSTATUS WINAPI RtlDestroyEnvironment(PWSTR); @@ -2133,7 +2133,7 @@ void WINAPI RtlMapGenericMask(PACCE NTSTATUS WINAPI RtlMultiByteToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSTATUS WINAPI RtlMultiByteToUnicodeSize(DWORD*,LPCSTR,UINT); -DWORD WINAPI RtlNewSecurityObject(DWORD,DWORD,DWORD,DWORD,DWORD,DWORD); +NTSTATUS WINAPI RtlNewSecurityObject(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOLEAN,HANDLE,PGENERIC_MAPPING); PRTL_USER_PROCESS_PARAMETERS WINAPI RtlNormalizeProcessParams(RTL_USER_PROCESS_PARAMETERS*); ULONG WINAPI RtlNtStatusToDosError(NTSTATUS); ULONG WINAPI RtlNtStatusToDosErrorNoTeb(NTSTATUS);

1 0

Jacek Caban : mshtml: Fix handling offset in BSCallback.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: 9def0ca2a6cddf9b3dfd5ccc4422b41a3fead949 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9def0ca2a6cddf9b3dfd5cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 3 22:00:30 2006 +0200 mshtml: Fix handling offset in BSCallback. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e93658a..79ac281 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -160,6 +160,7 @@ struct BSCallback { LPWSTR headers; HGLOBAL post_data; ULONG post_data_len; + ULONG readed; nsChannel *nschannel; nsIStreamListener *nslistener; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ecd8333..2b0b194 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -365,19 +365,20 @@ static HRESULT WINAPI BindStatusCallback do { hres = IStream_Read(pstgmed->u.pstm, This->nsstream->buf, sizeof(This->nsstream->buf), - &This->nsstream->buf_size); - if(This->nsstream->buf_size) { - nsres = nsIStreamListener_OnDataAvailable(This->nslistener, - (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, - NSINSTREAM(This->nsstream), 0 /* FIXME */, dwSize); - if(NS_FAILED(nsres)) - FIXME("OnDataAvailable failed: %08lx\n", nsres); - - if(This->nsstream->buf_size) - FIXME("buffer is not empty!\n"); - }else { + &This->nsstream->buf_size); + if(!This->nsstream->buf_size) break; - } + + nsres = nsIStreamListener_OnDataAvailable(This->nslistener, + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, + NSINSTREAM(This->nsstream), This->readed, This->nsstream->buf_size); + if(NS_FAILED(nsres)) + FIXME("OnDataAvailable failed: %08lx\n", nsres); + + if(This->nsstream->buf_size) + FIXME("buffer is not empty!\n"); + + This->readed += This->nsstream->buf_size; }while(hres == S_OK); } @@ -575,6 +576,7 @@ BSCallback *create_bscallback(HTMLDocume ret->post_data = NULL; ret->headers = NULL; ret->post_data_len = 0; + ret->readed = 0; ret->nschannel = NULL; ret->nslistener = NULL; ret->nscontext = NULL;

1 0

H. Verbeet : wined3d: Disable vertex arrays after we' re done drawing from them.
by Alexandre Julliard Aug. 4, 2006

Aug. 4, 2006

Module: wine Branch: refs/heads/master Commit: ea905eab09e325b425f3e392ddddf0e8861c3bd8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea905eab09e325b425f3e39… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Thu Aug 3 21:53:16 2006 +0200 wined3d: Disable vertex arrays after we're done drawing from them. After drawing from a vertex array we should disable them, to prevent the next draw calls from potentially reading past their ends. This also moves the disabling of vertex attrib arrays (for shaders) into its own function. --- dlls/wined3d/drawprim.c | 55 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ab6162c..e337789 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -794,6 +794,27 @@ static void draw_vertex(IWineD3DDevice * } #endif /* TODO: Software shaders */ +/* This should match any arrays loaded in loadNumberedArrays. */ +/* TODO: Only load / unload arrays if we have to. */ +static void unloadNumberedArrays(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + /* disable any attribs (this is the same for both GLSL and ARB modes) */ + GLint maxAttribs; + int i; + + /* Leave all the attribs disabled */ + glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &maxAttribs); + /* MESA does not support it right not */ + if (glGetError() != GL_NO_ERROR) + maxAttribs = 16; + for (i = 0; i < maxAttribs; ++i) { + GL_EXTCALL(glDisableVertexAttribArrayARB(i)); + checkGLcall("glDisableVertexAttribArrayARB(reg);"); + } +} + +/* TODO: Only load / unload arrays if we have to. */ static void loadNumberedArrays( IWineD3DDevice *iface, IWineD3DVertexShader *shader, @@ -825,6 +846,25 @@ static void loadNumberedArrays( } } +/* This should match any arrays loaded in loadVertexData. */ +/* TODO: Only load / unload arrays if we have to. */ +static void unloadVertexData(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + int texture_idx; + + glDisableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); + if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { + glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); + } + for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { + glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } +} + +/* TODO: Only load / unload arrays if we have to. */ static void loadVertexData(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd) { unsigned int textureNo = 0; unsigned int texture_idx = 0; @@ -1814,21 +1854,12 @@ #undef BUFFER_OR_DATA /* Cleanup vertex program */ if (useVertexShaderFunction) { - /* disable any attribs (this is the same for both GLSL and ARB modes) */ - GLint maxAttribs; - int i; - /* Leave all the attribs disabled */ - glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &maxAttribs); - /* MESA does not support it right not */ - if (glGetError() != GL_NO_ERROR) - maxAttribs = 16; - for (i = 0; i < maxAttribs; ++i) { - GL_EXTCALL(glDisableVertexAttribArrayARB(i)); - checkGLcall("glDisableVertexAttribArrayARB(reg);"); - } + unloadNumberedArrays(iface); if (wined3d_settings.vs_selected_mode == SHADER_ARB) glDisable(GL_VERTEX_PROGRAM_ARB); + } else { + unloadVertexData(iface); } /* Cleanup fragment program */

1 0

Dan Hipschman : widl: Write forward declarations for coclass definitions.
by Alexandre Julliard Aug. 3, 2006

Aug. 3, 2006

Module: wine Branch: refs/heads/master Commit: 99056d7e2ac56e11a4f6c101463c705abb611bf1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99056d7e2ac56e11a4f6c10… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Aug 2 17:36:15 2006 -0700 widl: Write forward declarations for coclass definitions. --- dlls/mshtml/mshtml_private.h | 4 ++-- dlls/shdocvw/shdocvw.h | 8 ++++---- tools/widl/parser.y | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e0c1c3c..e93658a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -53,7 +53,7 @@ typedef enum { EDITMODE } USERMODE; -typedef struct { +struct HTMLDocument { const IHTMLDocument2Vtbl *lpHTMLDocument2Vtbl; const IHTMLDocument3Vtbl *lpHTMLDocument3Vtbl; const IPersistMonikerVtbl *lpPersistMonikerVtbl; @@ -96,7 +96,7 @@ typedef struct { ConnectionPoint *cp_propnotif; HTMLDOMNode *nodes; -} HTMLDocument; +}; struct NSContainer { const nsIWebBrowserChromeVtbl *lpWebBrowserChromeVtbl; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 2f9f9cc..ee4bf8e 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -87,7 +87,7 @@ typedef struct { ConnectionPointContainer cps; } DocHost; -typedef struct { +struct WebBrowser { /* Interfaces available via WebBrowser object */ const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; @@ -130,9 +130,9 @@ typedef struct { VARIANT_BOOL tool_bar; DocHost doc_host; -} WebBrowser; +}; -typedef struct { +struct InternetExplorer { const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; LONG ref; @@ -140,7 +140,7 @@ typedef struct { HWND frame_hwnd; DocHost doc_host; -} InternetExplorer; +}; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) #define WEBBROWSER2(x) ((IWebBrowser2*) &(x)->lpWebBrowser2Vtbl) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index db78003..b9f858e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -249,6 +249,7 @@ gbl_statements: { $$ = NULL; } | gbl_statements coclassdef { $$ = $1; add_coclass($2); reg_type($2, $2->name, 0); + if (!parse_only && do_header) write_coclass_forward($2); } | gbl_statements moduledef { $$ = $1; add_module($2); } | gbl_statements librarydef { $$ = $1; } @@ -261,6 +262,7 @@ imp_statements: {} | imp_statements coclass ';' { reg_type($2, $2->name, 0); if (!parse_only && do_header) write_coclass_forward($2); } | imp_statements coclassdef { if (!parse_only) add_coclass($2); reg_type($2, $2->name, 0); + if (!parse_only && do_header) write_coclass_forward($2); } | imp_statements moduledef { if (!parse_only) add_module($2); } | imp_statements statement {}

1 0