Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 38150: fix a cast and convert to spec
by tkreuzer＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: tkreuzer Date: Wed Dec 17 09:19:08 2008 New Revision: 38150 URL: http://svn.reactos.org/svn/reactos?rev=38150&view=rev Log: fix a cast and convert to spec Added: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.c branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.c [iso-8859-1] Wed Dec 17 09:19:08 2008 @@ -83,7 +83,7 @@ } /* return current process */ - *Context->lpidProcess = (DWORD)CurrentProcess->UniqueProcessId; + *Context->lpidProcess = (DWORD_PTR)CurrentProcess->UniqueProcessId; /* go to next array slot */ Context->lpidProcess++; Removed: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.def (removed) @@ -1,35 +1,0 @@ -; $Id$ -; -; THIS SOFTWARE IS NOT COPYRIGHTED -; -; This source code is offered for use in the public domain. You may -; use, modify or distribute it freely. -; - -LIBRARY PSAPI.DLL -EXPORTS -EmptyWorkingSet@4 @1 -EnumDeviceDrivers@12 @2 -EnumPageFilesA@8 @3 -EnumPageFilesW@8 @4 -EnumProcessModules@16 @5 -EnumProcesses@12 @6 -GetDeviceDriverBaseNameA@12 @7 -GetDeviceDriverBaseNameW@12 @8 -GetDeviceDriverFileNameA@12 @9 -GetDeviceDriverFileNameW@12 @10 -GetMappedFileNameA@16 @11 -GetMappedFileNameW@16 @12 -GetModuleBaseNameA@16 @13 -GetModuleBaseNameW@16 @14 -GetModuleFileNameExA@16 @15 -GetModuleFileNameExW@16 @16 -GetModuleInformation@16 @17 -GetPerformanceInfo@8 @18 -GetProcessImageFileNameA@12 @19 -GetProcessImageFileNameW@12 @20 -GetProcessMemoryInfo@12 @21 -GetWsChanges@12 @22 -InitializeProcessForWsWatch@4 @23 -QueryWorkingSet@12 @24 -QueryWorkingSetEx@12 @25 Modified: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] Wed Dec 17 09:19:08 2008 @@ -1,5 +1,5 @@ <module name="psapi" type="win32dll" baseaddress="${BASEADDRESS_PSAPI}" installbase="system32" installname="psapi.dll"> - <importlibrary definition="psapi.def" /> + <importlibrary definition="psapi.spec" /> <include base="psapi">.</include> <include base="psapi">include</include> <define name="_DISABLE_TIDENTS" /> Added: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.spec [iso-8859-1] Wed Dec 17 09:19:08 2008 @@ -1,0 +1,25 @@ +@ stdcall EmptyWorkingSet(ptr) +@ stdcall EnumDeviceDrivers(ptr long ptr) +@ stdcall EnumPageFilesA(ptr ptr) +@ stdcall EnumPageFilesW(ptr ptr) +@ stdcall EnumProcessModules(ptr ptr long ptr) +@ stdcall EnumProcesses(ptr long ptr) +@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) +@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) +@ stdcall GetDeviceDriverFileNameA(ptr ptr long) +@ stdcall GetDeviceDriverFileNameW(ptr ptr long) +@ stdcall GetMappedFileNameA(ptr ptr ptr long) +@ stdcall GetMappedFileNameW(ptr ptr ptr long) +@ stdcall GetModuleBaseNameA(ptr ptr ptr long) +@ stdcall GetModuleBaseNameW(ptr ptr ptr long) +@ stdcall GetModuleFileNameExA(ptr ptr ptr long) +@ stdcall GetModuleFileNameExW(ptr ptr ptr long) +@ stdcall GetModuleInformation(ptr ptr ptr long) +@ stdcall GetPerformanceInfo(ptr long) +@ stdcall GetProcessImageFileNameA(ptr ptr long) +@ stdcall GetProcessImageFileNameW(ptr ptr long) +@ stdcall GetProcessMemoryInfo(ptr ptr long) +@ stdcall GetWsChanges(ptr ptr long) +@ stdcall InitializeProcessForWsWatch(ptr) +@ stdcall QueryWorkingSet(ptr ptr long) +@ stdcall QueryWorkingSetEx(ptr ptr long) Propchange: branches/ros-amd64-bringup/reactos/dll/win32/psapi/psapi.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 38149: Fix pointer<->ULONG cast
by tkreuzer＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: tkreuzer Date: Wed Dec 17 08:46:23 2008 New Revision: 38149 URL: http://svn.reactos.org/svn/reactos?rev=38149&view=rev Log: Fix pointer<->ULONG cast Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_helpers.c Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_helpers.c [iso-8859-1] Wed Dec 17 08:46:23 2008 @@ -93,7 +93,7 @@ HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize) { - ULONG AddressOffset; + ULONG_PTR AddressOffset; ULONG AlignedMask = MEM_ALIGNMENT - 1; CHAR *AlignedPtr; ULONG_PTR *AlignedOffsetPtr; @@ -114,7 +114,7 @@ if (AlignedPtr == 0) return DDERR_OUTOFMEMORY; - AddressOffset = MEM_ALIGNMENT - ((ULONG)AlignedPtr & AlignedMask); + AddressOffset = MEM_ALIGNMENT - ((ULONG_PTR)AlignedPtr & AlignedMask); AlignedPtr += AddressOffset;

1 0

[tkreuzer] 38148: convert to spec
by tkreuzer＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: tkreuzer Date: Wed Dec 17 08:43:12 2008 New Revision: 38148 URL: http://svn.reactos.org/svn/reactos?rev=38148&view=rev Log: convert to spec Added: branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.spec (with props) Removed: branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.def Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.rbuild Removed: branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.def (removed) @@ -1,58 +1,0 @@ -LIBRARY d3d8thk -EXPORTS - OsThunkD3dContextCreate@16 = DdEntry1@16 - OsThunkD3dContextDestroy@4 = DdEntry2@4 - OsThunkD3dContextDestroyAll@4 = DdEntry3@4 - OsThunkD3dDrawPrimitives2@28 = DdEntry5@28 - OsThunkD3dValidateTextureStageState@4 = DdEntry4@4 - OsThunkDdAddAttachedSurface@12 = DdEntry7@12 - OsThunkDdAlphaBlt@12 = DdEntry8@12 - OsThunkDdAttachSurface@8 = DdEntry9@8 - OsThunkDdBeginMoCompFrame@8 = DdEntry10@8 - OsThunkDdBlt@12 = DdEntry11@12 - OsThunkDdCanCreateD3DBuffer@8 = DdEntry13@8 - OsThunkDdCanCreateSurface@8 = DdEntry12@8 - OsThunkDdColorControl@8 = DdEntry14@8 - OsThunkDdCreateD3DBuffer@32 = DdEntry17@32 - OsThunkDdCreateDirectDrawObject@4 = DdEntry15@4 - OsThunkDdCreateMoComp@8 = DdEntry18@8 - OsThunkDdCreateSurface@32 = DdEntry16@32 - OsThunkDdCreateSurfaceEx@12 = DdEntry50@12 - OsThunkDdCreateSurfaceObject@24 = DdEntry19@24 - OsThunkDdDeleteDirectDrawObject@4 = DdEntry20@4 - OsThunkDdDeleteSurfaceObject@4 = DdEntry21@4 - OsThunkDdDestroyD3DBuffer@4 = DdEntry24@4 - OsThunkDdDestroyMoComp@8 = DdEntry22@8 - OsThunkDdDestroySurface@8 = DdEntry23@8 - OsThunkDdEndMoCompFrame@8 = DdEntry25@8 - OsThunkDdFlip@20 = DdEntry26@20 - OsThunkDdFlipToGDISurface@8 = DdEntry27@8 - OsThunkDdGetAvailDriverMemory@8 = DdEntry28@8 - OsThunkDdGetBltStatus@8 = DdEntry29@8 - OsThunkDdGetDC@8 = DdEntry30@8 - OsThunkDdGetDriverInfo@8 = DdEntry31@8 - OsThunkDdGetDriverState@4 = DdEntry6@4 - OsThunkDdGetDxHandle@12 = DdEntry32@12 - OsThunkDdGetFlipStatus@8 = DdEntry33@8 - OsThunkDdGetInternalMoCompInfo@8 = DdEntry34@8 - OsThunkDdGetMoCompBuffInfo@8 = DdEntry35@8 - OsThunkDdGetMoCompFormats@8 = DdEntry37@8 - OsThunkDdGetMoCompGuids@8 = DdEntry36@8 - OsThunkDdGetScanLine@8 = DdEntry38@8 - OsThunkDdLock@12 = DdEntry39@12 - OsThunkDdLockD3D@8 = DdEntry40@8 - OsThunkDdQueryDirectDrawObject@44 = DdEntry41@44 - OsThunkDdQueryMoCompStatus@8 = DdEntry42@8 - OsThunkDdReenableDirectDrawObject@8 = DdEntry43@8 - OsThunkDdReleaseDC@4 = DdEntry44@4 - OsThunkDdRenderMoComp@8 = DdEntry45@8 - OsThunkDdResetVisrgn@8 = DdEntry46@8 - OsThunkDdSetColorKey@8 = DdEntry47@8 - OsThunkDdSetExclusiveMode@8 = DdEntry48@8 - OsThunkDdSetGammaRamp@12 = DdEntry49@12 - OsThunkDdSetOverlayPosition@12 = DdEntry51@12 - OsThunkDdUnattachSurface@8 = DdEntry52@8 - OsThunkDdUnlock@8 = DdEntry53@8 - OsThunkDdUnlockD3D@8 = DdEntry54@8 - OsThunkDdUpdateOverlay@12 = DdEntry55@12 - OsThunkDdWaitForVerticalBlank@8 = DdEntry56@8 Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.rbuild [iso-8859-1] Wed Dec 17 08:43:12 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="d3d8thk" type="win32dll" entrypoint="0" installbase="system32" installname="d3d8thk.dll"> - <importlibrary definition="d3d8thk.def" /> + <importlibrary definition="d3d8thk.spec" /> <library>gdi32</library> <file>d3d8thk.rc</file> </module> Added: branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.spec [iso-8859-1] Wed Dec 17 08:43:12 2008 @@ -1,0 +1,56 @@ +@ stdcall OsThunkD3dContextCreate(ptr ptr ptr ptr) gdi32.DdEntry1 +@ stdcall OsThunkD3dContextDestroy(ptr) gdi32.DdEntry2 +@ stdcall OsThunkD3dContextDestroyAll(ptr) gdi32.DdEntry3 +@ stdcall OsThunkD3dDrawPrimitives2(ptr ptr ptr ptr ptr ptr ptr) gdi32.DdEntry5 +@ stdcall OsThunkD3dValidateTextureStageState(ptr) gdi32.DdEntry4 +@ stdcall OsThunkDdAddAttachedSurface(ptr ptr ptr) gdi32.DdEntry7 +@ stdcall OsThunkDdAlphaBlt(ptr ptr ptr) gdi32.DdEntry8 +@ stdcall OsThunkDdAttachSurface(ptr ptr) gdi32.DdEntry9 +@ stdcall OsThunkDdBeginMoCompFrame(ptr ptr) gdi32.DdEntry10 +@ stdcall OsThunkDdBlt(ptr ptr ptr) gdi32.DdEntry11 +@ stdcall OsThunkDdCanCreateD3DBuffer(ptr ptr) gdi32.DdEntry13 +@ stdcall OsThunkDdCanCreateSurface(ptr ptr) gdi32.DdEntry12 +@ stdcall OsThunkDdColorControl(ptr ptr) gdi32.DdEntry14 +@ stdcall OsThunkDdCreateD3DBuffer(ptr ptr ptr ptr ptr ptr ptr ptr) gdi32.DdEntry17 +@ stdcall OsThunkDdCreateDirectDrawObject(ptr) gdi32.DdEntry15 +@ stdcall OsThunkDdCreateMoComp(ptr ptr) gdi32.DdEntry18 +@ stdcall OsThunkDdCreateSurface(ptr ptr ptr ptr ptr ptr ptr ptr) gdi32.DdEntry16 +@ stdcall OsThunkDdCreateSurfaceEx(ptr ptr long) gdi32.DdEntry50 +@ stdcall OsThunkDdCreateSurfaceObject(ptr ptr ptr ptr ptr long) gdi32.DdEntry19 +@ stdcall OsThunkDdDeleteDirectDrawObject(ptr) gdi32.DdEntry20 +@ stdcall OsThunkDdDeleteSurfaceObject(ptr) gdi32.DdEntry21 +@ stdcall OsThunkDdDestroyD3DBuffer(ptr) gdi32.DdEntry24 +@ stdcall OsThunkDdDestroyMoComp(ptr ptr) gdi32.DdEntry22 +@ stdcall OsThunkDdDestroySurface(ptr ptr) gdi32.DdEntry23 +@ stdcall OsThunkDdEndMoCompFrame(ptr ptr) gdi32.DdEntry25 +@ stdcall OsThunkDdFlip(ptr ptr ptr ptr ptr) gdi32.DdEntry26 +@ stdcall OsThunkDdFlipToGDISurface(ptr ptr) gdi32.DdEntry27 +@ stdcall OsThunkDdGetAvailDriverMemory(ptr ptr) gdi32.DdEntry28 +@ stdcall OsThunkDdGetBltStatus(ptr ptr) gdi32.DdEntry29 +@ stdcall OsThunkDdGetDC(ptr ptr) gdi32.DdEntry30 +@ stdcall OsThunkDdGetDriverInfo(ptr ptr) gdi32.DdEntry31 +@ stdcall OsThunkDdGetDriverState(ptr) gdi32.DdEntry6 +@ stdcall OsThunkDdGetDxHandle(ptr ptr long) gdi32.DdEntry32 +@ stdcall OsThunkDdGetFlipStatus(ptr ptr) gdi32.DdEntry33 +@ stdcall OsThunkDdGetInternalMoCompInfo(ptr ptr) gdi32.DdEntry34 +@ stdcall OsThunkDdGetMoCompBuffInfo(ptr ptr) gdi32.DdEntry35 +@ stdcall OsThunkDdGetMoCompFormats(ptr ptr) gdi32.DdEntry37 +@ stdcall OsThunkDdGetMoCompGuids(ptr ptr) gdi32.DdEntry36 +@ stdcall OsThunkDdGetScanLine(ptr ptr) gdi32.DdEntry38 +@ stdcall OsThunkDdLock(ptr ptr ptr) gdi32.DdEntry39 +@ stdcall OsThunkDdLockD3D(ptr ptr) gdi32.DdEntry40 +@ stdcall OsThunkDdQueryDirectDrawObject(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) gdi32.DdEntry41 +@ stdcall OsThunkDdQueryMoCompStatus(ptr ptr) gdi32.DdEntry42 +@ stdcall OsThunkDdReenableDirectDrawObject(ptr ptr) gdi32.DdEntry43 +@ stdcall OsThunkDdReleaseDC(ptr) gdi32.DdEntry44 +@ stdcall OsThunkDdRenderMoComp(ptr ptr) gdi32.DdEntry45 +@ stdcall OsThunkDdResetVisrgn(ptr ptr) gdi32.DdEntry46 +@ stdcall OsThunkDdSetColorKey(ptr ptr) gdi32.DdEntry47 +@ stdcall OsThunkDdSetExclusiveMode(ptr ptr) gdi32.DdEntry48 +@ stdcall OsThunkDdSetGammaRamp(ptr ptr ptr) gdi32.DdEntry49 +@ stdcall OsThunkDdSetOverlayPosition(ptr ptr ptr) gdi32.DdEntry51 +@ stdcall OsThunkDdUnattachSurface(ptr ptr) gdi32.DdEntry52 +@ stdcall OsThunkDdUnlock(ptr ptr) gdi32.DdEntry53 +@ stdcall OsThunkDdUnlockD3D(ptr ptr) gdi32.DdEntry54 +@ stdcall OsThunkDdUpdateOverlay(ptr ptr ptr) gdi32.DdEntry55 +@ stdcall OsThunkDdWaitForVerticalBlank(ptr ptr) gdi32.DdEntry56 Propchange: branches/ros-amd64-bringup/reactos/dll/directx/d3d8thk/d3d8thk.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mkupfer] 38147: move variable declaration
by mkupfer＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: mkupfer Date: Wed Dec 17 07:54:50 2008 New Revision: 38147 URL: http://svn.reactos.org/svn/reactos?rev=38147&view=rev Log: move variable declaration Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Dec 17 07:54:50 2008 @@ -709,6 +709,7 @@ PWCHAR Value; UINT ErrorLine; ULONG ReturnSize; + PGENERIC_LIST_ENTRY ListEntry; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); @@ -811,7 +812,6 @@ wcscpy(SelectedLanguageId,LocaleID); - PGENERIC_LIST_ENTRY ListEntry; /* first we hack LanguageList */ ListEntry = GetFirstListEntry(LanguageList);

1 0

[mkupfer] 38146: Maciej Bialas <bjauy AT tlen DOT pl> - Set LocaleID from unattend.inf - See issue #3943 for more details.
by mkupfer＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: mkupfer Date: Wed Dec 17 07:06:32 2008 New Revision: 38146 URL: http://svn.reactos.org/svn/reactos?rev=38146&view=rev Log: Maciej Bialas <bjauy AT tlen DOT pl> - Set LocaleID from unattend.inf - See issue #3943 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Dec 17 07:06:32 2008 @@ -45,6 +45,7 @@ LONG AutoPartition = 0; WCHAR UnattendInstallationDirectory[MAX_PATH]; PWCHAR SelectedLanguageId; +WCHAR LocaleID[9]; WCHAR DefaultLanguage[20]; WCHAR DefaultKBLayout[20]; BOOLEAN RepairUpdateFlag = FALSE; @@ -555,8 +556,16 @@ } } - SetupCloseInfFile(UnattendInf); - + /* search for LocaleID in the 'Unattend' section*/ + if (SetupFindFirstLineW (UnattendInf, L"Unattend", L"LocaleID", &Context)){ + if (INF_GetData (&Context, NULL, &Value)){ + LONG Id = wcstol(Value, NULL, 16); + swprintf(LocaleID,L"%08lx", Id); + } + } + + SetupCloseInfFile(UnattendInf); + DPRINT("Running unattended setup\n"); } @@ -797,8 +806,44 @@ KeyboardList = CreateKeyboardDriverList(SetupInf); LayoutList = CreateKeyboardLayoutList(SetupInf, DefaultKBLayout); LanguageList = CreateLanguageList(SetupInf, DefaultLanguage); - - return INSTALL_INTRO_PAGE; + + /* new part */ + + wcscpy(SelectedLanguageId,LocaleID); + + PGENERIC_LIST_ENTRY ListEntry; + + /* first we hack LanguageList */ + ListEntry = GetFirstListEntry(LanguageList); + + while (ListEntry != NULL) + { + if (!wcscmp(LocaleID, GetListEntryUserData(ListEntry))) + { + DPRINT("found %S in LanguageList\n",GetListEntryUserData(ListEntry)); + SetCurrentListEntry(LanguageList, ListEntry); + break; + } + + ListEntry = GetNextListEntry(ListEntry); + } + /* now LayoutList */ + ListEntry = GetFirstListEntry(LayoutList); + + while (ListEntry != NULL) + { + if (!wcscmp(LocaleID, GetListEntryUserData(ListEntry))) + { + DPRINT("found %S in LayoutList\n",GetListEntryUserData(ListEntry)); + SetCurrentListEntry(LayoutList, ListEntry); + break; + } + + ListEntry = GetNextListEntry(ListEntry); + } + SetConsoleCodePage(); + + return INSTALL_INTRO_PAGE; } return LANGUAGE_PAGE; @@ -3235,14 +3280,16 @@ return QUIT_PAGE; } - /* Update keyboard layout settings */ - CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); - if (!ProcessKeyboardLayoutRegistry(LayoutList)) - { - MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - + if (!IsUnattendedSetup){ + + /* Update keyboard layout settings */ + CONSOLE_SetStatusText(MUIGetString(STRING_KEYBOARDSETTINGSUPDATE)); + if (!ProcessKeyboardLayoutRegistry(LayoutList)) + { + MUIDisplayError(ERROR_UPDATE_KBSETTINGS, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + } /* Add codepage information to registry */ CONSOLE_SetStatusText(MUIGetString(STRING_CODEPAGEINFOUPDATE)); if (!AddCodePage())

1 0

[cgutman] 38145: - Fix a memory leak
by cgutman＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: cgutman Date: Wed Dec 17 06:15:31 2008 New Revision: 38145 URL: http://svn.reactos.org/svn/reactos?rev=38145&view=rev Log: - Fix a memory leak Modified: branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/transmit.c [iso-8859-1] Wed Dec 17 06:15:31 2008 @@ -216,7 +216,13 @@ return NDIS_STATUS_FAILURE; } - return IPSendFragment(IFC->NdisPacket, NCE, IFC); + if (!NT_SUCCESS((NdisStatus = IPSendFragment(IFC->NdisPacket, NCE, IFC)))) + { + FreeNdisPacket(IFC->NdisPacket); + ExFreePool(IFC); + } + + return NdisStatus; } NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE,

1 0

[cgutman] 38144: - Don't redo things that have already been done in AddGenericHeaderIPv4
by cgutman＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: cgutman Date: Wed Dec 17 06:14:26 2008 New Revision: 38144 URL: http://svn.reactos.org/svn/reactos?rev=38144&view=rev Log: - Don't redo things that have already been done in AddGenericHeaderIPv4 Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Wed Dec 17 06:14:26 2008 @@ -47,8 +47,6 @@ if (!NT_SUCCESS(Status)) return Status; - /* Build UDP header */ - UDPHeader = (PUDP_HEADER)((ULONG_PTR)IPPacket->Data - sizeof(UDP_HEADER)); /* Port values are already big-endian values */ UDPHeader->SourcePort = LocalPort; UDPHeader->DestPort = RemotePort; @@ -56,8 +54,6 @@ UDPHeader->Checksum = 0; /* Length of UDP header and data */ UDPHeader->Length = WH2N(DataLength + sizeof(UDP_HEADER)); - - IPPacket->Data = ((PCHAR)UDPHeader) + sizeof(UDP_HEADER); TI_DbgPrint(MID_TRACE, ("Packet: %d ip %d udp %d payload\n", (PCHAR)UDPHeader - (PCHAR)IPPacket->Header,

1 0

[dchapyshev] 38143: - Implement __lconv_init
by dchapyshev＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: dchapyshev Date: Wed Dec 17 04:24:13 2008 New Revision: 38143 URL: http://svn.reactos.org/svn/reactos?rev=38143&view=rev Log: - Implement __lconv_init Modified: trunk/reactos/lib/sdk/crt/locale/locale.c Modified: trunk/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/locale/locale.… ============================================================================== --- trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Wed Dec 17 04:24:13 2008 @@ -802,7 +802,15 @@ */ void __lconv_init(void) { - FIXME(" stub\n"); + char Char = (char) UCHAR_MAX; + + TRACE("__lconv_init()\n"); + + _lconv.int_frac_digits = Char; + _lconv.frac_digits = Char; + _lconv.p_sep_by_space = _lconv.n_sep_by_space = Char; + _lconv.p_cs_precedes = _lconv.n_cs_precedes = Char; + _lconv.p_sign_posn = _lconv.n_sign_posn = Char; }

1 0

[dgorbachev] 38142: Allow to dynamically load a library which uses static TLS.
by dgorbachev＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: dgorbachev Date: Tue Dec 16 23:51:06 2008 New Revision: 38142 URL: http://svn.reactos.org/svn/reactos?rev=38142&view=rev Log: Allow to dynamically load a library which uses static TLS. Modified: trunk/reactos/dll/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Tue Dec 16 23:51:06 2008 @@ -225,6 +225,7 @@ } } } + DPRINT("LdrpInitializeTlsForThread() done\n"); return STATUS_SUCCESS; } @@ -281,7 +282,7 @@ DbgPrint("EndAddressOfRawData: %x\n", TlsDirectory->EndAddressOfRawData); DbgPrint("SizeOfRawData: %d\n", TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData); DbgPrint("AddressOfIndex: %x\n", TlsDirectory->AddressOfIndex); - DbgPrint("AddressOfCallBacks: %x (%x)\n", TlsDirectory->AddressOfCallBacks, *TlsDirectory->AddressOfCallBacks); + DbgPrint("AddressOfCallBacks: %x\n", TlsDirectory->AddressOfCallBacks); DbgPrint("SizeOfZeroFill: %d\n", TlsDirectory->SizeOfZeroFill); DbgPrint("Characteristics: %x\n", TlsDirectory->Characteristics); #endif @@ -294,6 +295,7 @@ Entry = Entry->Flink; } } + DPRINT("LdrpInitializeTlsForProccess() done\n"); return STATUS_SUCCESS; } @@ -613,7 +615,6 @@ DosName, NULL) == 0) return STATUS_DLL_NOT_FOUND; - if (!RtlDosPathNameToNtPathName_U (DosName, &FullNtFileName, @@ -1696,14 +1697,15 @@ TlsSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData + TlsDirectory->SizeOfZeroFill; - if (TlsSize > 0 && - NtCurrentPeb()->Ldr->Initialized) + + if (TlsSize > 0 && NtCurrentPeb()->Ldr->Initialized) { - TRACE_LDR("Trying to load dynamicly %wZ which contains a tls directory\n", + TRACE_LDR("Trying to dynamically load %wZ which contains a TLS directory\n", &Module->BaseDllName); - return STATUS_UNSUCCESSFUL; + TlsDirectory = NULL; } } + /* * Process each import module. */ @@ -1766,7 +1768,7 @@ else { TRACE_LDR("%wZ has correct binding to %wZ\n", - &Module->BaseDllName, &ImportedModule->BaseDllName); + &Module->BaseDllName, &ImportedModule->BaseDllName); } if (BoundImportDescriptorCurrent->NumberOfModuleForwarderRefs) {

1 0

[dgorbachev] 38141: In GetQueuedCompletionStatus function: - change order of arguments of NtRemoveIoCompletion function, - check maybe it returns STATUS_TIMEOUT.
by dgorbachev＠svn.reactos.org 17 Dec '08

17 Dec '08

Author: dgorbachev Date: Tue Dec 16 23:50:20 2008 New Revision: 38141 URL: http://svn.reactos.org/svn/reactos?rev=38141&view=rev Log: In GetQueuedCompletionStatus function: - change order of arguments of NtRemoveIoCompletion function, - check maybe it returns STATUS_TIMEOUT. Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c Modified: trunk/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/io… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/iocompl.c [iso-8859-1] Tue Dec 16 23:50:20 2008 @@ -99,9 +99,10 @@ { NTSTATUS errCode; IO_STATUS_BLOCK IoStatus; + ULONG_PTR CompletionKey; LARGE_INTEGER Interval; - if (!lpNumberOfBytesTransferred||!lpCompletionKey||!lpOverlapped) + if (!lpNumberOfBytesTransferred || !lpCompletionKey || !lpOverlapped) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -113,18 +114,19 @@ } errCode = NtRemoveIoCompletion(CompletionHandle, - (PVOID*)lpCompletionKey, - (PVOID*)lpNumberOfBytesTransferred, + (PVOID*)&CompletionKey, + (PVOID*)lpOverlapped, &IoStatus, dwMilliseconds == INFINITE ? NULL : &Interval); - if (!NT_SUCCESS(errCode)) { + if (!NT_SUCCESS(errCode) || errCode == STATUS_TIMEOUT) { *lpOverlapped = NULL; SetLastErrorByStatus(errCode); return FALSE; } - *lpOverlapped = (LPOVERLAPPED)IoStatus.Information; + *lpCompletionKey = CompletionKey; + *lpNumberOfBytesTransferred = IoStatus.Information; if (!NT_SUCCESS(IoStatus.Status)){ //failed io operation @@ -133,7 +135,6 @@ } return TRUE; - } @@ -152,10 +153,10 @@ NTSTATUS errCode; errCode = NtSetIoCompletion(CompletionHandle, - (PVOID)dwCompletionKey, - (PVOID)lpOverlapped,//CompletionValue - STATUS_SUCCESS, //IoStatusBlock->Status - dwNumberOfBytesTransferred); //IoStatusBlock->Information + (PVOID)dwCompletionKey, // KeyContext + (PVOID)lpOverlapped, // ApcContext + STATUS_SUCCESS, // IoStatusBlock->Status + dwNumberOfBytesTransferred); // IoStatusBlock->Information if ( !NT_SUCCESS(errCode) ) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs