Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 65980: [User32] - Disable Ime Class support until Win32k Init bugs are fixed. 8^( Fix test bot.
by jimtabor＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: jimtabor Date: Sun Jan 4 19:40:56 2015 New Revision: 65980 URL: http://svn.reactos.org/svn/reactos?rev=65980&view=rev Log: [User32] - Disable Ime Class support until Win32k Init bugs are fixed. 8^( Fix test bot. Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sun Jan 4 19:40:56 2015 @@ -523,7 +523,7 @@ if (!gfServerProcess) { - InitializeImmEntryTable(); + //InitializeImmEntryTable(); // // Wine is stub and throws an exception so save this for real Imm32.dll testing!!!! //

1 0

[hbelusca] 65979: [FREELDR] Some more code reorg before real fixes happen.
by hbelusca＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: hbelusca Date: Sun Jan 4 19:37:12 2015 New Revision: 65979 URL: http://svn.reactos.org/svn/reactos?rev=65979&view=rev Log: [FREELDR] Some more code reorg before real fixes happen. Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sun Jan 4 19:37:12 2015 @@ -133,10 +133,8 @@ strcpy(BootPath, Path); - strcat(BootPath, "fdisk"); - _itoa(FrldrBootDrive, Device, 10); - strcat(BootPath, "("); + strcat(BootPath, "fdisk("); strcat(BootPath, Device); strcat(BootPath, ")"); } @@ -163,10 +161,8 @@ strcpy(BootPath, Path); - strcat(BootPath, "rdisk"); - _itoa(FrldrBootDrive - 0x80, Device, 10); - strcat(BootPath, "("); + strcat(BootPath, "rdisk("); strcat(BootPath, Device); strcat(BootPath, ")"); @@ -186,10 +182,8 @@ strcpy(BootPath, Path); - strcat(BootPath, "cdrom"); - _itoa(FrldrBootDrive - 0x80, Device, 10); - strcat(BootPath, "("); + strcat(BootPath, "cdrom("); strcat(BootPath, Device); strcat(BootPath, ")"); } Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sun Jan 4 19:37:12 2015 @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* INCLUDES *******************************************************************/ + #include <freeldr.h> #define NDEBUG @@ -25,180 +27,10 @@ DBG_DEFAULT_CHANNEL(FILESYSTEM); +/* GLOBALS ********************************************************************/ + #define TAG_DEVICE_NAME 'NDsF' #define TAG_DEVICE 'vDsF' - -///////////////////////////////////////////////////////////////////////////////////////////// -// FUNCTIONS -///////////////////////////////////////////////////////////////////////////////////////////// - -VOID FileSystemError(PCSTR ErrorString) -{ - ERR("%s\n", ErrorString); - - UiMessageBox(ErrorString); -} - -PFILE FsOpenFile(PCSTR FileName) -{ - CHAR FullPath[MAX_PATH]; - ULONG FileId; - LONG ret; - - // - // Print status message - // - TRACE("Opening file '%s'...\n", FileName); - - // - // Create full file name - // - MachDiskGetBootPath(FullPath, sizeof(FullPath)); - strcat(FullPath, FileName); - - // - // Open the file - // - ret = ArcOpen(FullPath, OpenReadOnly, &FileId); - - // - // Check for success - // - if (ret == ESUCCESS) - return (PFILE)FileId; - else - return (PFILE)0; -} - -VOID FsCloseFile(PFILE FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - - // - // Close the handle - // - ArcClose(FileId); - - // - // Do not check for error; this function is - // supposed to always succeed - // -} - -/* - * ReadFile() - * returns number of bytes read or EOF - */ -BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) -{ - ULONG FileId = (ULONG)FileHandle; - LONG ret; - - // - // Read the file - // - ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead); - - // - // Check for success - // - return (ret == ESUCCESS); -} - -ULONG FsGetFileSize(PFILE FileHandle) -{ - ULONG FileId = (ULONG)FileHandle; - FILEINFORMATION Information; - LONG ret; - - // - // Query file informations - // - ret = ArcGetFileInformation(FileId, &Information); - - // - // Check for error - // - if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) - return 0; - - // - // Return file size - // - return Information.EndingAddress.LowPart; -} - -VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer) -{ - ULONG FileId = (ULONG)FileHandle; - LARGE_INTEGER Position; - - // - // Set file position - // - Position.HighPart = 0; - Position.LowPart = NewFilePointer; - ArcSeek(FileId, &Position, SeekAbsolute); - - // - // Do not check for error; this function is - // supposed to always succeed - // -} - -/* - * FsGetNumPathParts() - * This function parses a path in the form of dir1\dir2\file1.ext - * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) - */ -ULONG FsGetNumPathParts(PCSTR Path) -{ - size_t i; - ULONG num; - - for (i = 0, num = 0; i < strlen(Path); i++) - { - if ((Path[i] == '\\') || (Path[i] == '/')) - { - num++; - } - } - num++; - - TRACE("FsGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num); - - return num; -} - -/* - * FsGetFirstNameFromPath() - * This function parses a path in the form of dir1\dir2\file1.ext - * and puts the first name of the path (e.g. "dir1") in buffer - * compatible with the MSDOS directory structure - */ -VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) -{ - size_t i; - - // Copy all the characters up to the end of the - // string or until we hit a '\' character - // and put them in Buffer - for (i = 0; i < strlen(Path); i++) - { - if ((Path[i] == '\\') || (Path[i] == '/')) - { - break; - } - else - { - Buffer[i] = Path[i]; - } - } - - Buffer[i] = 0; - - TRACE("FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); -} typedef struct tagFILEDATA { @@ -220,6 +52,8 @@ static FILEDATA FileData[MAX_FDS]; static LIST_ENTRY DeviceListHead; + +/* ARC FUNCTIONS **************************************************************/ ARC_STATUS ArcClose(ULONG FileId) { @@ -419,6 +253,176 @@ return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode); } +/* FUNCTIONS ******************************************************************/ + +VOID FileSystemError(PCSTR ErrorString) +{ + ERR("%s\n", ErrorString); + + UiMessageBox(ErrorString); +} + +PFILE FsOpenFile(PCSTR FileName) +{ + CHAR FullPath[MAX_PATH]; + ULONG FileId; + LONG ret; + + // + // Print status message + // + TRACE("Opening file '%s'...\n", FileName); + + // + // Create full file name + // + MachDiskGetBootPath(FullPath, sizeof(FullPath)); + strcat(FullPath, FileName); + + // + // Open the file + // + ret = ArcOpen(FullPath, OpenReadOnly, &FileId); + + // + // Check for success + // + if (ret == ESUCCESS) + return (PFILE)FileId; + else + return (PFILE)0; +} + +VOID FsCloseFile(PFILE FileHandle) +{ + ULONG FileId = (ULONG)FileHandle; + + // + // Close the handle + // + ArcClose(FileId); + + // + // Do not check for error; this function is + // supposed to always succeed + // +} + +/* + * ReadFile() + * returns number of bytes read or EOF + */ +BOOLEAN FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer) +{ + ULONG FileId = (ULONG)FileHandle; + LONG ret; + + // + // Read the file + // + ret = ArcRead(FileId, Buffer, BytesToRead, BytesRead); + + // + // Check for success + // + return (ret == ESUCCESS); +} + +ULONG FsGetFileSize(PFILE FileHandle) +{ + ULONG FileId = (ULONG)FileHandle; + FILEINFORMATION Information; + LONG ret; + + // + // Query file informations + // + ret = ArcGetFileInformation(FileId, &Information); + + // + // Check for error + // + if (ret != ESUCCESS || Information.EndingAddress.HighPart != 0) + return 0; + + // + // Return file size + // + return Information.EndingAddress.LowPart; +} + +VOID FsSetFilePointer(PFILE FileHandle, ULONG NewFilePointer) +{ + ULONG FileId = (ULONG)FileHandle; + LARGE_INTEGER Position; + + // + // Set file position + // + Position.HighPart = 0; + Position.LowPart = NewFilePointer; + ArcSeek(FileId, &Position, SeekAbsolute); + + // + // Do not check for error; this function is + // supposed to always succeed + // +} + +/* + * FsGetNumPathParts() + * This function parses a path in the form of dir1\dir2\file1.ext + * and returns the number of parts it has (i.e. 3 - dir1,dir2,file1.ext) + */ +ULONG FsGetNumPathParts(PCSTR Path) +{ + size_t i; + ULONG num; + + for (i = 0, num = 0; i < strlen(Path); i++) + { + if ((Path[i] == '\\') || (Path[i] == '/')) + { + num++; + } + } + num++; + + TRACE("FsGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num); + + return num; +} + +/* + * FsGetFirstNameFromPath() + * This function parses a path in the form of dir1\dir2\file1.ext + * and puts the first name of the path (e.g. "dir1") in buffer + * compatible with the MSDOS directory structure + */ +VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) +{ + size_t i; + + // Copy all the characters up to the end of the + // string or until we hit a '\' character + // and put them in Buffer + for (i = 0; i < strlen(Path); i++) + { + if ((Path[i] == '\\') || (Path[i] == '/')) + { + break; + } + else + { + Buffer[i] = Path[i]; + } + } + + Buffer[i] = 0; + + TRACE("FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); +} + VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) { DEVICE* pNewEntry;

1 0

[jimtabor] 65978: [User32] - Now move Dde function from stubs.
by jimtabor＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: jimtabor Date: Sun Jan 4 19:34:58 2015 New Revision: 65978 URL: http://svn.reactos.org/svn/reactos?rev=65978&view=rev Log: [User32] - Now move Dde function from stubs. Modified: trunk/reactos/win32ss/user/user32/misc/dde.c trunk/reactos/win32ss/user/user32/misc/stubs.c Modified: trunk/reactos/win32ss/user/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] Sun Jan 4 19:34:58 2015 @@ -2,5 +2,13 @@ #include <user32.h> #include <wine/debug.h> -//WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +/* + * @unimplemented + */ +BOOL WINAPI DdeGetQualityOfService(HWND hWnd, DWORD Reserved, PSECURITY_QUALITY_OF_SERVICE pqosPrev) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Sun Jan 4 19:34:58 2015 @@ -465,15 +465,6 @@ VOID WINAPI ShowStartGlass(DWORD unknown) { UNIMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI DdeGetQualityOfService(HWND hWnd, DWORD Reserved, PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - UNIMPLEMENTED; - return FALSE; } /*

1 0

[jimtabor] 65977: [Win32s] - Implement Ime (only) class support. This is for the new synced class tests. Recommending Developers choice for testing real Imm32.dll support. Should include registry L...
by jimtabor＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: jimtabor Date: Sun Jan 4 19:27:40 2015 New Revision: 65977 URL: http://svn.reactos.org/svn/reactos?rev=65977&view=rev Log: [Win32s] - Implement Ime (only) class support. This is for the new synced class tests. Recommending Developers choice for testing real Imm32.dll support. Should include registry Loading of IMM via Win32k. - Based on patch by Piotr Caban : Move IME window procedure to user32. Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/user32/controls/regcontrol.c trunk/reactos/win32ss/user/user32/include/regcontrol.h trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/user32/misc/imm.c trunk/reactos/win32ss/user/user32/misc/stubs.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -1120,6 +1120,32 @@ INT fCUASLayer:1; }; } IMEINFOEX, *PIMEINFOEX; + +typedef struct tagIMEUI +{ + PWND spwnd; + HIMC hIMC; + HWND hwndIMC; + HKL hKL; + HWND hwndUI; + INT nCntInIMEProc; + struct { + UINT fShowStatus:1; + UINT fActivate:1; + UINT fDestroy:1; + UINT fDefault:1; + UINT fChildThreadDef:1; + UINT fCtrlShowStatus:1; + UINT fFreeActiveEvent:1; + }; +} IMEUI, *PIMEUI; + +// Window Extra data container. +typedef struct _IMEWND +{ + WND; + PIMEUI pimeui; +} IMEWND, *PIMEWND; DWORD Modified: trunk/reactos/win32ss/user/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/regcontrol.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/regcontrol.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -99,6 +99,12 @@ FALSE); if (atom) RegisterDefaultClasses |= ICLASS_TO_MASK(g_SysClasses[i].ClsId); + } + + if ( //gpsi->dwSRVIFlags & SRVINFO_IMM32 && Not supported yet, need NlsMbCodePageTag working in Win32k. + !(RegisterDefaultClasses & ICLASS_TO_MASK(ICLS_IME))) // So, work like XP. + { + RegisterIMEClass(); } return TRUE; @@ -170,8 +176,8 @@ pfnClientW.pfnMDIClientWndProc = MDIClientWndProcW; pfnClientA.pfnStaticWndProc = StaticWndProcA; pfnClientW.pfnStaticWndProc = StaticWndProcW; - pfnClientA.pfnImeWndProc = DefWindowProcA; - pfnClientW.pfnImeWndProc = DefWindowProcW; + pfnClientA.pfnImeWndProc = ImeWndProcA; + pfnClientW.pfnImeWndProc = ImeWndProcW; pfnClientA.pfnGhostWndProc = DefWindowProcA; pfnClientW.pfnGhostWndProc = DefWindowProcW; pfnClientA.pfnHkINLPCWPSTRUCT = DefWindowProcA; @@ -195,7 +201,7 @@ pfnClientWorker.pfnListBoxWndProc = ListBoxWndProc_common; pfnClientWorker.pfnMDIClientWndProc = MDIClientWndProc_common; pfnClientWorker.pfnStaticWndProc = StaticWndProc_common; - pfnClientWorker.pfnImeWndProc = User32DefWindowProc; + pfnClientWorker.pfnImeWndProc = ImeWndProc_common; pfnClientWorker.pfnGhostWndProc = User32DefWindowProc; pfnClientWorker.pfnCtfHookProc = User32DefWindowProc; Modified: trunk/reactos/win32ss/user/user32/include/regcontrol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/regcontrol.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/regcontrol.h [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -41,3 +41,8 @@ ATOM WINAPI RegisterClassExWOWW(WNDCLASSEXW *,LPDWORD,WORD,DWORD,BOOL); BOOL FASTCALL VersionRegisterClass(PCWSTR,LPCWSTR,HANDLE,HMODULE *); + +LRESULT WINAPI ImeWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL); +LRESULT WINAPI ImeWndProcA(HWND,UINT,WPARAM,LPARAM); +LRESULT WINAPI ImeWndProcW(HWND,UINT,WPARAM,LPARAM); +BOOL WINAPI RegisterIMEClass(VOID); Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -17,22 +17,49 @@ #include "resource.h" #include "ntwrapper.h" + +typedef struct +{ + BOOL (WINAPI* pImmIsIME) (HKL); + LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID); + LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID); + LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD); + LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD); + BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA); + BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW); + BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA); + BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW); + BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); + BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); + HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); + BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC); + HIMC (WINAPI* pImmGetContext) (HWND); + HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND); + BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD); + BOOL (WINAPI* pImmRegisterClient) (PVOID, HINSTANCE); + UINT (WINAPI* pImmProcessKey) (HWND, HKL, UINT, LPARAM, DWORD); + +} Imm32ApiTable; + + /* global variables */ extern HINSTANCE User32Instance; #define user32_module User32Instance extern PPROCESSINFO g_ppi; extern ULONG_PTR g_ulSharedDelta; extern PSERVERINFO gpsi; +extern SHAREDINFO gSharedInfo; extern BOOLEAN gfLogonProcess; extern BOOLEAN gfServerProcess; extern PUSER_HANDLE_TABLE gHandleTable; extern PUSER_HANDLE_ENTRY gHandleEntries; extern CRITICAL_SECTION U32AccelCacheLock; -extern HINSTANCE hImmInstance; +extern HINSTANCE ghImm32; extern RTL_CRITICAL_SECTION gcsUserApiHook; extern USERAPIHOOK guah; extern HINSTANCE ghmodUserApiHook; extern HICON hIconSmWindows, hIconWindows; +extern Imm32ApiTable gImmApiEntries; #define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000)) @@ -105,5 +132,6 @@ VOID DeleteFrameBrushes(VOID); BOOL WINAPI GdiValidateHandle(HGDIOBJ); HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom); +BOOL WINAPI InitializeImmEntryTable(VOID); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -14,6 +14,7 @@ PUSER_HANDLE_TABLE gHandleTable = NULL; PUSER_HANDLE_ENTRY gHandleEntries = NULL; PSERVERINFO gpsi = NULL; +SHAREDINFO gSharedInfo = {0}; ULONG_PTR g_ulSharedDelta; BOOLEAN gfLogonProcess = FALSE; BOOLEAN gfServerProcess = FALSE; @@ -262,6 +263,7 @@ gpsi = SharedPtrToUser(UserCon.siClient.psi); gHandleTable = SharedPtrToUser(UserCon.siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); + gSharedInfo = UserCon.siClient; // ERR("1 SI 0x%x : HT 0x%x : D 0x%x\n", UserCon.siClient.psi, UserCon.siClient.aheList, g_ulSharedDelta); } @@ -414,6 +416,7 @@ gpsi = SharedPtrToUser(UserCon->siClient.psi); gHandleTable = SharedPtrToUser(UserCon->siClient.aheList); gHandleEntries = SharedPtrToUser(gHandleTable->handles); + gSharedInfo = UserCon->siClient; } // FIXME: Yet another hack... This call should normally not be done here, but @@ -518,13 +521,22 @@ if (!Init(&ConnectInfo)) return FALSE; + if (!gfServerProcess) + { + InitializeImmEntryTable(); + // + // Wine is stub and throws an exception so save this for real Imm32.dll testing!!!! + // + //gImmApiEntries.pImmRegisterClient(&gSharedInfo, ghImm32); + } + break; } case DLL_PROCESS_DETACH: { - if (hImmInstance) - FreeLibrary(hImmInstance); + if (ghImm32) + FreeLibrary(ghImm32); Cleanup(); break; Modified: trunk/reactos/win32ss/user/user32/misc/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/i… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/imm.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -13,38 +13,31 @@ #include <winnls32.h> #include <wine/debug.h> +#include <strsafe.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); - -typedef struct -{ - BOOL (WINAPI* pImmIsIME) (HKL); - LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID); - LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID); - LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD); - LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD); - BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA); - BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW); - BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM); - HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC); - BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC); - HIMC (WINAPI* pImmGetContext) (HWND); - HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND); - BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD); -} Imm32ApiTable; - -Imm32ApiTable *pImmApiTable = {0}; -HINSTANCE hImmInstance = NULL; - - -static BOOL IsInitialized() -{ - return (hImmInstance != NULL) ? TRUE : FALSE; -} +#define IMM_INIT_MAGIC 0x19650412 + + +Imm32ApiTable gImmApiEntries = {0}; +HINSTANCE ghImm32 = NULL; +BOOL bImmInitializing = FALSE; +BOOL ImmApiTableZero = TRUE; + +HRESULT WINAPI GetImmFileName(PWSTR lpBuffer, UINT uSize) +{ + UINT length; + STRSAFE_LPWSTR Safe = lpBuffer; + + length = GetSystemDirectoryW(lpBuffer, uSize); + if ( length && length < uSize ) + { + StringCchCatW(Safe, uSize, L"\\"); + return StringCchCatW(Safe, uSize, L"IMM32.DLL"); + } + return StringCchCopyW(Safe, uSize, L"IMM32.DLL"); +} /* * This function should not be implemented, it is used, @@ -63,101 +56,276 @@ HIMC WINAPI IMM_ImmGetContext(HWND hwnd) { return 0; } HWND WINAPI IMM_ImmGetDefaultIMEWnd(HWND hwnd) { return 0; } BOOL WINAPI IMM_ImmNotifyIME(HIMC himc, DWORD dword1, DWORD dword2, DWORD dword3) { return 0; } - -/* - * @unimplemented - */ -BOOL WINAPI User32InitializeImmEntryTable(DWORD dwUnknown) -{ - UNIMPLEMENTED; - - if (dwUnknown != 0x19650412) /* FIXME */ - return FALSE; - - if (IsInitialized()) +BOOL WINAPI IMM_ImmRegisterClient(PVOID ptr, HINSTANCE hMod) { return 0; } +UINT WINAPI IMM_ImmProcessKey(HWND hwnd, HKL hkl, UINT Vk, LPARAM lParam, DWORD HotKey) { return 0; } + +/* + * @unimplemented + */ +BOOL WINAPI IntInitializeImmEntryTable(VOID) +{ + WCHAR ImmFile[MAX_PATH]; + HMODULE imm32 = ghImm32;; + + if (gImmApiEntries.pImmIsIME != 0) + { + ERR("Imm Api Table Init 1\n"); + return TRUE; + } + + GetImmFileName(ImmFile, sizeof(ImmFile)); + TRACE("File %ws\n",ImmFile); + + if (imm32 == NULL) + { + imm32 = GetModuleHandleW(ImmFile); + } + + if (imm32 == NULL) + { + imm32 = ghImm32 = LoadLibraryW(ImmFile); + if (imm32 == NULL) + { + ERR("Did not load!\n"); + return FALSE; + } return TRUE; - - hImmInstance = LoadLibraryW(L"imm32.dll"); - if (!hImmInstance) - return FALSE; - - ZeroMemory(pImmApiTable, sizeof(Imm32ApiTable)); - - pImmApiTable->pImmIsIME = (BOOL (WINAPI*)(HKL)) GetProcAddress(hImmInstance, "ImmIsIME"); - if (!pImmApiTable->pImmIsIME) - pImmApiTable->pImmIsIME = IMM_ImmIsIME; - - pImmApiTable->pImmEscapeA = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(hImmInstance, "ImmEscapeA"); - if (!pImmApiTable->pImmEscapeA) - pImmApiTable->pImmEscapeA = IMM_ImmEscapeAW; - - pImmApiTable->pImmEscapeW = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(hImmInstance, "ImmEscapeW"); - if (!pImmApiTable->pImmEscapeW) - pImmApiTable->pImmEscapeW = IMM_ImmEscapeAW; - - pImmApiTable->pImmGetCompositionStringA = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(hImmInstance, "ImmGetCompositionStringA"); - if (!pImmApiTable->pImmGetCompositionStringA) - pImmApiTable->pImmGetCompositionStringA = IMM_ImmGetCompositionStringAW; - - pImmApiTable->pImmGetCompositionStringW = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(hImmInstance, "ImmGetCompositionStringW"); - if (!pImmApiTable->pImmGetCompositionStringW) - pImmApiTable->pImmGetCompositionStringW = IMM_ImmGetCompositionStringAW; - - pImmApiTable->pImmGetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(hImmInstance, "ImmGetCompositionFontA"); - if (!pImmApiTable->pImmGetCompositionFontA) - pImmApiTable->pImmGetCompositionFontA = IMM_ImmGetCompositionFontA; - - pImmApiTable->pImmGetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(hImmInstance, "ImmGetCompositionFontW"); - if (!pImmApiTable->pImmGetCompositionFontW) - pImmApiTable->pImmGetCompositionFontW = IMM_ImmGetCompositionFontW; - - pImmApiTable->pImmSetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(hImmInstance, "ImmSetCompositionFontA"); - if (!pImmApiTable->pImmSetCompositionFontA) - pImmApiTable->pImmSetCompositionFontA = IMM_ImmSetCompositionFontA; - - pImmApiTable->pImmSetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(hImmInstance, "ImmSetCompositionFontW"); - if (!pImmApiTable->pImmSetCompositionFontW) - pImmApiTable->pImmSetCompositionFontW = IMM_ImmSetCompositionFontW; - - pImmApiTable->pImmGetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(hImmInstance, "ImmGetCompositionWindow"); - if (!pImmApiTable->pImmGetCompositionWindow) - pImmApiTable->pImmGetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - pImmApiTable->pImmSetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(hImmInstance, "ImmSetCompositionWindow"); - if (!pImmApiTable->pImmSetCompositionWindow) - pImmApiTable->pImmSetCompositionWindow = IMM_ImmSetGetCompositionWindow; - - pImmApiTable->pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(hImmInstance, "ImmAssociateContext"); - if (!pImmApiTable->pImmAssociateContext) - pImmApiTable->pImmAssociateContext = IMM_ImmAssociateContext; - - pImmApiTable->pImmReleaseContext = (BOOL (WINAPI*)(HWND, HIMC)) GetProcAddress(hImmInstance, "ImmReleaseContext"); - if (!pImmApiTable->pImmReleaseContext) - pImmApiTable->pImmReleaseContext = IMM_ImmReleaseContext; - - pImmApiTable->pImmGetContext = (HIMC (WINAPI*)(HWND)) GetProcAddress(hImmInstance, "ImmGetContext"); - if (!pImmApiTable->pImmGetContext) - pImmApiTable->pImmGetContext = IMM_ImmGetContext; - - pImmApiTable->pImmGetDefaultIMEWnd = (HWND (WINAPI*)(HWND)) GetProcAddress(hImmInstance, "ImmGetDefaultIMEWnd"); - if (!pImmApiTable->pImmGetDefaultIMEWnd) - pImmApiTable->pImmGetDefaultIMEWnd = IMM_ImmGetDefaultIMEWnd; - - pImmApiTable->pImmNotifyIME = (BOOL (WINAPI*)(HIMC, DWORD, DWORD, DWORD)) GetProcAddress(hImmInstance, "ImmNotifyIME"); - if (!pImmApiTable->pImmNotifyIME) - pImmApiTable->pImmNotifyIME = IMM_ImmNotifyIME; + } + + if (ImmApiTableZero) + { + ImmApiTableZero = FALSE; + ZeroMemory(&gImmApiEntries, sizeof(Imm32ApiTable)); + } + + gImmApiEntries.pImmIsIME = (BOOL (WINAPI*)(HKL)) GetProcAddress(imm32, "ImmIsIME"); + if (!gImmApiEntries.pImmIsIME) + gImmApiEntries.pImmIsIME = IMM_ImmIsIME; + + gImmApiEntries.pImmEscapeA = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeA"); + if (!gImmApiEntries.pImmEscapeA) + gImmApiEntries.pImmEscapeA = IMM_ImmEscapeAW; + + gImmApiEntries.pImmEscapeW = (LRESULT (WINAPI*)(HKL, HIMC, UINT, LPVOID)) GetProcAddress(imm32, "ImmEscapeW"); + if (!gImmApiEntries.pImmEscapeW) + gImmApiEntries.pImmEscapeW = IMM_ImmEscapeAW; + + gImmApiEntries.pImmGetCompositionStringA = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringA"); + if (!gImmApiEntries.pImmGetCompositionStringA) + gImmApiEntries.pImmGetCompositionStringA = IMM_ImmGetCompositionStringAW; + + gImmApiEntries.pImmGetCompositionStringW = (LONG (WINAPI*)(HIMC, DWORD, LPVOID, DWORD)) GetProcAddress(imm32, "ImmGetCompositionStringW"); + if (!gImmApiEntries.pImmGetCompositionStringW) + gImmApiEntries.pImmGetCompositionStringW = IMM_ImmGetCompositionStringAW; + + gImmApiEntries.pImmGetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmGetCompositionFontA"); + if (!gImmApiEntries.pImmGetCompositionFontA) + gImmApiEntries.pImmGetCompositionFontA = IMM_ImmGetCompositionFontA; + + gImmApiEntries.pImmGetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmGetCompositionFontW"); + if (!gImmApiEntries.pImmGetCompositionFontW) + gImmApiEntries.pImmGetCompositionFontW = IMM_ImmGetCompositionFontW; + + gImmApiEntries.pImmSetCompositionFontA = (BOOL (WINAPI*)(HIMC, LPLOGFONTA)) GetProcAddress(imm32, "ImmSetCompositionFontA"); + if (!gImmApiEntries.pImmSetCompositionFontA) + gImmApiEntries.pImmSetCompositionFontA = IMM_ImmSetCompositionFontA; + + gImmApiEntries.pImmSetCompositionFontW = (BOOL (WINAPI*)(HIMC, LPLOGFONTW)) GetProcAddress(imm32, "ImmSetCompositionFontW"); + if (!gImmApiEntries.pImmSetCompositionFontW) + gImmApiEntries.pImmSetCompositionFontW = IMM_ImmSetCompositionFontW; + + gImmApiEntries.pImmGetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmGetCompositionWindow"); + if (!gImmApiEntries.pImmGetCompositionWindow) + gImmApiEntries.pImmGetCompositionWindow = IMM_ImmSetGetCompositionWindow; + + gImmApiEntries.pImmSetCompositionWindow = (BOOL (WINAPI*)(HIMC, LPCOMPOSITIONFORM)) GetProcAddress(imm32, "ImmSetCompositionWindow"); + if (!gImmApiEntries.pImmSetCompositionWindow) + gImmApiEntries.pImmSetCompositionWindow = IMM_ImmSetGetCompositionWindow; + + gImmApiEntries.pImmAssociateContext = (HIMC (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmAssociateContext"); + if (!gImmApiEntries.pImmAssociateContext) + gImmApiEntries.pImmAssociateContext = IMM_ImmAssociateContext; + + gImmApiEntries.pImmReleaseContext = (BOOL (WINAPI*)(HWND, HIMC)) GetProcAddress(imm32, "ImmReleaseContext"); + if (!gImmApiEntries.pImmReleaseContext) + gImmApiEntries.pImmReleaseContext = IMM_ImmReleaseContext; + + gImmApiEntries.pImmGetContext = (HIMC (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetContext"); + if (!gImmApiEntries.pImmGetContext) + gImmApiEntries.pImmGetContext = IMM_ImmGetContext; + + gImmApiEntries.pImmGetDefaultIMEWnd = (HWND (WINAPI*)(HWND)) GetProcAddress(imm32, "ImmGetDefaultIMEWnd"); + if (!gImmApiEntries.pImmGetDefaultIMEWnd) + gImmApiEntries.pImmGetDefaultIMEWnd = IMM_ImmGetDefaultIMEWnd; + + gImmApiEntries.pImmNotifyIME = (BOOL (WINAPI*)(HIMC, DWORD, DWORD, DWORD)) GetProcAddress(imm32, "ImmNotifyIME"); + if (!gImmApiEntries.pImmNotifyIME) + gImmApiEntries.pImmNotifyIME = IMM_ImmNotifyIME; /* * TODO: Load more functions from imm32.dll * Function like IMPSetIMEW, IMPQueryIMEW etc. call functions - * from imm32.dll through pointers in the structure pImmApiTable. + * from imm32.dll through pointers in the structure gImmApiEntries. * I do not know whether it is necessary to initialize a table * of functions to load user32 (DLL_PROCESS_ATTACH) */ + gImmApiEntries.pImmRegisterClient = (BOOL (WINAPI*)(PVOID, HINSTANCE)) GetProcAddress(imm32, "ImmRegisterClient"); + if (!gImmApiEntries.pImmRegisterClient) + gImmApiEntries.pImmRegisterClient = IMM_ImmRegisterClient; + + gImmApiEntries.pImmProcessKey = (UINT (WINAPI*)(HWND, HKL, UINT, LPARAM, DWORD)) GetProcAddress(imm32, "ImmProcessKey"); + if (!gImmApiEntries.pImmProcessKey) + gImmApiEntries.pImmProcessKey = IMM_ImmProcessKey; + return TRUE; } +BOOL WINAPI InitializeImmEntryTable(VOID) +{ + bImmInitializing = TRUE; + return IntInitializeImmEntryTable(); +} + +BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) +{ + TRACE("(%x)\n", magic); + + if (magic != IMM_INIT_MAGIC) + return FALSE; + + if (gImmApiEntries.pImmIsIME != 0) + { + ERR("Imm Api Table Init 2\n"); + return TRUE; + } + + IntInitializeImmEntryTable(); + + if (ghImm32 == NULL && !bImmInitializing) + { + WCHAR ImmFile[MAX_PATH]; + ERR("IMM32 not installed!\n"); + GetImmFileName(ImmFile, sizeof(ImmFile)); + ERR("File %ws\n",ImmFile); + ghImm32 = LoadLibraryW(ImmFile); + if (ghImm32 == NULL) + { + ERR("Did not load! 2\n"); + return FALSE; + } + } +#if 0 // For real Imm32.dll testing!!!! + if (ghImm32 && !gImmApiEntries.pImmRegisterClient(&gSharedInfo, ghImm32)) + { + ERR("Wine is stubed!\n"); + } +#endif + return TRUE; +} + +LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS +{ + PWND pWnd; + PIMEUI pimeui; + + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) + { + if (msg != WM_NCCREATE) + { + if (unicode) + return DefWindowProcW(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); + } + NtUserSetWindowFNID(hwnd, FNID_IME); + pimeui = HeapAlloc( GetProcessHeap(), 0, sizeof(IMEUI) ); + SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pimeui); + } + else + { + if (pWnd->fnid != FNID_IME) + { + ERR("Wrong window class for Ime! fnId 0x%x\n",pWnd->fnid); + return 0; + } + pimeui = ((PIMEWND)pWnd)->pimeui; + if (pimeui == NULL) + { + ERR("Window is not set to IME!\n"); + return 0; + } + } + } + + if (msg==WM_CREATE || msg==WM_NCCREATE) + return TRUE; + + if (msg==WM_NCDESTROY) + { + HeapFree( GetProcessHeap(), 0, pimeui ); + SetWindowLongPtrW(hwnd, 0, 0); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); + } + + if (unicode) + return DefWindowProcW(hwnd, msg, wParam, lParam); + return DefWindowProcA(hwnd, msg, wParam, lParam); +} + +LRESULT WINAPI ImeWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return ImeWndProc_common(hwnd, msg, wParam, lParam, FALSE); +} + +LRESULT WINAPI ImeWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return ImeWndProc_common(hwnd, msg, wParam, lParam, TRUE); +} + +static const WCHAR imeW[] = {'I','M','E',0}; + +BOOL +WINAPI +RegisterIMEClass(VOID) +{ + WNDCLASSEXW WndClass; + ATOM atom; + + ZeroMemory(&WndClass, sizeof(WndClass)); + + WndClass.cbSize = sizeof(WndClass); + WndClass.lpszClassName = imeW; + WndClass.style = CS_GLOBALCLASS; + WndClass.lpfnWndProc = ImeWndProcW; + WndClass.cbWndExtra = sizeof(LONG_PTR); + WndClass.hCursor = LoadCursorW(NULL, IDC_ARROW); + + atom = RegisterClassExWOWW( &WndClass, + 0, + FNID_IME, + 0, + FALSE); + if (atom) + { + RegisterDefaultClasses |= ICLASS_TO_MASK(ICLS_IME); + return TRUE; + } + ERR("Failed to register IME Class!\n"); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl) +{ + UNIMPLEMENTED; + return FALSE; +} + /* * @unimplemented */ @@ -269,12 +437,11 @@ } /* - * @unimplemented + * @implemented */ UINT WINAPI WINNLSGetIMEHotkey(HWND hwnd) { - UNIMPLEMENTED; - return FALSE; -} + return FALSE; +} Modified: trunk/reactos/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/s… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/stubs.c [iso-8859-1] Sun Jan 4 19:27:40 2015 @@ -471,15 +471,6 @@ * @unimplemented */ BOOL WINAPI DdeGetQualityOfService(HWND hWnd, DWORD Reserved, PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL hKl) { UNIMPLEMENTED; return FALSE;

1 0

[jimtabor] 65976: [Win32k] - Move DDE stuff into its own file. Oh, the stub file too... Fix build.
by jimtabor＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: jimtabor Date: Sun Jan 4 18:15:20 2015 New Revision: 65976 URL: http://svn.reactos.org/svn/reactos?rev=65976&view=rev Log: [Win32k] - Move DDE stuff into its own file. Oh, the stub file too... Fix build. Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sun Jan 4 18:15:20 2015 @@ -66,44 +66,6 @@ return 0; } -BOOL -APIENTRY -NtUserDdeGetQualityOfService( - IN HWND hwndClient, - IN HWND hWndServer, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - -DWORD -APIENTRY -NtUserDdeInitialize( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserDdeSetQualityOfService( - IN HWND hwndClient, - IN PSECURITY_QUALITY_OF_SERVICE pqosNew, - OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) -{ - STUB - - return 0; -} - DWORD APIENTRY NtUserDragObject( @@ -162,17 +124,6 @@ LPWSTR pszItemText, UINT cchItemText, BOOL Ansi) -{ - STUB - - return 0; -} - -BOOL -APIENTRY -NtUserImpersonateDdeClientWindow( - HWND hWndClient, - HWND hWndServer) { STUB

1 0

[jimtabor] 65975: [Win32k] - Move DDE stuff into its own file.
by jimtabor＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: jimtabor Date: Sun Jan 4 18:12:41 2015 New Revision: 65975 URL: http://svn.reactos.org/svn/reactos?rev=65975&view=rev Log: [Win32k] - Move DDE stuff into its own file. Added: trunk/reactos/win32ss/user/ntuser/dde.c - copied, changed from r65974, trunk/reactos/win32ss/user/user32/misc/dde.c Modified: trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Jan 4 18:12:41 2015 @@ -106,6 +106,7 @@ user/ntuser/class.c user/ntuser/clipboard.c user/ntuser/csr.c + user/ntuser/dde.c user/ntuser/defwnd.c user/ntuser/desktop.c user/ntuser/display.c Copied: trunk/reactos/win32ss/user/ntuser/dde.c (from r65974, trunk/reactos/win32ss/user/user32/misc/dde.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Sun Jan 4 18:12:41 2015 @@ -1,6 +1,54 @@ -#include <user32.h> -#include <wine/debug.h> +#include <win32k.h> +//DBG_DEFAULT_CHANNEL(UserMisc); -//WINE_DEFAULT_DEBUG_CHANNEL(ddeml); +BOOL +APIENTRY +NtUserDdeGetQualityOfService( + IN HWND hwndClient, + IN HWND hWndServer, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) +{ + STUB + + return 0; +} + +DWORD +APIENTRY +NtUserDdeInitialize( + DWORD Unknown0, + DWORD Unknown1, + DWORD Unknown2, + DWORD Unknown3, + DWORD Unknown4) +{ + STUB + + return 0; +} + +BOOL +APIENTRY +NtUserDdeSetQualityOfService( + IN HWND hwndClient, + IN PSECURITY_QUALITY_OF_SERVICE pqosNew, + OUT PSECURITY_QUALITY_OF_SERVICE pqosPrev) +{ + STUB + + return 0; +} + +BOOL +APIENTRY +NtUserImpersonateDdeClientWindow( + HWND hWndClient, + HWND hWndServer) +{ + STUB + + return 0; +} +

1 0

[hbelusca] 65974: [FREELDR]: DiskGetBootPath can recognize ramdisk now.
by hbelusca＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: hbelusca Date: Sun Jan 4 17:08:41 2015 New Revision: 65974 URL: http://svn.reactos.org/svn/reactos?rev=65974&view=rev Log: [FREELDR]: DiskGetBootPath can recognize ramdisk now. Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sun Jan 4 17:08:41 2015 @@ -106,11 +106,23 @@ { static char Path[] = "multi(0)disk(0)"; char Device[4]; - char Partition[4]; - PARTITION_TABLE_ENTRY PartitionEntry; MASTER_BOOT_RECORD MasterBootRecord; - if (FrldrBootDrive < 0x80) + /* 0x49 is our magic ramdisk drive, so try to detect it first */ + if (FrldrBootDrive == 0x49) + { + /* This is the ramdisk. See ArmDiskGetBootPath too... */ + + PCCH RamDiskPath = "ramdisk(0)"; + + if (Size < sizeof(RamDiskPath)) + { + return FALSE; + } + + strcpy(BootPath, RamDiskPath); + } + else if (FrldrBootDrive < 0x80) { /* This is a floppy */ @@ -132,6 +144,8 @@ else if (DiskReadBootRecord(FrldrBootDrive, 0, &MasterBootRecord)) { ULONG BootPartition; + PARTITION_TABLE_ENTRY PartitionEntry; + char Partition[4]; /* This is a hard disk */ if (!DiskGetActivePartitionEntry(FrldrBootDrive, &PartitionEntry, &BootPartition))

1 0

[hbelusca] 65973: [FREELDR]: Small code style fixes; add a comment about the extra PXE check case in PcDiskGetBootPath. Fix also its return value.
by hbelusca＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: hbelusca Date: Sun Jan 4 16:43:42 2015 New Revision: 65973 URL: http://svn.reactos.org/svn/reactos?rev=65973&view=rev Log: [FREELDR]: Small code style fixes; add a comment about the extra PXE check case in PcDiskGetBootPath. Fix also its return value. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sun Jan 4 16:43:42 2015 @@ -389,12 +389,19 @@ BOOLEAN PcDiskGetBootPath(char *BootPath, unsigned Size) { - if (PxeInit()) - { - strcpy(BootPath, "net(0)"); - return 0; - } - return DiskGetBootPath(BootPath, Size); + // FIXME: Keep it there, or put it in DiskGetBootPath? + // Or, abstract the notion of network booting to make + // sense for other platforms than the PC (and this idea + // already exists), then we would need to check whether + // we were booting from network (and: PC --> PXE, etc...) + // and if so, set the correct ARC path. But then this new + // logic could be moved back to DiskGetBootPath... + if (PxeInit()) + { + strcpy(BootPath, "net(0)"); + return TRUE; + } + return DiskGetBootPath(BootPath, Size); } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Sun Jan 4 16:43:42 2015 @@ -102,10 +102,7 @@ // // Check for success // - if (ret == ESUCCESS) - return TRUE; - else - return FALSE; + return (ret == ESUCCESS); } ULONG FsGetFileSize(PFILE FileHandle) @@ -156,10 +153,10 @@ */ ULONG FsGetNumPathParts(PCSTR Path) { - size_t i; - ULONG num; - - for (i=0,num=0; i<strlen(Path); i++) + size_t i; + ULONG num; + + for (i = 0, num = 0; i < strlen(Path); i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { @@ -181,12 +178,12 @@ */ VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) { - size_t i; + size_t i; // Copy all the characters up to the end of the // string or until we hit a '\' character // and put them in Buffer - for (i=0; i<strlen(Path); i++) + for (i = 0; i < strlen(Path); i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { @@ -276,8 +273,10 @@ /* Count number of "()", which needs to be replaced by "(0)" */ Count = 0; for (p = Path; p != FileName; p++) + { if (*p == '(' && *(p + 1) == ')') Count++; + } /* Duplicate device name, and replace "()" by "(0)" (if required) */ Length = FileName - Path + Count; @@ -294,14 +293,17 @@ } } else + { DeviceName = Path; + } /* Search for the device */ - pEntry = DeviceListHead.Flink; if (OpenMode == OpenReadOnly || OpenMode == OpenWriteOnly) DeviceOpenMode = OpenMode; else DeviceOpenMode = OpenReadWrite; + + pEntry = DeviceListHead.Flink; while (pEntry != &DeviceListHead) { pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); @@ -312,10 +314,13 @@ { /* Search some room for the device */ for (DeviceId = 0; DeviceId < MAX_FDS; DeviceId++) + { if (!FileData[DeviceId].FuncTable) break; + } if (DeviceId == MAX_FDS) return EMFILE; + /* Try to open the device */ FileData[DeviceId].FuncTable = pDevice->FuncTable; ret = pDevice->FuncTable->Open(pDevice->Prefix, DeviceOpenMode, &DeviceId); @@ -376,8 +381,10 @@ /* Search some room for the device */ for (i = 0; i < MAX_FDS; i++) + { if (!FileData[i].FuncTable) break; + } if (i == MAX_FDS) return EMFILE; @@ -468,4 +475,8 @@ FileData[i].DeviceId = (ULONG)-1; InitializeListHead(&DeviceListHead); -} + + // FIXME: Retrieve the current boot device with MachDiskGetBootPath + // and store it somewhere in order to not call again and again this + // function. +}

1 0

[hbelusca] 65972: [FREELDR]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: hbelusca Date: Sun Jan 4 16:42:37 2015 New Revision: 65972 URL: http://svn.reactos.org/svn/reactos?rev=65972&view=rev Log: [FREELDR]: Whitespace fixes only. Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/include/cmdline.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -33,14 +33,14 @@ #define DBG_DEFAULT_LEVELS (ERR_LEVEL|FIXME_LEVEL) -#define SCREEN 1 -#define RS232 2 -#define BOCHS 4 - -#define COM1 1 -#define COM2 2 -#define COM3 3 -#define COM4 4 +#define SCREEN 1 +#define RS232 2 +#define BOCHS 4 + +#define COM1 1 +#define COM2 2 +#define COM3 3 +#define COM4 4 #define BOCHS_OUTPUT_PORT 0xe9 Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -53,10 +53,10 @@ } #ifdef _M_IX86 - HalpInitializePciStubs(); - HalpInitBusHandler(); + HalpInitializePciStubs(); + HalpInitBusHandler(); #endif - RunLoader(); + RunLoader(); quit: /* If we reach this point, something went wrong before, therefore reboot */ @@ -84,4 +84,3 @@ { return _isctype((char)wc, wctypeFlags); } - Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/cmdline.h [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -21,13 +21,13 @@ typedef struct tagCMDLINEINFO { - const char *DefaultOperatingSystem; - LONG TimeOut; + const char *DefaultOperatingSystem; + LONG TimeOut; } CMDLINEINFO, *PCMDLINEINFO; -void CmdLineParse(char *CmdLine); +VOID CmdLineParse(IN PCHAR CmdLine); -const char *CmdLineGetDefaultOS(void); -LONG CmdLineGetTimeOut(void); +PCCH CmdLineGetDefaultOS(VOID); +LONG CmdLineGetTimeOut(VOID); /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sun Jan 4 16:42:37 2015 @@ -26,7 +26,7 @@ DBG_DEFAULT_CHANNEL(WINDOWS); -//FIXME: Do a better way to retrieve Arc disk information +//FIXME: Find a better way to retrieve ARC disk information extern ULONG reactos_disk_count; extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];

1 0

[ekohl] 65971: [FMIFS] Implement Format().
by ekohl＠svn.reactos.org 04 Jan '15

04 Jan '15

Author: ekohl Date: Sun Jan 4 15:34:23 2015 New Revision: 65971 URL: http://svn.reactos.org/svn/reactos?rev=65971&view=rev Log: [FMIFS] Implement Format(). Modified: trunk/reactos/dll/win32/fmifs/format.c Modified: trunk/reactos/dll/win32/fmifs/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/format.c?r… ============================================================================== --- trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/format.c [iso-8859-1] Sun Jan 4 15:34:23 2015 @@ -23,6 +23,13 @@ IN BOOLEAN QuickFormat, IN PFMIFSCALLBACK Callback) { + FormatEx(DriveRoot, + MediaFlag, + Format, + Label, + QuickFormat, + 0, + Callback); } /* FMIFS.7 */

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