Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[dgorbachev] 44449: Avoid buffer overflow (bug #4693).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Dec 7 02:30:32 2009 New Revision: 44449 URL: http://svn.reactos.org/svn/reactos?rev=44449&view=rev Log: Avoid buffer overflow (bug #4693). Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Dec 7 02:30:32 2009 @@ -560,9 +560,15 @@ PAFD_BIND_DATA BindData; PSOCKET_INFORMATION Socket = NULL; NTSTATUS Status; - UCHAR BindBuffer[0x1A]; SOCKADDR_INFO SocketInfo; HANDLE SockEvent; + + /* See below */ + BindData = HeapAlloc(GlobalHeap, 0, 0xA + SocketAddressLength); + if (!BindData) + { + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + } Status = NtCreateEvent(&SockEvent, GENERIC_READ | GENERIC_WRITE, @@ -570,14 +576,14 @@ 1, FALSE); - if( !NT_SUCCESS(Status) ) - return -1; + if (!NT_SUCCESS(Status)) + { + HeapFree(GlobalHeap, 0, BindData); + return SOCKET_ERROR; + } /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); - - /* Dynamic Structure...ugh */ - BindData = (PAFD_BIND_DATA)BindBuffer; /* Set up Address in TDI Format */ BindData->Address.TAAddressCount = 1; @@ -633,9 +639,9 @@ Socket->SharedData.State = SocketBound; Socket->TdiAddressHandle = (HANDLE)IOSB.Information; - NtClose( SockEvent ); - - return MsafdReturnWithErrno ( Status, lpErrno, 0, NULL ); + NtClose(SockEvent); + HeapFree(GlobalHeap, 0, BindData); + return MsafdReturnWithErrno(Status, lpErrno, 0, NULL); } int

14 years, 10 months

[jimtabor] 44448: - [WineTests] User32: Skip test_shell_window, not sure if it is a user32 bug or not.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 7 02:21:23 2009 New Revision: 44448 URL: http://svn.reactos.org/svn/reactos?rev=44448&view=rev Log: - [WineTests] User32: Skip test_shell_window, not sure if it is a user32 bug or not. Modified: trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Mon Dec 7 02:21:23 2009 @@ -5860,7 +5860,7 @@ test_layered_window(); test_SetForegroundWindow(hwndMain); - test_shell_window(); +// test_shell_window(); test_handles( hwndMain ); test_winregion();

14 years, 10 months

[jimtabor] 44447: [Win32k] - Add debug printout to show post thread message stall when posting hook messages to another thread. See bug 4926. - Do not set current thread client hook flags, set only the requested client thread hook flag data. - Initialize Hook head structure with thread info and desktop pointers.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Dec 7 00:37:09 2009 New Revision: 44447 URL: http://svn.reactos.org/svn/reactos?rev=44447&view=rev Log: [Win32k] - Add debug printout to show post thread message stall when posting hook messages to another thread. See bug 4926. - Do not set current thread client hook flags, set only the requested client thread hook flag data. - Initialize Hook head structure with thread info and desktop pointers. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Dec 7 00:37:09 2009 @@ -104,8 +104,6 @@ return NULL; } -// Hook->head.pti =? -// Hook->head.rpdesk Hook->head.h = Handle; Hook->Thread = Thread; Hook->HookId = HookId; @@ -116,7 +114,11 @@ ASSERT(W32Thread != NULL); W32Thread->fsHooks |= HOOKID_TO_FLAG(HookId); - GetWin32ClientInfo()->fsHooks = W32Thread->fsHooks; + if (W32Thread->pClientInfo) + W32Thread->pClientInfo->fsHooks = W32Thread->fsHooks; + + Hook->head.pti = W32Thread; + Hook->head.rpdesk = W32Thread->Desktop; } RtlInitUnicodeString(&Hook->ModuleName, NULL); @@ -347,6 +349,7 @@ if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) { + DPRINT1("\nHook found by Id and posted to Thread! %d\n",HookId ); /* Post it in message queue. */ return IntCallLowLevelHook(Hook, Code, wParam, lParam); }

14 years, 10 months

[cwittich] 44446: sync msxml3 with wine 1.1.34

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon Dec 7 00:32:04 2009 New Revision: 44446 URL: http://svn.reactos.org/svn/reactos?rev=44446&view=rev Log: sync msxml3 with wine 1.1.34 Modified: trunk/reactos/dll/win32/msxml3/node.c Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Mon Dec 7 00:32:04 2009 @@ -944,36 +944,219 @@ return E_NOTIMPL; } +static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*); + +static inline BYTE hex_to_byte(xmlChar c) +{ + if(c <= '9') return c-'0'; + if(c <= 'F') return c-'A'+10; + return c-'a'+10; +} + +static inline BYTE base64_to_byte(xmlChar c) +{ + if(c == '+') return 62; + if(c == '/') return 63; + if(c <= '9') return c-'0'+52; + if(c <= 'Z') return c-'A'; + return c-'a'+26; +} + +static inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) +{ + if(!type || !lstrcmpiW(type, szString) || + !lstrcmpiW(type, szNumber) || !lstrcmpiW(type, szUUID)) + { + V_VT(v) = VT_BSTR; + V_BSTR(v) = bstr_from_xmlChar(str); + + if(!V_BSTR(v)) + return E_OUTOFMEMORY; + } + else if(!lstrcmpiW(type, szDateTime) || !lstrcmpiW(type, szDateTimeTZ) || + !lstrcmpiW(type, szDate) || !lstrcmpiW(type, szTime) || + !lstrcmpiW(type, szTimeTZ)) + { + VARIANT src; + WCHAR *p, *e; + SYSTEMTIME st; + DOUBLE date = 0.0; + + st.wYear = 1899; + st.wMonth = 12; + st.wDay = 30; + st.wDayOfWeek = st.wHour = st.wMinute = st.wSecond = st.wMilliseconds = 0; + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = bstr_from_xmlChar(str); + + if(!V_BSTR(&src)) + return E_OUTOFMEMORY; + + p = V_BSTR(&src); + e = p + SysStringLen(V_BSTR(&src)); + + if(p+4<e && *(p+4)=='-') /* parse date (yyyy-mm-dd) */ + { + st.wYear = atoiW(p); + st.wMonth = atoiW(p+5); + st.wDay = atoiW(p+8); + p += 10; + + if(*p == 'T') p++; + } + + if(p+2<e && *(p+2)==':') /* parse time (hh:mm:ss.?) */ + { + st.wHour = atoiW(p); + st.wMinute = atoiW(p+3); + st.wSecond = atoiW(p+6); + p += 8; + + if(*p == '.') + { + p++; + while(isdigitW(*p)) p++; + } + } + + SystemTimeToVariantTime(&st, &date); + V_VT(v) = VT_DATE; + V_DATE(v) = date; + + if(*p == '+') /* parse timezone offset (+hh:mm) */ + V_DATE(v) += (DOUBLE)atoiW(p+1)/24 + (DOUBLE)atoiW(p+4)/1440; + else if(*p == '-') /* parse timezone offset (-hh:mm) */ + V_DATE(v) -= (DOUBLE)atoiW(p+1)/24 + (DOUBLE)atoiW(p+4)/1440; + + VariantClear(&src); + } + else if(!lstrcmpiW(type, szBinHex)) + { + SAFEARRAYBOUND sab; + int i, len; + + len = xmlStrlen(str)/2; + sab.lLbound = 0; + sab.cElements = len; + + V_VT(v) = (VT_ARRAY|VT_UI1); + V_ARRAY(v) = SafeArrayCreate(VT_UI1, 1, &sab); + + if(!V_ARRAY(v)) + return E_OUTOFMEMORY; + + for(i=0; i<len; i++) + ((BYTE*)V_ARRAY(v)->pvData)[i] = (hex_to_byte(str[2*i])<<4) + + hex_to_byte(str[2*i+1]); + } + else if(!lstrcmpiW(type, szBinBase64)) + { + SAFEARRAYBOUND sab; + int i, len; + + len = xmlStrlen(str); + if(str[len-2] == '=') i = 2; + else if(str[len-1] == '=') i = 1; + else i = 0; + + sab.lLbound = 0; + sab.cElements = len/4*3-i; + + V_VT(v) = (VT_ARRAY|VT_UI1); + V_ARRAY(v) = SafeArrayCreate(VT_UI1, 1, &sab); + + if(!V_ARRAY(v)) + return E_OUTOFMEMORY; + + for(i=0; i<len/4; i++) + { + ((BYTE*)V_ARRAY(v)->pvData)[3*i] = (base64_to_byte(str[4*i])<<2) + + (base64_to_byte(str[4*i+1])>>4); + if(3*i+1 < sab.cElements) + ((BYTE*)V_ARRAY(v)->pvData)[3*i+1] = (base64_to_byte(str[4*i+1])<<4) + + (base64_to_byte(str[4*i+2])>>2); + if(3*i+2 < sab.cElements) + ((BYTE*)V_ARRAY(v)->pvData)[3*i+2] = (base64_to_byte(str[4*i+2])<<6) + + base64_to_byte(str[4*i+3]); + } + } + else + { + VARIANT src; + HRESULT hres; + + if(!lstrcmpiW(type, szInt) || !lstrcmpiW(type, szI4)) + V_VT(v) = VT_I4; + else if(!lstrcmpiW(type, szFixed)) + V_VT(v) = VT_CY; + else if(!lstrcmpiW(type, szBoolean)) + V_VT(v) = VT_BOOL; + else if(!lstrcmpiW(type, szI1)) + V_VT(v) = VT_I1; + else if(!lstrcmpiW(type, szI2)) + V_VT(v) = VT_I2; + else if(!lstrcmpiW(type, szIU1)) + V_VT(v) = VT_UI1; + else if(!lstrcmpiW(type, szIU2)) + V_VT(v) = VT_UI2; + else if(!lstrcmpiW(type, szIU4)) + V_VT(v) = VT_UI4; + else if(!lstrcmpiW(type, szR4)) + V_VT(v) = VT_R4; + else if(!lstrcmpiW(type, szR8) || !lstrcmpiW(type, szFloat)) + V_VT(v) = VT_R8; + else + { + FIXME("Type handling not yet implemented\n"); + V_VT(v) = VT_BSTR; + } + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = bstr_from_xmlChar(str); + + if(!V_BSTR(&src)) + return E_OUTOFMEMORY; + + hres = VariantChangeType(v, &src, 0, V_VT(v)); + VariantClear(&src); + return hres; + } + + return S_OK; +} + static HRESULT WINAPI xmlnode_get_nodeTypedValue( IXMLDOMNode *iface, VARIANT* typedValue) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - HRESULT r = S_FALSE; - - FIXME("ignoring data type %p %p\n", This, typedValue); + VARIANT type; + xmlChar *content; + HRESULT hres = S_FALSE; + + TRACE("iface %p\n", iface); if(!typedValue) return E_INVALIDARG; V_VT(typedValue) = VT_NULL; - switch ( This->node->type ) - { - case XML_ELEMENT_NODE: - { - xmlChar *content = xmlNodeGetContent(This->node); - V_VT(typedValue) = VT_BSTR; - V_BSTR(typedValue) = bstr_from_xmlChar( content ); - xmlFree(content); - r = S_OK; - break; - } - default: - r = xmlnode_get_nodeValue(iface, typedValue); - } - - return r; + if(This->node->type == XML_ELEMENT_NODE || + This->node->type == XML_TEXT_NODE || + This->node->type == XML_ENTITY_REF_NODE) + hres = xmlnode_get_dataType(iface, &type); + + if(hres != S_OK && This->node->type != XML_ELEMENT_NODE) + return xmlnode_get_nodeValue(iface, typedValue); + + content = xmlNodeGetContent(This->node); + hres = VARIANT_from_xmlChar(content, typedValue, + hres==S_OK ? V_BSTR(&type) : NULL); + xmlFree(content); + VariantClear(&type); + + return hres; } static HRESULT WINAPI xmlnode_put_nodeTypedValue(

14 years, 10 months

[jimtabor] 44445: [User32] - Patch by Nikolay Sivov bunglehead@gmail.com : Check for edit window to be here in case of destruction during handler execution. - Edit wine sync.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Dec 6 23:52:51 2009 New Revision: 44445 URL: http://svn.reactos.org/svn/reactos?rev=44445&view=rev Log: [User32] - Patch by Nikolay Sivov bunglehead(a)gmail.com : Check for edit window to be here in case of destruction during handler execution. - Edit wine sync. Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Dec 6 23:52:51 2009 @@ -5484,7 +5484,7 @@ break; } - if (es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result);

14 years, 10 months

[jimtabor] 44444: - [Win32k] Missed this one for rev 44423. Return invalid index not invalid parameter. No pass all SetWindowLongPtr wine tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Dec 6 23:41:53 2009 New Revision: 44444 URL: http://svn.reactos.org/svn/reactos?rev=44444&view=rev Log: - [Win32k] Missed this one for rev 44423. Return invalid index not invalid parameter. No pass all SetWindowLongPtr wine tests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Dec 6 23:41:53 2009 @@ -3944,7 +3944,7 @@ default: DPRINT1("NtUserSetWindowLong(): Unsupported index %d\n", Index); - SetLastWin32Error(ERROR_INVALID_PARAMETER); + SetLastWin32Error(ERROR_INVALID_INDEX); OldValue = 0; break; }

14 years, 10 months

[jimtabor] 44443: - [Win32k] If Proc is null, use original one and perform processing.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Dec 6 20:22:29 2009 New Revision: 44443 URL: http://svn.reactos.org/svn/reactos?rev=44443&view=rev Log: - [Win32k] If Proc is null, use original one and perform processing. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Sun Dec 6 20:22:29 2009 @@ -385,6 +385,8 @@ Class->Unicode = !Ansi; } + if (!WndProc) WndProc = Class->lpfnWndProc; + chWndProc = WndProc; // Check if CallProc handle and retrieve previous call proc address and set. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Dec 6 20:22:29 2009 @@ -662,6 +662,8 @@ if (pWnd->state & WNDS_SERVERSIDEWINDOWPROC) pWnd->state &= ~WNDS_SERVERSIDEWINDOWPROC; + + if (!NewWndProc) NewWndProc = pWnd->lpfnWndProc; if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON) {

14 years, 10 months

[spetreolle] 44442: Set filesystem characteristics. Floppy disks and cdroms are now reported as removable.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Dec 6 19:49:19 2009 New Revision: 44442 URL: http://svn.reactos.org/svn/reactos?rev=44442&view=rev Log: Set filesystem characteristics. Floppy disks and cdroms are now reported as removable. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/volinfo.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sun Dec 6 19:49:19 2009 @@ -332,7 +332,7 @@ sizeof(DEVICE_EXTENSION), NULL, FILE_DEVICE_CD_ROM_FILE_SYSTEM, - 0, + DeviceToMount->Characteristics, FALSE, &NewDeviceObject); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Sun Dec 6 19:49:19 2009 @@ -139,8 +139,12 @@ static NTSTATUS -CdfsGetFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, - PULONG BufferLength) +CdfsGetFsDeviceInformation +( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, + PULONG BufferLength +) { DPRINT("CdfsGetFsDeviceInformation()\n"); DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); @@ -151,7 +155,7 @@ return(STATUS_BUFFER_OVERFLOW); FsDeviceInfo->DeviceType = FILE_DEVICE_CD_ROM; - FsDeviceInfo->Characteristics = 0; /* FIXME: fix this !! */ + FsDeviceInfo->Characteristics = DeviceObject->Characteristics; DPRINT("FsdGetFsDeviceInformation() finished.\n"); @@ -203,7 +207,8 @@ break; case FileFsDeviceInformation: - Status = CdfsGetFsDeviceInformation(SystemBuffer, + Status = CdfsGetFsDeviceInformation(DeviceObject, + SystemBuffer, &BufferLength); break; Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Dec 6 19:49:19 2009 @@ -425,7 +425,7 @@ ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, NULL, FILE_DEVICE_DISK_FILE_SYSTEM, - 0, + DeviceToMount->Characteristics, FALSE, &DeviceObject); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Sun Dec 6 19:49:19 2009 @@ -129,8 +129,12 @@ static NTSTATUS -FsdGetFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, - PULONG BufferLength) +FsdGetFsDeviceInformation +( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, + PULONG BufferLength +) { DPRINT("FsdGetFsDeviceInformation()\n"); DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); @@ -141,7 +145,7 @@ return(STATUS_BUFFER_OVERFLOW); FsDeviceInfo->DeviceType = FILE_DEVICE_DISK; - FsDeviceInfo->Characteristics = 0; /* FIXME: fix this !! */ + FsDeviceInfo->Characteristics = DeviceObject->Characteristics; DPRINT("FsdGetFsDeviceInformation() finished.\n"); @@ -343,7 +347,8 @@ break; case FileFsDeviceInformation: - RC = FsdGetFsDeviceInformation(SystemBuffer, + RC = FsdGetFsDeviceInformation(IrpContext->DeviceObject, + SystemBuffer, &BufferLength); break;

14 years, 10 months

[cwittich] 44441: sync shlwapi with wine 1.1.34

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Dec 6 16:38:07 2009 New Revision: 44441 URL: http://svn.reactos.org/svn/reactos?rev=44441&view=rev Log: sync shlwapi with wine 1.1.34 Modified: trunk/reactos/dll/win32/shlwapi/reg.c trunk/reactos/dll/win32/shlwapi/shlwapi.spec Modified: trunk/reactos/dll/win32/shlwapi/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/reg.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/reg.c [iso-8859-1] Sun Dec 6 16:38:07 2009 @@ -200,7 +200,7 @@ if (hKey->HKLMkey) ret = RegCloseKey(hKey->HKLMkey); if (hKey->HKLMstart && hKey->HKLMstart != HKEY_LOCAL_MACHINE) - ret = RegCloseKey(hKey->HKCUstart); + ret = RegCloseKey(hKey->HKLMstart); HeapFree(GetProcessHeap(), 0, hKey); return ret; Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Sun Dec 6 16:38:07 2009 @@ -810,8 +810,8 @@ @ stdcall UrlApplySchemeW(wstr ptr ptr long) @ stdcall UrlCanonicalizeA(str ptr ptr long) @ stdcall UrlCanonicalizeW(wstr ptr ptr long) -@ stdcall UrlCombineA(str str str ptr long) -@ stdcall UrlCombineW(wstr wstr wstr ptr long) +@ stdcall UrlCombineA(str str ptr ptr long) +@ stdcall UrlCombineW(wstr wstr ptr ptr long) @ stdcall UrlCompareA(str str long) @ stdcall UrlCompareW(wstr wstr long) @ stdcall UrlCreateFromPathA(str ptr ptr long)

14 years, 10 months

[cwittich] 44440: sync msi with wine 1.1.34

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Dec 6 15:55:00 2009 New Revision: 44440 URL: http://svn.reactos.org/svn/reactos?rev=44440&view=rev Log: sync msi with wine 1.1.34 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/select.c trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/include/psdk/msiquery.h Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -716,7 +716,6 @@ package->Context = MSIINSTALLCONTEXT_MACHINE; } - MSI_SetPropertyW(package, szAllUsers, szOne); return ERROR_SUCCESS; } Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… ============================================================================== --- trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/automation.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -1498,7 +1498,7 @@ case REG_EXPAND_SZ: if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize))) ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError()); - else if (!(szNewString = msi_alloc(dwNewSize))) + else if (!(szNewString = msi_alloc(dwNewSize * sizeof(WCHAR)))) ERR("Out of memory\n"); else if (!(dwNewSize = ExpandEnvironmentStringsW(szString, szNewString, dwNewSize))) ERR("ExpandEnvironmentStrings returned error %d\n", GetLastError()); Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/install.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -717,19 +717,10 @@ /*********************************************************************** * MsiSetMode (MSI.@) */ -BOOL WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) -{ - switch (iRunMode) - { - case MSIRUNMODE_RESERVED11: - case MSIRUNMODE_WINDOWS9X: - case MSIRUNMODE_RESERVED14: - case MSIRUNMODE_RESERVED15: - return FALSE; - default: - FIXME("%d %d %d\n", hInstall, iRunMode, fState); - } - return TRUE; +UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) +{ + FIXME("%d %d %d\n", hInstall, iRunMode, fState); + return ERROR_SUCCESS; } /*********************************************************************** Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/package.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/package.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -345,7 +345,7 @@ WCHAR *ptr; OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; - DWORD verval; + DWORD verval, len; WCHAR verstr[10], bufstr[20]; HDC dc; HKEY hkey; @@ -445,11 +445,12 @@ static const WCHAR szUserLangID[] = {'U','s','e','r','L','a','n','g','u','a','g','e','I','D',0}; static const WCHAR szSystemLangID[] = {'S','y','s','t','e','m','L','a','n','g','u','a','g','e','I','D',0}; static const WCHAR szProductState[] = {'P','r','o','d','u','c','t','S','t','a','t','e',0}; + static const WCHAR szLogonUser[] = {'L','o','g','o','n','U','s','e','r',0}; /* * Other things that probably should be set: * - * ComputerName LogonUser VirtualMemory + * ComputerName VirtualMemory * ShellAdvSupport DefaultUIFont PackagecodeChanging * CaptionHeight BorderTop BorderSide TextHeight * RedirectedDllSupport @@ -653,6 +654,18 @@ sprintfW(bufstr, szIntFormat, MsiQueryProductStateW(package->ProductCode)); MSI_SetPropertyW( package, szProductState, bufstr ); + + len = 0; + if (!GetUserNameW( NULL, &len ) && GetLastError() == ERROR_MORE_DATA) + { + WCHAR *username; + if ((username = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + if (GetUserNameW( username, &len )) + MSI_SetPropertyW( package, szLogonUser, username ); + HeapFree( GetProcessHeap(), 0, username ); + } + } } static UINT msi_load_summary_properties( MSIPACKAGE *package ) Modified: trunk/reactos/dll/win32/msi/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/select.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/select.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/select.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -368,12 +368,14 @@ NULL, }; -static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name ) +static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name, + LPCWSTR table_name ) { UINT r, n=0; MSIVIEW *table; - TRACE("%p adding %s\n", sv, debugstr_w( name ) ); + TRACE("%p adding %s.%s\n", sv, debugstr_w( table_name ), + debugstr_w( name )); if( sv->view.ops != &select_ops ) return ERROR_FUNCTION_FAILED; @@ -389,7 +391,7 @@ if( sv->num_cols >= sv->max_cols ) return ERROR_FUNCTION_FAILED; - r = VIEW_find_column( table, name, NULL, &n ); + r = VIEW_find_column( table, name, table_name, &n ); if( r != ERROR_SUCCESS ) return r; @@ -433,7 +435,7 @@ while( columns ) { - r = SELECT_AddColumn( sv, columns->column ); + r = SELECT_AddColumn( sv, columns->column, columns->table ); if( r ) break; columns = columns->next; Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/storages.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -296,6 +296,7 @@ static const WCHAR Name[] = {'N','a','m','e',0}; static const WCHAR Data[] = {'D','a','t','a',0}; + static const WCHAR _Storages[] = {'_','S','t','o','r','a','g','e','s',0}; TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -320,6 +321,16 @@ { *name = strdupW(name_ptr); if (!*name) return ERROR_FUNCTION_FAILED; + } + + if (table_name) + { + *table_name = strdupW(_Storages); + if (!*table_name) + { + msi_free(name); + return ERROR_FUNCTION_FAILED; + } } if (temporary) Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… ============================================================================== --- trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/streams.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -262,6 +262,7 @@ static const WCHAR Name[] = {'N','a','m','e',0}; static const WCHAR Data[] = {'D','a','t','a',0}; + static const WCHAR _Streams[] = {'_','S','t','r','e','a','m','s',0}; TRACE("(%p, %d, %p, %p, %p, %p)\n", view, n, name, type, temporary, table_name); @@ -286,6 +287,16 @@ { *name = strdupW(name_ptr); if (!*name) return ERROR_FUNCTION_FAILED; + } + + if (table_name) + { + *table_name = strdupW(_Streams); + if (!*table_name) + { + msi_free(name); + return ERROR_FUNCTION_FAILED; + } } if (temporary) Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msi/table.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/table.c [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -1201,7 +1201,7 @@ switch( n ) { case 2: - sprintfW( number, fmt, ival^0x8000 ); + sprintfW( number, fmt, ival-0x8000 ); break; case 4: sprintfW( number, fmt, ival^0x80000000 ); @@ -2573,7 +2573,7 @@ case 2: val = read_raw_int(rawdata, ofs, n); if (val) - MSI_RecordSetInteger( rec, i+1, val^0x8000 ); + MSI_RecordSetInteger( rec, i+1, val-0x8000 ); TRACE(" field %d [0x%04x]\n", i+1, val ); break; case 4: Modified: trunk/reactos/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msiquery.h?re… ============================================================================== --- trunk/reactos/include/psdk/msiquery.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msiquery.h [iso-8859-1] Sun Dec 6 15:55:00 2009 @@ -301,7 +301,7 @@ UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*); BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE); -BOOL WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL); +UINT WINAPI MsiSetMode(MSIHANDLE, MSIRUNMODE, BOOL); UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);

14 years, 10 months

← Newer
1
...
37
38
39
40
41
42
43
...
51
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2009