Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[mf] 15208: Sync to Wine:
by mf＠svn.reactos.com 11 May '05

11 May '05

Sync to Wine: date: 2005/01/26 19:42:40 Hans Leidekker <hans(a)it.vu.nl> Don't use utf8 in rc files. Modified: trunk/reactos/subsys/system/winefile/nl.rc _____ Modified: trunk/reactos/subsys/system/winefile/nl.rc --- trunk/reactos/subsys/system/winefile/nl.rc 2005-05-11 14:14:33 UTC (rev 15207) +++ trunk/reactos/subsys/system/winefile/nl.rc 2005-05-11 14:16:05 UTC (rev 15208) @@ -27,7 +27,7 @@ POPUP "&Bestand" { MENUITEM "&Openen\tEnter" , 101 MENUITEM "&Verplaatsen...\tF7" , 106 - MENUITEM "&Kopi?½ren...\tF8" , 107 + MENUITEM "&KopiÙren...\tF8" , 107 MENUITEM "Naar &klembord...\tF9" , 118 MENUITEM "Ver&wijderen\tDel" , 108 MENUITEM "&Naam wijzigen..." , 109 @@ -52,7 +52,7 @@ } POPUP "&Disk" { - MENUITEM "Disk &kopi?½ren..." , 201 + MENUITEM "Disk &kopiÙren..." , 201 MENUITEM "Disklabel maken..." , 202 MENUITEM SEPARATOR MENUITEM "Disk &formatteren..." , 203

1 0

[mf] 15207: sync to wine:
by mf＠svn.reactos.com 11 May '05

11 May '05

sync to wine: date: 2005/02/16 21:10:59 Alex VillacÝs Lasso <a_villacis(a)palosanto.com> Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all resources, so that Spanish locales other than Spain also use Spanish resources. date: 2005/01/03 14:45:36 JosÚ Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Added Spanish translation. date: 2004/11/21 15:49:24 JosÚ Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Updated Spanish translations. Modified: trunk/reactos/subsys/system/winefile/en.rc Modified: trunk/reactos/subsys/system/winefile/es.rc _____ Modified: trunk/reactos/subsys/system/winefile/en.rc --- trunk/reactos/subsys/system/winefile/en.rc 2005-05-11 14:11:40 UTC (rev 15206) +++ trunk/reactos/subsys/system/winefile/en.rc 2005-05-11 14:14:33 UTC (rev 15207) @@ -74,7 +74,7 @@ MENUITEM "&Select Drive..." , 251 } - POPUP "&Directories" { + POPUP "Di&rectories" { MENUITEM "&Next Level\t+" , 301 MENUITEM "Expand &Tree\t*" , 302 MENUITEM "Expand &all\tStrg+*" , 303 _____ Modified: trunk/reactos/subsys/system/winefile/es.rc --- trunk/reactos/subsys/system/winefile/es.rc 2005-05-11 14:11:40 UTC (rev 15206) +++ trunk/reactos/subsys/system/winefile/es.rc 2005-05-11 14:14:33 UTC (rev 15207) @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL /* Menu */ @@ -27,7 +27,7 @@ { POPUP "&Archivo" { MENUITEM "&Abrir\tEnter" , 101 - MENUITEM "Mo&ver...\tF7" , 106 + MENUITEM "Mo&ver...\tF7" , ID_FILE_MOVE MENUITEM "&Copiar...\tF8" , 107 MENUITEM "E&n portapapeles...\tF9" , 118 MENUITEM "&Eliminar\tDel" , 108 @@ -70,7 +70,7 @@ MENUITEM "&Seleccionar unidad..." , 251 } - POPUP "&Directorios" { + POPUP "Di&rectorios" { MENUITEM "&Siguiente nivel\t+" , 301 MENUITEM "&Expandir ßrbol\t*" , 302 MENUITEM "Expandir &todo\tStrg+*" , 303 @@ -100,7 +100,7 @@ POPUP "&Opciones" { MENUITEM "&Confirmaci¾n..." , -1 - MENUITEM "&Fuente..." , -1 + MENUITEM "&Fuente..." , ID_SELECT_FONT MENUITEM "Personalizar barra &herramientas..." , -1 MENUITEM SEPARATOR MENUITEM "&Barra de herramientas" , ID_VIEW_TOOL_BAR, CHECKED @@ -127,7 +127,7 @@ MENUITEM "Mosaico &horizontal" , ID_WINDOW_TILE_HORZ MENUITEM "Mosaico &vertical\tCtrl+F4" , ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "Alinear &automßticamente" , ID_WINDOW_AUTOSORT + MENUITEM "A&linear automßticamente" , ID_WINDOW_AUTOSORT #endif MENUITEM "Alinear &sÝmbolos" , ID_WINDOW_ARRANGE MENUITEM "&Actualizar\tF5" , ID_REFRESH @@ -162,3 +162,49 @@ PUSHBUTTON "Cancelar" , 2, 158, 23, 47, 14 PUSHBUTTON "&Ayuda" , 254, 158, 43, 47, 14 } + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Seleccione destino" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Ruta:" , -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar" , 1, 158, 6, 47, 14 + PUSHBUTTON "Cancelar" , 2, 158, 23, 47, 14 + PUSHBUTTON "&Examinar" , 254, 158, 43, 47, 14 +} + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Aplicando configuraci¾n de fuente" + IDS_FONT_SEL_ERROR "Error al seleccionar la nueva fuente." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Error" + IDS_ROOT_FS "sf raÝz" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Escritorio" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "A·n no implementado" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nombre" + IDS_COL_SIZE "Tama±o" + IDS_COL_CDATE "FechaC" + IDS_COL_ADATE "FechaA" + IDS_COL_MDATE "FechaM" + IDS_COL_IDX "?ndice/Nodo-i" + IDS_COL_LINKS "Enlaces" + IDS_COL_ATTR "Atributos" + IDS_COL_SEC "Seguridad" +}

1 0

[mf] 15206: add chech and svedish resource files
by mf＠svn.reactos.com 11 May '05

11 May '05

add chech and svedish resource files Modified: trunk/reactos/subsys/system/winefile/winefile.dsp _____ Modified: trunk/reactos/subsys/system/winefile/winefile.dsp --- trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-11 13:20:34 UTC (rev 15205) +++ trunk/reactos/subsys/system/winefile/winefile.dsp 2005-05-11 14:11:40 UTC (rev 15206) @@ -150,6 +150,11 @@ # PROP Default_Filter "" # Begin Source File +SOURCE=.\cz.rc +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=.\de.rc # PROP Exclude_From_Build 1 # End Source File @@ -217,6 +222,11 @@ # End Source File # Begin Source File +SOURCE=.\Sv.rc +# PROP Exclude_From_Build 1 +# End Source File +# Begin Source File + SOURCE=.\toolbar.bmp # End Source File # Begin Source File

1 0

[weiden] 15205: use proper scancode to create upper-case hex numbers directly
by weiden＠svn.reactos.com 11 May '05

11 May '05

use proper scancode to create upper-case hex numbers directly Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-05-11 09:56:24 UTC (rev 15204) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-05-11 13:20:34 UTC (rev 15205) @@ -95,6 +95,7 @@ HKEY langKey; DWORD ret; TCHAR value[9]; + DWORD lenvalue; ret = RegOpenKeyW(HKEY_CURRENT_USER, L"Control Panel\\International", &localeKey); @@ -105,9 +106,10 @@ return; } - wsprintf(value, L"%04x", (DWORD)lcid); + wsprintf(value, L"%04X", (DWORD)lcid); + lenvalue = wcslen(value); - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *) _wcsupr(value), sizeof(value)); + RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, lenvalue * sizeof(WCHAR)); RegCloseKey(localeKey); // Set language @@ -116,8 +118,8 @@ if (ret != ERROR_SUCCESS) return; - RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)_wcsupr(value), sizeof(value)); - RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *) _wcsupr(value), sizeof(value)); + RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, lenvalue * sizeof(WCHAR)); + RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, lenvalue * sizeof(WCHAR)); RegCloseKey(langKey); }

1 0

[greatlrd] 15204: use _wcsupr to make swedish chater display right when it change langues
by greatlrd＠svn.reactos.com 11 May '05

11 May '05

use _wcsupr to make swedish chater display right when it change langues this fix maby also fix rus langues display right now after langues change Modified: trunk/reactos/lib/cpl/intl/locale.c _____ Modified: trunk/reactos/lib/cpl/intl/locale.c --- trunk/reactos/lib/cpl/intl/locale.c 2005-05-10 13:03:40 UTC (rev 15203) +++ trunk/reactos/lib/cpl/intl/locale.c 2005-05-11 09:56:24 UTC (rev 15204) @@ -107,7 +107,7 @@ wsprintf(value, L"%04x", (DWORD)lcid); - RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *)value, sizeof(value)); + RegSetValueExW(localeKey, L"Locale", 0, REG_SZ, (BYTE *) _wcsupr(value), sizeof(value)); RegCloseKey(localeKey); // Set language @@ -116,8 +116,8 @@ if (ret != ERROR_SUCCESS) return; - RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)value, sizeof(value)); - RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *)value, sizeof(value)); + RegSetValueExW(langKey, L"Default", 0, REG_SZ, (BYTE *)_wcsupr(value), sizeof(value)); + RegSetValueExW(langKey, L"InstallLanguage", 0, REG_SZ, (BYTE *) _wcsupr(value), sizeof(value)); RegCloseKey(langKey); }

1 0

[ion] 15196: Reuse buffer in IopQueryNameFile, since it's temporary and the first one we allocate is already large enough. Also block out SEH in ntread/write file since it seems to crash some user mode code.
by ion＠svn.reactos.com 10 May '05

10 May '05

Reuse buffer in IopQueryNameFile, since it's temporary and the first one we allocate is already large enough. Also block out SEH in ntread/write file since it seems to crash some user mode code. Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-09 22:35:43 UTC (rev 15195) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-09 23:39:08 UTC (rev 15196) @@ -414,62 +414,57 @@ ULONG Length, PULONG ReturnLength) { - POBJECT_NAME_INFORMATION LocalInfo; - PFILE_NAME_INFORMATION FileNameInfo; - PFILE_OBJECT FileObject; - ULONG LocalReturnLength; - NTSTATUS Status; + PVOID LocalInfo; + PFILE_OBJECT FileObject; + ULONG LocalReturnLength; + NTSTATUS Status; - DPRINT ("IopQueryNameFile() called\n"); + DPRINT1("IopQueryNameFile() called\n"); - FileObject = (PFILE_OBJECT)ObjectBody; + FileObject = (PFILE_OBJECT)ObjectBody; - LocalInfo = ExAllocatePool (NonPagedPool, - sizeof(OBJECT_NAME_INFORMATION) + - MAX_PATH * sizeof(WCHAR)); - if (LocalInfo == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + /* Allocate Buffer */ + LocalInfo = ExAllocatePool(PagedPool, + sizeof(OBJECT_NAME_INFORMATION) + + MAX_PATH * sizeof(WCHAR)); + if (LocalInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; - Status = ObQueryNameString (FileObject->DeviceObject->Vpb->RealDevice, - LocalInfo, - MAX_PATH * sizeof(WCHAR), - &LocalReturnLength); - if (!NT_SUCCESS (Status)) + /* Query the name */ + Status = ObQueryNameString(FileObject->DeviceObject, + LocalInfo, + MAX_PATH * sizeof(WCHAR), + &LocalReturnLength); + if (!NT_SUCCESS (Status)) { - ExFreePool (LocalInfo); - return Status; + ExFreePool (LocalInfo); + return Status; } - DPRINT ("Device path: %wZ\n", &LocalInfo->Name); + DPRINT ("Device path: %wZ\n", &LocalInfo->Name); + + /* Write Device Path */ + Status = RtlAppendUnicodeStringToString(&ObjectNameInfo->Name, + &((POBJECT_NAME_INFORMATION)LocalInfo)->Name); - Status = RtlAppendUnicodeStringToString (&ObjectNameInfo->Name, - &LocalInfo->Name); - - ExFreePool (LocalInfo); - - FileNameInfo = ExAllocatePool (NonPagedPool, - MAX_PATH * sizeof(WCHAR) + sizeof(ULONG)); - if (FileNameInfo == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - Status = IoQueryFileInformation (FileObject, - FileNameInformation, - MAX_PATH * sizeof(WCHAR) + sizeof(ULONG), - FileNameInfo, - NULL); - if (Status != STATUS_SUCCESS) + /* Query the File name */ + Status = IoQueryFileInformation(FileObject, + FileNameInformation, + LocalReturnLength, + LocalInfo, + NULL); + if (Status != STATUS_SUCCESS) { - ExFreePool (FileNameInfo); - return Status; + ExFreePool(LocalInfo); + return Status; } - Status = RtlAppendUnicodeToString (&ObjectNameInfo->Name, - FileNameInfo->FileName); + /* Write the Name */ + Status = RtlAppendUnicodeToString(&ObjectNameInfo->Name, + ((PFILE_NAME_INFORMATION)LocalInfo)->FileName); + DPRINT ("Total path: %wZ\n", &ObjectNameInfo->Name); - DPRINT ("Total path: %wZ\n", &ObjectNameInfo->Name); - - ExFreePool (FileNameInfo); - - return Status; + /* Free buffer and return */ + ExFreePool(LocalInfo); + return Status; } VOID @@ -3004,10 +2999,11 @@ { _SEH_TRY { + #if 0 ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - #if 0 + ProbeForRead(Buffer, Length, sizeof(ULONG));

4 3

[mbosma] 15203: Set language to czech not to english in cz.rc
by mbosma＠svn.reactos.com 10 May '05

10 May '05

Set language to czech not to english in cz.rc Modified: trunk/rosapps/packmgr/gui/cz.rc _____ Modified: trunk/rosapps/packmgr/gui/cz.rc --- trunk/rosapps/packmgr/gui/cz.rc 2005-05-10 09:38:20 UTC (rev 15202) +++ trunk/rosapps/packmgr/gui/cz.rc 2005-05-10 13:03:40 UTC (rev 15203) @@ -1,5 +1,5 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT /* Dialogs */ IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 180, 200

1 0

[hpoussin] 15202: Allow a NULL PeripheralType in IoQueryDeviceDescription
by hpoussin＠svn.reactos.com 10 May '05

10 May '05

Allow a NULL PeripheralType in IoQueryDeviceDescription Modified: trunk/reactos/ntoskrnl/io/resource.c _____ Modified: trunk/reactos/ntoskrnl/io/resource.c --- trunk/reactos/ntoskrnl/io/resource.c 2005-05-10 09:34:20 UTC (rev 15201) +++ trunk/reactos/ntoskrnl/io/resource.c 2005-05-10 09:38:20 UTC (rev 15202) @@ -255,7 +255,7 @@ goto EndLoop; /* We now have Bus *AND* Controller Information.. is it enough? */ - if (!(*Query->PeripheralType)) + if (!Query->PeripheralType || !(*Query->PeripheralType)) { Status = Query->CalloutRoutine( Query->Context, @@ -740,12 +740,12 @@ */ NTSTATUS NTAPI -IoQueryDeviceDescription(PINTERFACE_TYPE BusType, - PULONG BusNumber, - PCONFIGURATION_TYPE ControllerType, - PULONG ControllerNumber, - PCONFIGURATION_TYPE PeripheralType, - PULONG PeripheralNumber, +IoQueryDeviceDescription(PINTERFACE_TYPE BusType OPTIONAL, + PULONG BusNumber OPTIONAL, + PCONFIGURATION_TYPE ControllerType OPTIONAL, + PULONG ControllerNumber OPTIONAL, + PCONFIGURATION_TYPE PeripheralType OPTIONAL, + PULONG PeripheralNumber OPTIONAL, PIO_QUERY_DEVICE_ROUTINE CalloutRoutine, PVOID Context) {

1 0

[hpoussin] 15201: Implement IoInvalidateDeviceRelations
by hpoussin＠svn.reactos.com 10 May '05

10 May '05

Implement IoInvalidateDeviceRelations Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-10 08:15:08 UTC (rev 15200) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-10 09:34:20 UTC (rev 15201) @@ -27,8 +27,15 @@ /* FUNCTIONS *****************************************************************/ +PDEVICE_NODE FASTCALL +IopGetDeviceNode( + PDEVICE_OBJECT DeviceObject) +{ + return DeviceObject->DeviceObjectExtension->DeviceNode; +} + /* - * @unimplemented + * @implemented */ VOID STDCALL @@ -36,16 +43,9 @@ IN PDEVICE_OBJECT DeviceObject, IN DEVICE_RELATION_TYPE Type) { - CHECKPOINT1; + IopInvalidateDeviceRelations(IopGetDeviceNode(DeviceObject), Type); } -PDEVICE_NODE FASTCALL -IopGetDeviceNode( - PDEVICE_OBJECT DeviceObject) -{ - return DeviceObject->DeviceObjectExtension->DeviceNode; -} - /* * @unimplemented */

1 0

[weiden] 15200: fixed some more warnings
by weiden＠svn.reactos.com 10 May '05

10 May '05

fixed some more warnings Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/security.c _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -131,7 +131,7 @@ * WM_DESTROY - post a quit message and return * */ -INT_PTR CALLBACK +LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static short last_split; _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -642,7 +642,7 @@ * */ -INT_PTR CALLBACK +LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { _____ Modified: trunk/reactos/subsys/system/regedit/hexedit.c --- trunk/reactos/subsys/system/regedit/hexedit.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/hexedit.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -21,6 +21,7 @@ #define WIN32_LEAN_AND_MEAN /* Exclude rarely-used stuff from Windows headers */ #include <windows.h> #include <commctrl.h> +#include <stdio.h> #include <tchar.h> #include "hexedit.h" _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/main.h 2005-05-10 08:15:08 UTC (rev 15200) @@ -80,10 +80,10 @@ extern void ShowAboutBox(HWND hWnd); /* childwnd.c */ -extern INT_PTR CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); +extern LRESULT CALLBACK ChildWndProc(HWND, UINT, WPARAM, LPARAM); /* framewnd.c */ -extern INT_PTR CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); +extern LRESULT CALLBACK FrameWndProc(HWND, UINT, WPARAM, LPARAM); extern void SetupStatusBar(HWND hWnd, BOOL bResize); extern void UpdateStatusBar(void); _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -231,7 +231,7 @@ DWORD convertHexCSVToHex(char *str, BYTE *buf, ULONG bufLen) { char *s = str; /* Pointer to current */ - char *b = buf; /* Pointer to result */ + char *b = (char*)buf; /* Pointer to result */ ULONG strLen = strlen(str); ULONG strPos = 0; @@ -405,7 +405,7 @@ } dwLen++; REGPROC_unescape_string(val_data); - lpbData = val_data; + lpbData = (LPBYTE)val_data; } else if (dwParseType == REG_DWORD) /* Convert the dword types */ { dwLen = convertHexToDWord(val_data, convert); @@ -1195,7 +1195,7 @@ case REG_SZ: case REG_EXPAND_SZ: fputs("\"", file); - REGPROC_export_string(file, *val_buf); + REGPROC_export_string(file, (CHAR*)*val_buf); fputs("\"\n", file); break; _____ Modified: trunk/reactos/subsys/system/regedit/security.c --- trunk/reactos/subsys/system/regedit/security.c 2005-05-10 08:04:08 UTC (rev 15199) +++ trunk/reactos/subsys/system/regedit/security.c 2005-05-10 08:15:08 UTC (rev 15200) @@ -104,7 +104,7 @@ ULONG STDMETHODCALLTYPE CRegKeySecurity_fnAddRef(LPREGKEYSECURITY this) { - return (ULONG)InterlockedIncrement(&this->ref); + return (ULONG)InterlockedIncrement((LONG*)&this->ref); } ULONG STDMETHODCALLTYPE @@ -112,7 +112,7 @@ { ULONG rfc; - rfc = (ULONG)InterlockedDecrement(&this->ref); + rfc = (ULONG)InterlockedDecrement((LONG*)&this->ref); if(rfc == 0) { HeapFree(GetProcessHeap(), 0, this);

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005