Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu May 8 11:03:10 2008 New Revision: 33367 URL: http://svn.reactos.org/svn/reactos?rev=33367&view=rev Log: - Revert r33314 Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.spec Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm.c [iso-8859-1] Thu May 8 11:03:10 2008 @@ -20,7 +20,6 @@ */ #include <stdarg.h> -#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -35,6 +34,10 @@ #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); + +#define FROM_IME 0xcafe1337 + +static void (*pX11DRV_ForceXIMReset)(HWND); typedef struct tagIMCCInternal { @@ -73,12 +76,15 @@ typedef struct tagInputContextData { + BOOL bInternalState; + BOOL bRead; + BOOL bInComposition; + HFONT textfont; + DWORD dwLock; INPUTCONTEXT IMC; ImmHkl *immKbd; - HWND imeWnd; - UINT lastVK; } InputContextData; typedef struct _tagTRANSMSG { @@ -87,12 +93,12 @@ LPARAM lParam; } TRANSMSG, *LPTRANSMSG; -typedef struct _tagIMMThreadData { - HIMC defaultContext; - HWND hwndDefault; -} IMMThreadData; - -static DWORD tlsIndex = 0; +static InputContextData *root_context = NULL; +static HWND hwndDefault = NULL; +static HANDLE hImeInst; +static const WCHAR WC_IMECLASSNAME[] = {'I','M','E',0}; +static ATOM atIMEClass = 0; + static struct list ImmHklList = LIST_INIT(ImmHklList); /* MSIME messages */ @@ -105,167 +111,15 @@ static UINT WM_MSIME_DOCUMENTFEED; static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; - -#define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) -#define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) - -static BOOL IMM_DestroyContext(HIMC hIMC); - -static inline WCHAR *strdupAtoW( const char *str ) -{ - WCHAR *ret = NULL; - if (str) - { - DWORD len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); - } - return ret; -} - -static inline CHAR *strdupWtoA( const WCHAR *str ) -{ - CHAR *ret = NULL; - if (str) - { - DWORD len = WideCharToMultiByte( CP_ACP, 0, str, -1, NULL, 0, NULL, NULL ); - if ((ret = HeapAlloc( GetProcessHeap(), 0, len ))) - WideCharToMultiByte( CP_ACP, 0, str, -1, ret, len, NULL, NULL ); - } - return ret; -} - -static DWORD convert_candidatelist_WtoA( - LPCANDIDATELIST lpSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen) -{ - DWORD ret, i, len; - - ret = FIELD_OFFSET( CANDIDATELIST, dwOffset[lpSrc->dwCount] ); - if ( lpDst && dwBufLen > 0 ) - { - *lpDst = *lpSrc; - lpDst->dwOffset[0] = ret; - } - - for ( i = 0; i < lpSrc->dwCount; i++) - { - LPBYTE src = (LPBYTE)lpSrc + lpSrc->dwOffset[i]; - - if ( lpDst && dwBufLen > 0 ) - { - LPBYTE dest = (LPBYTE)lpDst + lpDst->dwOffset[i]; - - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, - (LPSTR)dest, dwBufLen, NULL, NULL); - - if ( i + 1 < lpSrc->dwCount ) - lpDst->dwOffset[i+1] = lpDst->dwOffset[i] + len * sizeof(char); - dwBufLen -= len * sizeof(char); - } - else - len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)src, -1, NULL, 0, NULL, NULL); - - ret += len * sizeof(char); - } - - if ( lpDst ) - lpDst->dwSize = ret; - - return ret; -} - -static DWORD convert_candidatelist_AtoW( - LPCANDIDATELIST lpSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen) -{ - DWORD ret, i, len; - - ret = FIELD_OFFSET( CANDIDATELIST, dwOffset[lpSrc->dwCount] ); - if ( lpDst && dwBufLen > 0 ) - { - *lpDst = *lpSrc; - lpDst->dwOffset[0] = ret; - } - - for ( i = 0; i < lpSrc->dwCount; i++) - { - LPBYTE src = (LPBYTE)lpSrc + lpSrc->dwOffset[i]; - - if ( lpDst && dwBufLen > 0 ) - { - LPBYTE dest = (LPBYTE)lpDst + lpDst->dwOffset[i]; - - len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)src, -1, - (LPWSTR)dest, dwBufLen); - - if ( i + 1 < lpSrc->dwCount ) - lpDst->dwOffset[i+1] = lpDst->dwOffset[i] + len * sizeof(WCHAR); - dwBufLen -= len * sizeof(WCHAR); - } - else - len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)src, -1, NULL, 0); - - ret += len * sizeof(WCHAR); - } - - if ( lpDst ) - lpDst->dwSize = ret; - - return ret; -} - -static IMMThreadData* IMM_GetThreadData(void) -{ - return (IMMThreadData*)TlsGetValue(tlsIndex); -} - -static void IMM_InitThreadData(void) -{ - IMMThreadData* data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(IMMThreadData)); - TlsSetValue(tlsIndex,data); - - TRACE("Thread Data Created\n"); -} - -static void IMM_FreeThreadData(void) -{ - IMMThreadData* data = TlsGetValue(tlsIndex); - IMM_DestroyContext(data->defaultContext); - DestroyWindow(data->hwndDefault); - HeapFree(GetProcessHeap(),0,data); - TRACE("Thread Data Destroyed\n"); -} - -static HMODULE LoadDefaultWineIME(void) -{ - char buffer[MAX_PATH], libname[32], *name, *next; - HMODULE module = 0; - HKEY hkey; - - TRACE("Attempting to fall back to wine default IME\n"); - - strcpy( buffer, "x11" ); /* default value */ - /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) - { - DWORD type, count = sizeof(buffer); - RegQueryValueExA( hkey, "Ime", 0, &type, (LPBYTE) buffer, &count ); - RegCloseKey( hkey ); - } - - name = buffer; - while (name) - { - next = strchr( name, ',' ); - if (next) *next++ = 0; - - snprintf( libname, sizeof(libname), "wine%s.drv", name ); - if ((module = LoadLibraryA( libname )) != 0) break; - name = next; - } - - return module; -} +/* + * prototypes + */ +static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam); +static void UpdateDataInDefaultIMEWindow(HWND hwnd, BOOL showable); +static void ImmInternalPostIMEMessage(InputContextData*, UINT, WPARAM, LPARAM); +static void ImmInternalSetOpenStatus(BOOL fOpen); +static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len); /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} @@ -287,49 +141,32 @@ ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); - if (!ptr->hIME) - ptr->hIME = LoadDefaultWineIME(); if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire); - if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL)) + LOAD_FUNCPTR(ImeDestroy); + LOAD_FUNCPTR(ImeSelect); + if (!ptr->pImeInquire || !ptr->pImeDestroy || !ptr->pImeSelect) { FreeLibrary(ptr->hIME); ptr->hIME = NULL; } else { - LOAD_FUNCPTR(ImeDestroy); - LOAD_FUNCPTR(ImeSelect); - if (!ptr->pImeSelect || !ptr->pImeDestroy) - { - FreeLibrary(ptr->hIME); - ptr->hIME = NULL; - } - else - { - LOAD_FUNCPTR(ImeConfigure); - LOAD_FUNCPTR(ImeEscape); - LOAD_FUNCPTR(ImeSetActiveContext); - LOAD_FUNCPTR(ImeToAsciiEx); - LOAD_FUNCPTR(NotifyIME); - LOAD_FUNCPTR(ImeRegisterWord); - LOAD_FUNCPTR(ImeUnregisterWord); - LOAD_FUNCPTR(ImeEnumRegisterWord); - LOAD_FUNCPTR(ImeSetCompositionString); - LOAD_FUNCPTR(ImeConversionList); - LOAD_FUNCPTR(ImeProcessKey); - LOAD_FUNCPTR(ImeGetRegisterWordStyle); - LOAD_FUNCPTR(ImeGetImeMenuItems); - /* make sure our classname is WCHAR */ - if (!is_kbd_ime_unicode(ptr)) - { - WCHAR bufW[17]; - MultiByteToWideChar(CP_ACP, 0, (LPSTR)ptr->imeClassName, - -1, bufW, 17); - lstrcpyW(ptr->imeClassName, bufW); - } - } + ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL); + LOAD_FUNCPTR(ImeConfigure); + LOAD_FUNCPTR(ImeEscape); + LOAD_FUNCPTR(ImeSetActiveContext); + LOAD_FUNCPTR(ImeToAsciiEx); + LOAD_FUNCPTR(NotifyIME); + LOAD_FUNCPTR(ImeRegisterWord); + LOAD_FUNCPTR(ImeUnregisterWord); + LOAD_FUNCPTR(ImeEnumRegisterWord); + LOAD_FUNCPTR(ImeSetCompositionString); + LOAD_FUNCPTR(ImeConversionList); + LOAD_FUNCPTR(ImeProcessKey); + LOAD_FUNCPTR(ImeGetRegisterWordStyle); + LOAD_FUNCPTR(ImeGetImeMenuItems); } } list_add_head(&ImmHklList,&ptr->entry); @@ -354,6 +191,54 @@ } } +static VOID IMM_PostResult(InputContextData *data) +{ + unsigned int i; + LPCOMPOSITIONSTRING compstr; + LPBYTE compdata; + LPWSTR ResultStr; + HIMCC newCompStr; + + TRACE("Posting result as IME_CHAR\n"); + compdata = ImmLockIMCC(root_context->IMC.hCompStr); + compstr = (LPCOMPOSITIONSTRING)compdata; + ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); + + for (i = 0; i < compstr->dwResultStrLen; i++) + ImmInternalPostIMEMessage (root_context, WM_IME_CHAR, ResultStr[i], 1); + + ImmUnlockIMCC(root_context->IMC.hCompStr); + + /* clear the buffer */ + newCompStr = updateResultStr(root_context->IMC.hCompStr, NULL, 0); + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = newCompStr; +} + +static void IMM_Register(void) +{ + WNDCLASSW wndClass; + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; + wndClass.lpfnWndProc = (WNDPROC) IME_WindowProc; + wndClass.cbClsExtra = 0; + wndClass.cbWndExtra = 0; + wndClass.hInstance = hImeInst; + wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); + wndClass.hIcon = NULL; + wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); + wndClass.lpszMenuName = 0; + wndClass.lpszClassName = WC_IMECLASSNAME; + atIMEClass = RegisterClassW(&wndClass); +} + +static void IMM_Unregister(void) +{ + if (atIMEClass) { + UnregisterClassW(WC_IMECLASSNAME, NULL); + } +} + static void IMM_RegisterMessages(void) { WM_MSIME_SERVICE = RegisterWindowMessageA("MSIMEService"); @@ -365,26 +250,29 @@ WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); } + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { + HMODULE x11drv; + TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + hImeInst = hInstDLL; IMM_RegisterMessages(); - tlsIndex = TlsAlloc(); - IMM_InitThreadData(); - break; - case DLL_THREAD_ATTACH: - IMM_InitThreadData(); - break; - case DLL_THREAD_DETACH: - IMM_FreeThreadData(); + x11drv = GetModuleHandleA("winex11.drv"); + if (x11drv) pX11DRV_ForceXIMReset = (void *)GetProcAddress( x11drv, "ForceXIMReset"); break; case DLL_PROCESS_DETACH: - IMM_FreeThreadData(); + if (hwndDefault) + { + DestroyWindow(hwndDefault); + hwndDefault = 0; + } + IMM_Unregister(); IMM_FreeAllImmHkl(); - TlsFree(tlsIndex); break; } return TRUE; @@ -425,6 +313,312 @@ return rc; } +static void ImmInternalSetOpenStatus(BOOL fOpen) +{ + TRACE("Setting internal state to %s\n",(fOpen)?"OPEN":"CLOSED"); + + if (root_context->IMC.fOpen && fOpen == FALSE) + { + ShowWindow(hwndDefault,SW_HIDE); + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = ImmCreateBlankCompStr(); + } + + root_context->IMC.fOpen = fOpen; + root_context->bInternalState = fOpen; + + ImmInternalSendIMENotify(root_context, IMN_SETOPENSTATUS, 0); +} + +static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset, + LPBYTE target, LPBYTE source, DWORD* lenParam, + DWORD* offsetParam, BOOL wchars ) +{ + if (origLen > 0 && origOffset > 0) + { + int truelen = origLen; + if (wchars) + truelen *= sizeof(WCHAR); + + memcpy(&target[currentOffset], &source[origOffset], truelen); + + *lenParam = origLen; + *offsetParam = currentOffset; + currentOffset += truelen; + } + return currentOffset; +} + +static HIMCC updateCompStr(HIMCC old, LPWSTR compstr, DWORD len) +{ + /* we need to make sure the CompStr, CompClaus and CompAttr fields are all + * set and correct */ + int needed_size; + HIMCC rc; + LPBYTE newdata = NULL; + LPBYTE olddata = NULL; + LPCOMPOSITIONSTRING new_one; + LPCOMPOSITIONSTRING lpcs = NULL; + INT current_offset = 0; + + TRACE("%s, %i\n",debugstr_wn(compstr,len),len); + + if (old == NULL && compstr == NULL && len == 0) + return NULL; + + if (old != NULL) + { + olddata = ImmLockIMCC(old); + lpcs = (LPCOMPOSITIONSTRING)olddata; + } + + needed_size = sizeof(COMPOSITIONSTRING) + len * sizeof(WCHAR) + + len + sizeof(DWORD) * 2; + + if (lpcs != NULL) + { + needed_size += lpcs->dwCompReadAttrLen; + needed_size += lpcs->dwCompReadClauseLen; + needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadClauseLen; + needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultClauseLen; + needed_size += lpcs->dwResultStrLen * sizeof(DWORD); + needed_size += lpcs->dwPrivateSize; + } + rc = ImmCreateIMCC(needed_size); + newdata = ImmLockIMCC(rc); + new_one = (LPCOMPOSITIONSTRING)newdata; + + new_one->dwSize = needed_size; + current_offset = sizeof(COMPOSITIONSTRING); + if (lpcs != NULL) + { + current_offset = updateField(lpcs->dwCompReadAttrLen, + lpcs->dwCompReadAttrOffset, + current_offset, newdata, olddata, + &new_one->dwCompReadAttrLen, + &new_one->dwCompReadAttrOffset, FALSE); + + current_offset = updateField(lpcs->dwCompReadClauseLen, + lpcs->dwCompReadClauseOffset, + current_offset, newdata, olddata, + &new_one->dwCompReadClauseLen, + &new_one->dwCompReadClauseOffset, FALSE); + + current_offset = updateField(lpcs->dwCompReadStrLen, + lpcs->dwCompReadStrOffset, + current_offset, newdata, olddata, + &new_one->dwCompReadStrLen, + &new_one->dwCompReadStrOffset, TRUE); + + /* new CompAttr, CompClause, CompStr, dwCursorPos */ + new_one->dwDeltaStart = 0; + + current_offset = updateField(lpcs->dwResultReadClauseLen, + lpcs->dwResultReadClauseOffset, + current_offset, newdata, olddata, + &new_one->dwResultReadClauseLen, + &new_one->dwResultReadClauseOffset, FALSE); + + current_offset = updateField(lpcs->dwResultReadStrLen, + lpcs->dwResultReadStrOffset, + current_offset, newdata, olddata, + &new_one->dwResultReadStrLen, + &new_one->dwResultReadStrOffset, TRUE); + + current_offset = updateField(lpcs->dwResultClauseLen, + lpcs->dwResultClauseOffset, + current_offset, newdata, olddata, + &new_one->dwResultClauseLen, + &new_one->dwResultClauseOffset, FALSE); + + current_offset = updateField(lpcs->dwResultStrLen, + lpcs->dwResultStrOffset, + current_offset, newdata, olddata, + &new_one->dwResultStrLen, + &new_one->dwResultStrOffset, TRUE); + + current_offset = updateField(lpcs->dwPrivateSize, + lpcs->dwPrivateOffset, + current_offset, newdata, olddata, + &new_one->dwPrivateSize, + &new_one->dwPrivateOffset, FALSE); + } + + /* set new data */ + /* CompAttr */ + new_one->dwCompAttrLen = len; + if (len > 0) + { + new_one->dwCompAttrOffset = current_offset; + memset(&newdata[current_offset],ATTR_INPUT,len); + current_offset += len; + } + + /* CompClause */ + if (len > 0) + { + new_one->dwCompClauseLen = sizeof(DWORD) * 2; + new_one->dwCompClauseOffset = current_offset; + *(DWORD*)(&newdata[current_offset]) = 0; + current_offset += sizeof(DWORD); + *(DWORD*)(&newdata[current_offset]) = len; + current_offset += sizeof(DWORD); + } + + /* CompStr */ + new_one->dwCompStrLen = len; + if (len > 0) + { + new_one->dwCompStrOffset = current_offset; + memcpy(&newdata[current_offset],compstr,len*sizeof(WCHAR)); + } + + /* CursorPos */ + new_one->dwCursorPos = len; + + ImmUnlockIMCC(rc); + if (lpcs) + ImmUnlockIMCC(old); + + return rc; +} + +static HIMCC updateResultStr(HIMCC old, LPWSTR resultstr, DWORD len) +{ + /* we need to make sure the ResultStr and ResultClause fields are all + * set and correct */ + int needed_size; + HIMCC rc; + LPBYTE newdata = NULL; + LPBYTE olddata = NULL; + LPCOMPOSITIONSTRING new_one; + LPCOMPOSITIONSTRING lpcs = NULL; + INT current_offset = 0; + + TRACE("%s, %i\n",debugstr_wn(resultstr,len),len); + + if (old == NULL && resultstr == NULL && len == 0) + return NULL; + + if (old != NULL) + { + olddata = ImmLockIMCC(old); + lpcs = (LPCOMPOSITIONSTRING)olddata; + } + + needed_size = sizeof(COMPOSITIONSTRING) + len * sizeof(WCHAR) + + sizeof(DWORD) * 2; + + if (lpcs != NULL) + { + needed_size += lpcs->dwCompReadAttrLen; + needed_size += lpcs->dwCompReadClauseLen; + needed_size += lpcs->dwCompReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwCompAttrLen; + needed_size += lpcs->dwCompClauseLen; + needed_size += lpcs->dwCompStrLen * sizeof(DWORD); + needed_size += lpcs->dwResultReadClauseLen; + needed_size += lpcs->dwResultReadStrLen * sizeof(DWORD); + needed_size += lpcs->dwPrivateSize; + } + rc = ImmCreateIMCC(needed_size); + newdata = ImmLockIMCC(rc); + new_one = (LPCOMPOSITIONSTRING)newdata; + + new_one->dwSize = needed_size; + current_offset = sizeof(COMPOSITIONSTRING); + if (lpcs != NULL) + { + current_offset = updateField(lpcs->dwCompReadAttrLen, + lpcs->dwCompReadAttrOffset, + current_offset, newdata, olddata, + &new_one->dwCompReadAttrLen, + &new_one->dwCompReadAttrOffset, FALSE); + + current_offset = updateField(lpcs->dwCompReadClauseLen, + lpcs->dwCompReadClauseOffset, + current_offset, newdata, olddata, + &new_one->dwCompReadClauseLen, + &new_one->dwCompReadClauseOffset, FALSE); + + current_offset = updateField(lpcs->dwCompReadStrLen, + lpcs->dwCompReadStrOffset, + current_offset, newdata, olddata, + &new_one->dwCompReadStrLen, + &new_one->dwCompReadStrOffset, TRUE); + + current_offset = updateField(lpcs->dwCompAttrLen, + lpcs->dwCompAttrOffset, + current_offset, newdata, olddata, + &new_one->dwCompAttrLen, + &new_one->dwCompAttrOffset, FALSE); + + current_offset = updateField(lpcs->dwCompClauseLen, + lpcs->dwCompClauseOffset, + current_offset, newdata, olddata, + &new_one->dwCompClauseLen, + &new_one->dwCompClauseOffset, FALSE); + + current_offset = updateField(lpcs->dwCompStrLen, + lpcs->dwCompStrOffset, + current_offset, newdata, olddata, + &new_one->dwCompStrLen, + &new_one->dwCompStrOffset, TRUE); + + new_one->dwCursorPos = lpcs->dwCursorPos; + new_one->dwDeltaStart = 0; + + current_offset = updateField(lpcs->dwResultReadClauseLen, + lpcs->dwResultReadClauseOffset, + current_offset, newdata, olddata, + &new_one->dwResultReadClauseLen, + &new_one->dwResultReadClauseOffset, FALSE); + + current_offset = updateField(lpcs->dwResultReadStrLen, + lpcs->dwResultReadStrOffset, + current_offset, newdata, olddata, + &new_one->dwResultReadStrLen, + &new_one->dwResultReadStrOffset, TRUE); + + /* new ResultClause , ResultStr */ + + current_offset = updateField(lpcs->dwPrivateSize, + lpcs->dwPrivateOffset, + current_offset, newdata, olddata, + &new_one->dwPrivateSize, + &new_one->dwPrivateOffset, FALSE); + } + + /* set new data */ + /* ResultClause */ + if (len > 0) + { + new_one->dwResultClauseLen = sizeof(DWORD) * 2; + new_one->dwResultClauseOffset = current_offset; + *(DWORD*)(&newdata[current_offset]) = 0; + current_offset += sizeof(DWORD); + *(DWORD*)(&newdata[current_offset]) = len; + current_offset += sizeof(DWORD); + } + + /* ResultStr */ + new_one->dwResultStrLen = len; + if (len > 0) + { + new_one->dwResultStrOffset = current_offset; + memcpy(&newdata[current_offset],resultstr,len*sizeof(WCHAR)); + } + ImmUnlockIMCC(rc); + if (lpcs) + ImmUnlockIMCC(old); + + return rc; +} + + + /*********************************************************************** * ImmAssociateContext (IMM32.@) */ @@ -435,8 +629,14 @@ TRACE("(%p, %p):\n", hWnd, hIMC); - if (!IMM_GetThreadData()->defaultContext) - IMM_GetThreadData()->defaultContext = ImmCreateContext(); + /* + * WINE SPECIFIC! MAY CONFLICT + * associate the root context we have an XIM created + */ + if (hWnd == 0x000) + { + root_context = (InputContextData*)hIMC; + } /* * If already associated just return @@ -449,24 +649,17 @@ old = (HIMC)RemovePropW(hWnd,szwWineIMCProperty); if (old == NULL) - old = IMM_GetThreadData()->defaultContext; + old = (HIMC)root_context; else if (old == (HIMC)-1) old = NULL; - if (hIMC != IMM_GetThreadData()->defaultContext) + if (hIMC != (HIMC)root_context) { if (hIMC == NULL) /* Meaning disable imm for that window*/ SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); else SetPropW(hWnd,szwWineIMCProperty,(HANDLE)hIMC); } - - if (old) - { - InputContextData *old_data = (InputContextData*)old; - if (old_data->IMC.hWnd == hWnd) - old_data->IMC.hWnd = NULL; - } } if (!hIMC) @@ -509,30 +702,11 @@ BOOL WINAPI ImmConfigureIMEA( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - - TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); - - if (immHkl->hIME && immHkl->pImeConfigure) - { - if (dwMode != IME_CONFIG_REGISTERWORD || !is_kbd_ime_unicode(immHkl)) - return immHkl->pImeConfigure(hKL,hWnd,dwMode,lpData); - else - { - REGISTERWORDW rww; - REGISTERWORDA *rwa = (REGISTERWORDA*)lpData; - BOOL rc; - - rww.lpReading = strdupAtoW(rwa->lpReading); - rww.lpWord = strdupAtoW(rwa->lpWord); - rc = immHkl->pImeConfigure(hKL,hWnd,dwMode,&rww); - HeapFree(GetProcessHeap(),0,rww.lpReading); - HeapFree(GetProcessHeap(),0,rww.lpWord); - return rc; - } - } - else - return FALSE; + FIXME("(%p, %p, %d, %p): stub\n", + hKL, hWnd, dwMode, lpData + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -541,30 +715,11 @@ BOOL WINAPI ImmConfigureIMEW( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - - TRACE("(%p, %p, %d, %p):\n", hKL, hWnd, dwMode, lpData); - - if (immHkl->hIME && immHkl->pImeConfigure) - { - if (dwMode != IME_CONFIG_REGISTERWORD || is_kbd_ime_unicode(immHkl)) - return immHkl->pImeConfigure(hKL,hWnd,dwMode,lpData); - else - { - REGISTERWORDW *rww = (REGISTERWORDW*)lpData; - REGISTERWORDA rwa; - BOOL rc; - - rwa.lpReading = strdupWtoA(rww->lpReading); - rwa.lpWord = strdupWtoA(rww->lpWord); - rc = immHkl->pImeConfigure(hKL,hWnd,dwMode,&rwa); - HeapFree(GetProcessHeap(),0,rwa.lpReading); - HeapFree(GetProcessHeap(),0,rwa.lpWord); - return rc; - } - } - else - return FALSE; + FIXME("(%p, %p, %d, %p): stub\n", + hKL, hWnd, dwMode, lpData + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -573,42 +728,31 @@ HIMC WINAPI ImmCreateContext(void) { InputContextData *new_context; - LPGUIDELINE gl; - LPCANDIDATEINFO ci; new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); /* Load the IME */ new_context->immKbd = IMM_GetImmHkl(GetKeyboardLayout(0)); + /* + * Once we depend on the IME for all the processing like we should + * these will become hard errors and result in creation failures + */ if (!new_context->immKbd->hIME) - { TRACE("IME dll could not be loaded\n"); - HeapFree(GetProcessHeap(),0,new_context); - return 0; - } - - /* the HIMCCs are never NULL */ + + /* hCompStr is never NULL */ new_context->IMC.hCompStr = ImmCreateBlankCompStr(); - new_context->IMC.hMsgBuf = ImmCreateIMCC(0); - new_context->IMC.hCandInfo = ImmCreateIMCC(sizeof(CANDIDATEINFO)); - ci = ImmLockIMCC(new_context->IMC.hCandInfo); - memset(ci,0,sizeof(CANDIDATEINFO)); - ci->dwSize = sizeof(CANDIDATEINFO); - ImmUnlockIMCC(new_context->IMC.hCandInfo); - new_context->IMC.hGuideLine = ImmCreateIMCC(sizeof(GUIDELINE)); - gl = ImmLockIMCC(new_context->IMC.hGuideLine); - memset(gl,0,sizeof(GUIDELINE)); - gl->dwSize = sizeof(GUIDELINE); - ImmUnlockIMCC(new_context->IMC.hGuideLine); + new_context->IMC.hMsgBuf = ImmCreateIMCC(1); /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); - if (!new_context->immKbd->pImeSelect(new_context, TRUE)) + if (new_context->immKbd->hIME && + !new_context->immKbd->pImeSelect(new_context, TRUE)) { TRACE("Selection of IME failed\n"); - IMM_DestroyContext(new_context); + ImmDestroyContext(new_context); return 0; } @@ -618,7 +762,10 @@ return (HIMC)new_context; } -static BOOL IMM_DestroyContext(HIMC hIMC) +/*********************************************************************** + * ImmDestroyContext (IMM32.@) + */ +BOOL WINAPI ImmDestroyContext(HIMC hIMC) { InputContextData *data = (InputContextData*)hIMC; @@ -627,11 +774,8 @@ if (hIMC) { data->immKbd->uSelected --; - data->immKbd->pImeSelect(hIMC, FALSE); - - if (IMM_GetThreadData()->hwndDefault == data->imeWnd) - IMM_GetThreadData()->hwndDefault = NULL; - DestroyWindow(data->imeWnd); + if (data->immKbd->hIME) + data->immKbd->pImeSelect(hIMC, FALSE); ImmDestroyIMCC(data->IMC.hCompStr); ImmDestroyIMCC(data->IMC.hCandInfo); @@ -639,20 +783,15 @@ ImmDestroyIMCC(data->IMC.hPrivate); ImmDestroyIMCC(data->IMC.hMsgBuf); + if (data->textfont) + { + DeleteObject(data->textfont); + data->textfont = NULL; + } + HeapFree(GetProcessHeap(),0,data); } return TRUE; -} - -/*********************************************************************** - * ImmDestroyContext (IMM32.@) - */ -BOOL WINAPI ImmDestroyContext(HIMC hIMC) -{ - if (hIMC != IMM_GetThreadData()->defaultContext) - return IMM_DestroyContext(hIMC); - else - return FALSE; } /*********************************************************************** @@ -672,31 +811,13 @@ LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister, LPVOID lpData) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %s, %d, %s, %p):\n", hKL, lpfnEnumProc, - debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData); - if (immHkl->hIME && immHkl->pImeEnumRegisterWord) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEnumRegisterWord((REGISTERWORDENUMPROCW)lpfnEnumProc, - (LPCWSTR)lpszReading, dwStyle, (LPCWSTR)lpszRegister, lpData); - else - { - LPWSTR lpszwReading = strdupAtoW(lpszReading); - LPWSTR lpszwRegister = strdupAtoW(lpszRegister); - BOOL rc; - - rc = immHkl->pImeEnumRegisterWord((REGISTERWORDENUMPROCW)lpfnEnumProc, - lpszwReading, dwStyle, lpszwRegister, - lpData); - - HeapFree(GetProcessHeap(),0,lpszwReading); - HeapFree(GetProcessHeap(),0,lpszwRegister); - return rc; - } - } - else - return 0; + FIXME("(%p, %p, %s, %d, %s, %p): stub\n", + hKL, lpfnEnumProc, + debugstr_a(lpszReading), dwStyle, + debugstr_a(lpszRegister), lpData + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -707,30 +828,13 @@ LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %s, %d, %s, %p):\n", hKL, lpfnEnumProc, - debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData); - if (immHkl->hIME && immHkl->pImeEnumRegisterWord) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEnumRegisterWord(lpfnEnumProc, lpszReading, dwStyle, - lpszRegister, lpData); - else - { - LPSTR lpszaReading = strdupWtoA(lpszReading); - LPSTR lpszaRegister = strdupWtoA(lpszRegister); - BOOL rc; - - rc = immHkl->pImeEnumRegisterWord(lpfnEnumProc, (LPCWSTR)lpszaReading, - dwStyle, (LPCWSTR)lpszaRegister, lpData); - - HeapFree(GetProcessHeap(),0,lpszaReading); - HeapFree(GetProcessHeap(),0,lpszaRegister); - return rc; - } - } - else - return 0; + FIXME("(%p, %p, %s, %d, %s, %p): stub\n", + hKL, lpfnEnumProc, + debugstr_w(lpszReading), dwStyle, + debugstr_w(lpszRegister), lpData + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -740,22 +844,11 @@ HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); - - if (immHkl->hIME && immHkl->pImeEscape) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEscape(hIMC,uEscape,lpData); - else - { - FIXME("A procedure called with W ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; - } - } - else - return 0; + FIXME("(%p, %p, %d, %p): stub\n", + hKL, hIMC, uEscape, lpData + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -765,62 +858,26 @@ HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); - - if (immHkl->hIME && immHkl->pImeEscape) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEscape(hIMC,uEscape,lpData); - else - { - FIXME("W procedure called with A ime back end\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; - } - } - else - return 0; + FIXME("(%p, %p, %d, %p): stub\n", + hKL, hIMC, uEscape, lpData + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** * ImmGetCandidateListA (IMM32.@) */ DWORD WINAPI ImmGetCandidateListA( - HIMC hIMC, DWORD dwIndex, + HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - InputContextData *data = (InputContextData *)hIMC; - LPCANDIDATEINFO candinfo; - LPCANDIDATELIST candlist; - DWORD ret = 0; - - TRACE("%p, %d, %p, %d\n", hIMC, dwIndex, lpCandList, dwBufLen); - - if (!data || !data->IMC.hCandInfo) - return 0; - - candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) - goto done; - - candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); - if ( !candlist->dwSize || !candlist->dwCount ) - goto done; - - if ( !is_himc_ime_unicode(data) ) - { - ret = candlist->dwSize; - if ( lpCandList && dwBufLen >= ret ) - memcpy(lpCandList, candlist, ret); - } - else - ret = convert_candidatelist_WtoA( candlist, lpCandList, dwBufLen); - -done: - ImmUnlockIMCC(data->IMC.hCandInfo); - return ret; + FIXME("(%p, %d, %p, %d): stub\n", + hIMC, deIndex, + lpCandList, dwBufLen + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -829,30 +886,9 @@ DWORD WINAPI ImmGetCandidateListCountA( HIMC hIMC, LPDWORD lpdwListCount) { - InputContextData *data = (InputContextData *)hIMC; - LPCANDIDATEINFO candinfo; - DWORD ret, count; - - TRACE("%p, %p\n", hIMC, lpdwListCount); - - if (!data || !lpdwListCount || !data->IMC.hCandInfo) - return 0; - - candinfo = ImmLockIMCC(data->IMC.hCandInfo); - - *lpdwListCount = count = candinfo->dwCount; - - if ( !is_himc_ime_unicode(data) ) - ret = candinfo->dwSize; - else - { - ret = sizeof(CANDIDATEINFO); - while ( count-- ) - ret += ImmGetCandidateListA(hIMC, count, NULL, 0); - } - - ImmUnlockIMCC(data->IMC.hCandInfo); - return ret; + FIXME("(%p, %p): stub\n", hIMC, lpdwListCount); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -861,91 +897,35 @@ DWORD WINAPI ImmGetCandidateListCountW( HIMC hIMC, LPDWORD lpdwListCount) { - InputContextData *data = (InputContextData *)hIMC; - LPCANDIDATEINFO candinfo; - DWORD ret, count; - - TRACE("%p, %p\n", hIMC, lpdwListCount); - - if (!data || !lpdwListCount || !data->IMC.hCandInfo) - return 0; - - candinfo = ImmLockIMCC(data->IMC.hCandInfo); - - *lpdwListCount = count = candinfo->dwCount; - - if ( is_himc_ime_unicode(data) ) - ret = candinfo->dwSize; - else - { - ret = sizeof(CANDIDATEINFO); - while ( count-- ) - ret += ImmGetCandidateListW(hIMC, count, NULL, 0); - } - - ImmUnlockIMCC(data->IMC.hCandInfo); - return ret; + FIXME("(%p, %p): stub\n", hIMC, lpdwListCount); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** * ImmGetCandidateListW (IMM32.@) */ DWORD WINAPI ImmGetCandidateListW( - HIMC hIMC, DWORD dwIndex, + HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - InputContextData *data = (InputContextData *)hIMC; - LPCANDIDATEINFO candinfo; - LPCANDIDATELIST candlist; - DWORD ret = 0; - - TRACE("%p, %d, %p, %d\n", hIMC, dwIndex, lpCandList, dwBufLen); - - if (!data || !data->IMC.hCandInfo) - return 0; - - candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) - goto done; - - candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); - if ( !candlist->dwSize || !candlist->dwCount ) - goto done; - - if ( is_himc_ime_unicode(data) ) - { - ret = candlist->dwSize; - if ( lpCandList && dwBufLen >= ret ) - memcpy(lpCandList, candlist, ret); - } - else - ret = convert_candidatelist_AtoW( candlist, lpCandList, dwBufLen); - -done: - ImmUnlockIMCC(data->IMC.hCandInfo); - return ret; + FIXME("(%p, %d, %p, %d): stub\n", + hIMC, deIndex, + lpCandList, dwBufLen + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** * ImmGetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmGetCandidateWindow( - HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate) -{ - InputContextData *data = (InputContextData*)hIMC; - - TRACE("%p, %d, %p\n", hIMC, dwIndex, lpCandidate); - - if (!data || !lpCandidate) - return FALSE; - - if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) - return FALSE; - - *lpCandidate = data->IMC.cfCandForm[dwIndex]; - - return TRUE; + HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate) +{ + FIXME("(%p, %d, %p): stub\n", hIMC, dwBufLen, lpCandidate); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -959,13 +939,13 @@ TRACE("(%p, %p):\n", hIMC, lplf); rc = ImmGetCompositionFontW(hIMC,&lfW); - if (!rc || !lplf) - return FALSE; - - memcpy(lplf,&lfW,sizeof(LOGFONTA)); - WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, + if (rc) + { + memcpy(lplf,&lfW,sizeof(LOGFONTA)); + WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, LF_FACESIZE, NULL, NULL); - return TRUE; + } + return rc; } /*********************************************************************** @@ -977,7 +957,7 @@ TRACE("(%p, %p):\n", hIMC, lplf); - if (!data || !lplf) + if (!data) return FALSE; *lplf = data->IMC.lfFont.W; @@ -1013,7 +993,7 @@ { LPWSTR ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); - TRACE("GCS_RESULTSTR %p %i\n",ResultStr, + TRACE("GSC_RESULTSTR %p %i\n",ResultStr, compstr->dwResultStrLen); buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwResultStrLen * 3 ); @@ -1023,6 +1003,7 @@ if (dwBufLen >= rc) memcpy(lpBuf,buf,rc); + data->bRead = TRUE; HeapFree( GetProcessHeap(), 0, buf ); } else if (dwIndex == GCS_COMPSTR && compstr->dwCompStrLen > 0 && @@ -1030,7 +1011,7 @@ { LPWSTR CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); - TRACE("GCS_COMPSTR %p %i\n", CompString, compstr->dwCompStrLen); + TRACE("GSC_COMPSTR %p %i\n", CompString, compstr->dwCompStrLen); buf = HeapAlloc( GetProcessHeap(), 0, compstr->dwCompStrLen * 3 ); rc = WideCharToMultiByte(CP_ACP, 0, CompString, @@ -1044,7 +1025,7 @@ compstr->dwCompAttrOffset > 0) { LPWSTR Compattr = (LPWSTR)(compdata + compstr->dwCompAttrOffset); - TRACE("GCS_COMPATTR %p %i\n", Compattr , compstr->dwCompAttrLen); + TRACE("GSC_COMPATTR %p %i\n", Compattr , compstr->dwCompAttrLen); rc = compstr->dwCompAttrLen; if (dwBufLen >= rc) @@ -1054,7 +1035,7 @@ compstr->dwCompClauseOffset > 0) { LPWSTR Compclause = (LPWSTR)(compdata + compstr->dwCompClauseOffset); - TRACE("GCS_COMPCLAUSE %p %i\n", Compclause, compstr->dwCompClauseLen); + TRACE("GSC_COMPCLAUSE %p %i\n", Compclause, compstr->dwCompClauseLen); rc = compstr->dwCompClauseLen; if (dwBufLen >= compstr->dwCompClauseLen) @@ -1064,7 +1045,7 @@ compstr->dwResultClauseOffset > 0) { LPWSTR Resultclause = (LPWSTR)(compdata + compstr->dwResultClauseOffset); - TRACE("GCS_RESULTCLAUSE %p %i\n", Resultclause, compstr->dwResultClauseLen); + TRACE("GSC_RESULTCLAUSE %p %i\n", Resultclause, compstr->dwResultClauseLen); rc = compstr->dwResultClauseLen; if (dwBufLen >= compstr->dwResultClauseLen) @@ -1072,7 +1053,7 @@ } else if (dwIndex == GCS_CURSORPOS) { - TRACE("GCS_CURSORPOS\n"); + TRACE("GSC_CURSORPOS\n"); rc = compstr->dwCursorPos; } else if (dwIndex == GCS_DELTASTART) @@ -1117,6 +1098,7 @@ compstr->dwResultStrOffset > 0) { LPWSTR ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); + data->bRead = TRUE; rc = compstr->dwResultStrLen * sizeof(WCHAR); if (dwBufLen >= rc) @@ -1170,7 +1152,7 @@ } else if (dwIndex == GCS_CURSORPOS) { - TRACE("GCS_CURSORPOS\n"); + TRACE("GSC_CURSORPOS\n"); rc = compstr->dwCursorPos; } else if (dwIndex == GCS_DELTASTART) @@ -1181,7 +1163,7 @@ else { FIXME("Unhandled index 0x%x\n",dwIndex); - } + } ImmUnlockIMCC(data->IMC.hCompStr); @@ -1213,14 +1195,12 @@ HIMC rc = NULL; TRACE("%p\n", hWnd); - if (!IMM_GetThreadData()->defaultContext) - IMM_GetThreadData()->defaultContext = ImmCreateContext(); rc = (HIMC)GetPropW(hWnd,szwWineIMCProperty); if (rc == (HIMC)-1) rc = NULL; else if (rc == NULL) - rc = IMM_GetThreadData()->defaultContext; + rc = (HIMC)root_context; if (rc) { @@ -1240,34 +1220,11 @@ LPCSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_a(pSrc), lpDst, - dwBufLen, uFlag); - if (immHkl->hIME && immHkl->pImeConversionList) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeConversionList(hIMC,(LPCWSTR)pSrc,lpDst,dwBufLen,uFlag); - else - { - LPCANDIDATELIST lpwDst; - DWORD ret = 0, len; - LPWSTR pwSrc = strdupAtoW(pSrc); - - len = immHkl->pImeConversionList(hIMC, pwSrc, NULL, 0, uFlag); - lpwDst = HeapAlloc(GetProcessHeap(), 0, len); - if ( lpwDst ) - { - immHkl->pImeConversionList(hIMC, pwSrc, lpwDst, len, uFlag); - ret = convert_candidatelist_WtoA( lpwDst, lpDst, dwBufLen); - HeapFree(GetProcessHeap(), 0, lpwDst); - } - HeapFree(GetProcessHeap(), 0, pwSrc); - - return ret; - } - } - else - return 0; + FIXME("(%p, %p, %s, %p, %d, %d): stub\n", + hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -1278,34 +1235,11 @@ LPCWSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %s, %p, %d, %d):\n", hKL, hIMC, debugstr_w(pSrc), lpDst, - dwBufLen, uFlag); - if (immHkl->hIME && immHkl->pImeConversionList) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeConversionList(hIMC,pSrc,lpDst,dwBufLen,uFlag); - else - { - LPCANDIDATELIST lpaDst; - DWORD ret = 0, len; - LPSTR paSrc = strdupWtoA(pSrc); - - len = immHkl->pImeConversionList(hIMC, (LPCWSTR)paSrc, NULL, 0, uFlag); - lpaDst = HeapAlloc(GetProcessHeap(), 0, len); - if ( lpaDst ) - { - immHkl->pImeConversionList(hIMC, (LPCWSTR)paSrc, lpaDst, len, uFlag); - ret = convert_candidatelist_AtoW( lpaDst, lpDst, dwBufLen); - HeapFree(GetProcessHeap(), 0, lpaDst); - } - HeapFree(GetProcessHeap(), 0, paSrc); - - return ret; - } - } - else - return 0; + FIXME("(%p, %p, %s, %p, %d, %d): stub\n", + hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -1314,18 +1248,11 @@ BOOL WINAPI ImmGetConversionStatus( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence) { - InputContextData *data = (InputContextData*)hIMC; - - TRACE("%p %p %p\n", hIMC, lpfdwConversion, lpfdwSentence); - - if (!data) - return FALSE; - + TRACE("(%p, %p, %p): best guess\n", hIMC, lpfdwConversion, lpfdwSentence); if (lpfdwConversion) - *lpfdwConversion = data->IMC.fdwConversion; + *lpfdwConversion = IME_CMODE_NATIVE; if (lpfdwSentence) - *lpfdwSentence = data->IMC.fdwSentence; - + *lpfdwSentence = IME_SMODE_NONE; return TRUE; } @@ -1334,8 +1261,26 @@ */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { - TRACE("Default is %x\n",(unsigned)IMM_GetThreadData()->hwndDefault); - return IMM_GetThreadData()->hwndDefault; + static int shown = 0; + + if (!shown) { + FIXME("(%p - %p %p ): semi-stub\n", hWnd,hwndDefault, root_context); + shown = 1; + } + + if (hwndDefault == NULL) + { + static const WCHAR the_name[] = {'I','M','E','\0'}; + + IMM_Register(); + hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, WC_IMECLASSNAME, + the_name, WS_POPUP, 0, 0, 1, 1, 0, 0, + hImeInst, 0); + + TRACE("Default created (%p)\n",hwndDefault); + } + + return hwndDefault; } /*********************************************************************** @@ -1510,24 +1455,40 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) { DWORD rc = 0; - ImmHkl *kbd; - TRACE("(%p, %d)\n", hKL, fdwIndex); - kbd = IMM_GetImmHkl(hKL); - - if (kbd && kbd->hIME) - { - switch (fdwIndex) - { - case IGP_PROPERTY: rc = kbd->imeInfo.fdwProperty; break; - case IGP_CONVERSION: rc = kbd->imeInfo.fdwConversionCaps; break; - case IGP_SENTENCE: rc = kbd->imeInfo.fdwSentenceCaps; break; - case IGP_SETCOMPSTR: rc = kbd->imeInfo.fdwSCSCaps; break; - case IGP_SELECT: rc = kbd->imeInfo.fdwSelectCaps; break; - case IGP_GETIMEVERSION: rc = IMEVER_0400; break; - case IGP_UI: rc = 0; break; - default: rc = 0; - } + + switch (fdwIndex) + { + case IGP_PROPERTY: + TRACE("(%s)\n", "IGP_PROPERTY"); + rc = IME_PROP_UNICODE | IME_PROP_AT_CARET; + break; + case IGP_CONVERSION: + FIXME("(%s)\n", "IGP_CONVERSION"); + rc = IME_CMODE_NATIVE; + break; + case IGP_SENTENCE: + FIXME("%s)\n", "IGP_SENTENCE"); + rc = IME_SMODE_AUTOMATIC; + break; + case IGP_SETCOMPSTR: + TRACE("(%s)\n", "IGP_SETCOMPSTR"); + rc = 0; + break; + case IGP_SELECT: + TRACE("(%s)\n", "IGP_SELECT"); + rc = SELECT_CAP_CONVERSION | SELECT_CAP_SENTENCE; + break; + case IGP_GETIMEVERSION: + TRACE("(%s)\n", "IGP_GETIMEVERSION"); + rc = IMEVER_0400; + break; + case IGP_UI: + TRACE("(%s)\n", "IGP_UI"); + rc = 0; + break; + default: + rc = 0; } return rc; } @@ -1538,26 +1499,9 @@ UINT WINAPI ImmGetRegisterWordStyleA( HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf); - if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)lpStyleBuf); - else - { - STYLEBUFW sbw; - UINT rc; - - rc = immHkl->pImeGetRegisterWordStyle(nItem,&sbw); - WideCharToMultiByte(CP_ACP, 0, sbw.szDescription, -1, - lpStyleBuf->szDescription, 32, NULL, NULL); - lpStyleBuf->dwStyle = sbw.dwStyle; - return rc; - } - } - else - return 0; + FIXME("(%p, %d, %p): stub\n", hKL, nItem, lpStyleBuf); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -1566,26 +1510,9 @@ UINT WINAPI ImmGetRegisterWordStyleW( HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %d, %p):\n", hKL, nItem, lpStyleBuf); - if (immHkl->hIME && immHkl->pImeGetRegisterWordStyle) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeGetRegisterWordStyle(nItem,lpStyleBuf); - else - { - STYLEBUFA sba; - UINT rc; - - rc = immHkl->pImeGetRegisterWordStyle(nItem,(LPSTYLEBUFW)&sba); - MultiByteToWideChar(CP_ACP, 0, sba.szDescription, -1, - lpStyleBuf->szDescription, 32); - lpStyleBuf->dwStyle = sba.dwStyle; - return rc; - } - } - else - return 0; + FIXME("(%p, %d, %p): stub\n", hKL, nItem, lpStyleBuf); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /*********************************************************************** @@ -1593,16 +1520,9 @@ */ BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - InputContextData *data = (InputContextData*)hIMC; - - TRACE("(%p, %p)\n", hIMC, lpptPos); - - if (!data || !lpptPos) - return FALSE; - - *lpptPos = data->IMC.ptStatusWndPos; - - return TRUE; + FIXME("(%p, %p): stub\n", hIMC, lpptPos); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -1611,12 +1531,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) { OSVERSIONINFOA version; - InputContextData *data = (InputContextData *)ImmGetContext( hWnd ); - TRACE("%p\n", hWnd); - - if ( data ) - return data->lastVK; - + FIXME("(%p): stub\n", hWnd); GetVersionExA( &version ); switch(version.dwPlatformId) { @@ -1661,10 +1576,12 @@ */ BOOL WINAPI ImmIsIME(HKL hKL) { - ImmHkl *ptr; - TRACE("(%p):\n", hKL); - ptr = IMM_GetImmHkl(hKL); - return (ptr && ptr->hIME); + TRACE("(%p): semi-stub\n", hKL); + /* + * FIXME: Dead key locales will return TRUE here when they should not + * There is probably a more proper way to check this. + */ + return (root_context != NULL); } /*********************************************************************** @@ -1687,11 +1604,11 @@ (msg == WM_MSIME_DOCUMENTFEED)) { - if (!IMM_GetThreadData()->hwndDefault) + if (!hwndDefault) ImmGetDefaultIMEWnd(NULL); if (hWndIME == NULL) - PostMessageA(IMM_GetThreadData()->hwndDefault, msg, wParam, lParam); + PostMessageA(hwndDefault, msg, wParam, lParam); rc = TRUE; } @@ -1705,7 +1622,7 @@ HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam) { BOOL rc = FALSE; - TRACE("(%p, %d, %ld, %ld):\n", hWndIME, msg, wParam, lParam); + TRACE("(%p, %d, %ld, %ld): stub\n", hWndIME, msg, wParam, lParam); if ((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || (msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP) || (msg == WM_MSIME_SERVICE) || @@ -1725,15 +1642,126 @@ BOOL WINAPI ImmNotifyIME( HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue) { - InputContextData *data = (InputContextData*)hIMC; + BOOL rc = FALSE; TRACE("(%p, %d, %d, %d)\n", hIMC, dwAction, dwIndex, dwValue); - if (!data || ! data->immKbd->pNotifyIME) - return FALSE; - - return data->immKbd->pNotifyIME(hIMC,dwAction,dwIndex,dwValue); + if (!root_context) + return rc; + + switch(dwAction) + { + case NI_CHANGECANDIDATELIST: + FIXME("%s\n","NI_CHANGECANDIDATELIST"); + break; + case NI_CLOSECANDIDATE: + FIXME("%s\n","NI_CLOSECANDIDATE"); + break; + case NI_COMPOSITIONSTR: + switch (dwIndex) + { + case CPS_CANCEL: + TRACE("%s - %s\n","NI_COMPOSITIONSTR","CPS_CANCEL"); + { + BOOL send; + LPCOMPOSITIONSTRING lpCompStr; + + if (pX11DRV_ForceXIMReset) + pX11DRV_ForceXIMReset(root_context->IMC.hWnd); + + lpCompStr = ImmLockIMCC(root_context->IMC.hCompStr); + send = (lpCompStr->dwCompStrLen != 0); + ImmUnlockIMCC(root_context->IMC.hCompStr); + + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = ImmCreateBlankCompStr(); + + if (send) + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, 0, + GCS_COMPSTR); + rc = TRUE; + } + break; + case CPS_COMPLETE: + TRACE("%s - %s\n","NI_COMPOSITIONSTR","CPS_COMPLETE"); + if (hIMC != (HIMC)FROM_IME && pX11DRV_ForceXIMReset) + pX11DRV_ForceXIMReset(root_context->IMC.hWnd); + { + HIMCC newCompStr; + DWORD cplen = 0; + LPWSTR cpstr; + LPCOMPOSITIONSTRING cs = NULL; + LPBYTE cdata = NULL; + + /* clear existing result */ + newCompStr = updateResultStr(root_context->IMC.hCompStr, NULL, 0); + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = newCompStr; + + if (root_context->IMC.hCompStr) + { + cdata = ImmLockIMCC(root_context->IMC.hCompStr); + cs = (LPCOMPOSITIONSTRING)cdata; + cplen = cs->dwCompStrLen; + cpstr = (LPWSTR)&(cdata[cs->dwCompStrOffset]); + ImmUnlockIMCC(root_context->IMC.hCompStr); + } + if (cplen > 0) + { + WCHAR param = cpstr[0]; + newCompStr = updateResultStr(root_context->IMC.hCompStr, cpstr, cplen); + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = newCompStr; + newCompStr = updateCompStr(root_context->IMC.hCompStr, NULL, 0); + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = newCompStr; + + root_context->bRead = FALSE; + + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, 0, + GCS_COMPSTR); + + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, + param, + GCS_RESULTSTR|GCS_RESULTCLAUSE); + } + + ImmInternalPostIMEMessage(root_context, WM_IME_ENDCOMPOSITION, 0, 0); + root_context->bInComposition = FALSE; + } + break; + case CPS_CONVERT: + FIXME("%s - %s\n","NI_COMPOSITIONSTR","CPS_CONVERT"); + break; + case CPS_REVERT: + FIXME("%s - %s\n","NI_COMPOSITIONSTR","CPS_REVERT"); + break; + default: + ERR("%s - %s (%i)\n","NI_COMPOSITIONSTR","UNKNOWN",dwIndex); + break; + } + break; + case NI_IMEMENUSELECTED: + FIXME("%s\n", "NI_IMEMENUSELECTED"); + break; + case NI_OPENCANDIDATE: + FIXME("%s\n", "NI_OPENCANDIDATE"); + break; + case NI_SELECTCANDIDATESTR: + FIXME("%s\n", "NI_SELECTCANDIDATESTR"); + break; + case NI_SETCANDIDATE_PAGESIZE: + FIXME("%s\n", "NI_SETCANDIDATE_PAGESIZE"); + break; + case NI_SETCANDIDATE_PAGESTART: + FIXME("%s\n", "NI_SETCANDIDATE_PAGESTART"); + break; + default: + ERR("Unknown\n"); + } + + return rc; } /*********************************************************************** @@ -1742,28 +1770,11 @@ BOOL WINAPI ImmRegisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle, - debugstr_a(lpszRegister)); - if (immHkl->hIME && immHkl->pImeRegisterWord) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeRegisterWord((LPCWSTR)lpszReading,dwStyle, - (LPCWSTR)lpszRegister); - else - { - LPWSTR lpszwReading = strdupAtoW(lpszReading); - LPWSTR lpszwRegister = strdupAtoW(lpszRegister); - BOOL rc; - - rc = immHkl->pImeRegisterWord(lpszwReading,dwStyle,lpszwRegister); - HeapFree(GetProcessHeap(),0,lpszwReading); - HeapFree(GetProcessHeap(),0,lpszwRegister); - return rc; - } - } - else - return FALSE; + FIXME("(%p, %s, %d, %s): stub\n", + hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister) + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -1772,28 +1783,11 @@ BOOL WINAPI ImmRegisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszRegister)); - if (immHkl->hIME && immHkl->pImeRegisterWord) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeRegisterWord(lpszReading,dwStyle,lpszRegister); - else - { - LPSTR lpszaReading = strdupWtoA(lpszReading); - LPSTR lpszaRegister = strdupWtoA(lpszRegister); - BOOL rc; - - rc = immHkl->pImeRegisterWord((LPCWSTR)lpszaReading,dwStyle, - (LPCWSTR)lpszaRegister); - HeapFree(GetProcessHeap(),0,lpszaReading); - HeapFree(GetProcessHeap(),0,lpszaRegister); - return rc; - } - } - else - return FALSE; + FIXME("(%p, %s, %d, %s): stub\n", + hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister) + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -1811,62 +1805,14 @@ } /*********************************************************************** -* ImmRequestMessageA(IMM32.@) -*/ -LRESULT WINAPI ImmRequestMessageA(HIMC hIMC, WPARAM wParam, LPARAM lParam) -{ - InputContextData *data = (InputContextData*)hIMC; - - TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - - if (data && IsWindow(data->IMC.hWnd)) - return SendMessageA(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - - return 0; -} - -/*********************************************************************** -* ImmRequestMessageW(IMM32.@) -*/ -LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) -{ - InputContextData *data = (InputContextData*)hIMC; - - TRACE("%p %ld %ld\n", hIMC, wParam, wParam); - - if (data && IsWindow(data->IMC.hWnd)) - return SendMessageW(data->IMC.hWnd, WM_IME_REQUEST, wParam, lParam); - - return 0; -} - -/*********************************************************************** * ImmSetCandidateWindow (IMM32.@) */ BOOL WINAPI ImmSetCandidateWindow( HIMC hIMC, LPCANDIDATEFORM lpCandidate) { - InputContextData *data = (InputContextData*)hIMC; - - TRACE("(%p, %p)\n", hIMC, lpCandidate); - - if (!data || !lpCandidate) - return FALSE; - - TRACE("\t%x, %x, (%i,%i), (%i,%i - %i,%i)\n", - lpCandidate->dwIndex, lpCandidate->dwStyle, - lpCandidate->ptCurrentPos.x, lpCandidate->ptCurrentPos.y, - lpCandidate->rcArea.top, lpCandidate->rcArea.left, - lpCandidate->rcArea.bottom, lpCandidate->rcArea.right); - - if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) - return FALSE; - - data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCANDIDATEPOS); - ImmInternalSendIMENotify(data, IMN_SETCANDIDATEPOS, 1 << lpCandidate->dwIndex); - - return TRUE; + FIXME("(%p, %p): stub\n", hIMC, lpCandidate); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -1877,15 +1823,22 @@ InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %p)\n", hIMC, lplf); - if (!data || !lplf) + if (!data) return FALSE; memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTA)); MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, LF_FACESIZE); - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); + ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); + if (data->textfont) + { + DeleteObject(data->textfont); + data->textfont = NULL; + } + + data->textfont = CreateFontIndirectW(&data->IMC.lfFont.W); return TRUE; } @@ -1897,13 +1850,18 @@ InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %p)\n", hIMC, lplf); - if (!data || !lplf) + if (!data) return FALSE; data->IMC.lfFont.W = *lplf; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCOMPOSITIONFONT); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); + if (data->textfont) + { + DeleteObject(data->textfont); + data->textfont = NULL; + } + data->textfont = CreateFontIndirectW(&data->IMC.lfFont.W); return TRUE; } @@ -1920,17 +1878,9 @@ WCHAR *CompBuffer = NULL; WCHAR *ReadBuffer = NULL; BOOL rc; - InputContextData *data = (InputContextData*)hIMC; - - TRACE("(%p, %d, %p, %d, %p, %d):\n", + + TRACE("(%p, %d, %p, %d, %p, %d): stub\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - - if (!data) - return FALSE; - - if (!is_himc_ime_unicode(data)) - return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, - dwCompLen, lpRead, dwReadLen); comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0); if (comp_len) @@ -1963,48 +1913,64 @@ LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen) { - DWORD comp_len; - DWORD read_len; - CHAR *CompBuffer = NULL; - CHAR *ReadBuffer = NULL; - BOOL rc; - InputContextData *data = (InputContextData*)hIMC; - - TRACE("(%p, %d, %p, %d, %p, %d):\n", - hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); - - if (!data) - return FALSE; - - if (is_himc_ime_unicode(data)) - return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, - dwCompLen, lpRead, dwReadLen); - - comp_len = WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, NULL, 0, NULL, - NULL); - if (comp_len) - { - CompBuffer = HeapAlloc(GetProcessHeap(),0,comp_len); - WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, CompBuffer, comp_len, - NULL, NULL); - } - - read_len = WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, NULL, 0, NULL, - NULL); - if (read_len) - { - ReadBuffer = HeapAlloc(GetProcessHeap(),0,read_len); - WideCharToMultiByte(CP_ACP, 0, lpRead, dwReadLen, ReadBuffer, read_len, - NULL, NULL); - } - - rc = ImmSetCompositionStringA(hIMC, dwIndex, CompBuffer, comp_len, - ReadBuffer, read_len); - - HeapFree(GetProcessHeap(), 0, CompBuffer); - HeapFree(GetProcessHeap(), 0, ReadBuffer); - - return rc; + DWORD flags = 0; + WCHAR wParam = 0; + + TRACE("(%p, %d, %p, %d, %p, %d): stub\n", + hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); + + + if (hIMC != (HIMC)FROM_IME) + FIXME("PROBLEM: This only sets the wine level string\n"); + + /* + * Explanation: + * this sets the composition string in the imm32.dll level + * of the composition buffer. we cannot manipulate the xim level + * buffer, which means that once the xim level buffer changes again + * any call to this function from the application will be lost + */ + + if (lpRead && dwReadLen) + FIXME("Reading string unimplemented\n"); + + /* + * app operating this api to also receive the message from xim + */ + + if (dwIndex == SCS_SETSTR) + { + HIMCC newCompStr; + if (!root_context->bInComposition) + { + ImmInternalPostIMEMessage(root_context, WM_IME_STARTCOMPOSITION, 0, 0); + root_context->bInComposition = TRUE; + } + + flags = GCS_COMPSTR; + + if (dwCompLen && lpComp) + { + newCompStr = updateCompStr(root_context->IMC.hCompStr, (LPWSTR)lpComp, dwCompLen / sizeof(WCHAR)); + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = newCompStr; + + wParam = ((const WCHAR*)lpComp)[0]; + flags |= GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART; + } + else + { + newCompStr = updateCompStr(root_context->IMC.hCompStr, NULL, 0); + ImmDestroyIMCC(root_context->IMC.hCompStr); + root_context->IMC.hCompStr = newCompStr; + } + } + + UpdateDataInDefaultIMEWindow(hwndDefault,FALSE); + + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, wParam, flags); + + return TRUE; } /*********************************************************************** @@ -2026,16 +1992,16 @@ data->IMC.cfCompForm = *lpCompForm; - if (IsWindowVisible(IMM_GetThreadData()->hwndDefault)) + if (IsWindowVisible(hwndDefault)) { reshow = TRUE; - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_HIDE); + ShowWindow(hwndDefault,SW_HIDE); } /* FIXME: this is a partial stub */ if (reshow) - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_SHOWNOACTIVATE); + ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; @@ -2047,113 +2013,68 @@ BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - DWORD oldConversion, oldSentence; + static int shown = 0; + + if (!shown) { + FIXME("(%p, %d, %d): stub\n", + hIMC, fdwConversion, fdwSentence + ); + shown = 1; + } + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * ImmSetOpenStatus (IMM32.@) + */ +BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) +{ InputContextData *data = (InputContextData*)hIMC; - TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); + TRACE("%p %d\n", hIMC, fOpen); + + if (hIMC == (HIMC)FROM_IME) + { + ImmInternalSetOpenStatus(fOpen); + ImmInternalSendIMENotify(root_context, IMN_SETOPENSTATUS, 0); + return TRUE; + } if (!data) return FALSE; - if ( fdwConversion != data->IMC.fdwConversion ) - { - oldConversion = data->IMC.fdwConversion; - data->IMC.fdwConversion = fdwConversion; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); - ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); - } - if ( fdwSentence != data->IMC.fdwSentence ) - { - oldSentence = data->IMC.fdwSentence; - data->IMC.fdwSentence = fdwSentence; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); - ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); - } - + if (fOpen != data->bInternalState) + { + if (fOpen == FALSE && pX11DRV_ForceXIMReset) + pX11DRV_ForceXIMReset(data->IMC.hWnd); + + if (fOpen == FALSE) + ImmInternalPostIMEMessage(data, WM_IME_ENDCOMPOSITION,0,0); + else + ImmInternalPostIMEMessage(data, WM_IME_STARTCOMPOSITION,0,0); + + ImmInternalSetOpenStatus(fOpen); + ImmInternalSetOpenStatus(!fOpen); + + if (data->IMC.fOpen == FALSE) + ImmInternalPostIMEMessage(data, WM_IME_ENDCOMPOSITION,0,0); + else + ImmInternalPostIMEMessage(data, WM_IME_STARTCOMPOSITION,0,0); + + return FALSE; + } return TRUE; } /*********************************************************************** - * ImmSetOpenStatus (IMM32.@) - */ -BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) -{ - InputContextData *data = (InputContextData*)hIMC; - - TRACE("%p %d\n", hIMC, fOpen); - - if (!data) - return FALSE; - - if (data->imeWnd == NULL) - { - /* create the ime window */ - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, - data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, - 0, data->immKbd->hIME, 0); - SetWindowLongW(data->imeWnd, IMMGWL_IMC, (LONG)data); - IMM_GetThreadData()->hwndDefault = data->imeWnd; - } - - if (!fOpen != !data->IMC.fOpen) - { - data->IMC.fOpen = fOpen; - ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS); - ImmInternalSendIMENotify(data, IMN_SETOPENSTATUS, 0); - } - - return TRUE; -} - -/*********************************************************************** * ImmSetStatusWindowPos (IMM32.@) */ BOOL WINAPI ImmSetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos) { - InputContextData *data = (InputContextData*)hIMC; - - TRACE("(%p, %p)\n", hIMC, lpptPos); - - if (!data || !lpptPos) - return FALSE; - - TRACE("\t(%i,%i)\n", lpptPos->x, lpptPos->y); - - data->IMC.ptStatusWndPos = *lpptPos; - ImmNotifyIME( hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSTATUSWINDOWPOS); - ImmInternalSendIMENotify(data, IMN_SETSTATUSWINDOWPOS, 0); - - return TRUE; -} - -/*********************************************************************** - * ImmCreateSoftKeyboard(IMM32.@) - */ -HWND WINAPI ImmCreateSoftKeyboard(UINT uType, UINT hOwner, int x, int y) -{ - FIXME("(%d, %d, %d, %d): stub\n", uType, hOwner, x, y); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/*********************************************************************** - * ImmDestroySoftKeyboard(IMM32.@) - */ -BOOL WINAPI ImmDestroySoftKeyboard(HWND hSoftWnd) -{ - FIXME("(%p): stub\n", hSoftWnd); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** - * ImmShowSoftKeyboard(IMM32.@) - */ -BOOL WINAPI ImmShowSoftKeyboard(HWND hSoftWnd, int nCmdShow) -{ - FIXME("(%p, %d): stub\n", hSoftWnd, nCmdShow); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("(%p, %p): stub\n", hIMC, lpptPos); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -2172,28 +2093,11 @@ BOOL WINAPI ImmUnregisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_a(lpszReading), dwStyle, - debugstr_a(lpszUnregister)); - if (immHkl->hIME && immHkl->pImeUnregisterWord) - { - if (!is_kbd_ime_unicode(immHkl)) - return immHkl->pImeUnregisterWord((LPCWSTR)lpszReading,dwStyle, - (LPCWSTR)lpszUnregister); - else - { - LPWSTR lpszwReading = strdupAtoW(lpszReading); - LPWSTR lpszwUnregister = strdupAtoW(lpszUnregister); - BOOL rc; - - rc = immHkl->pImeUnregisterWord(lpszwReading,dwStyle,lpszwUnregister); - HeapFree(GetProcessHeap(),0,lpszwReading); - HeapFree(GetProcessHeap(),0,lpszwUnregister); - return rc; - } - } - else - return FALSE; + FIXME("(%p, %s, %d, %s): stub\n", + hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister) + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -2202,28 +2106,11 @@ BOOL WINAPI ImmUnregisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) { - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %s, %d, %s):\n", hKL, debugstr_w(lpszReading), dwStyle, - debugstr_w(lpszUnregister)); - if (immHkl->hIME && immHkl->pImeUnregisterWord) - { - if (is_kbd_ime_unicode(immHkl)) - return immHkl->pImeUnregisterWord(lpszReading,dwStyle,lpszUnregister); - else - { - LPSTR lpszaReading = strdupWtoA(lpszReading); - LPSTR lpszaUnregister = strdupWtoA(lpszUnregister); - BOOL rc; - - rc = immHkl->pImeUnregisterWord((LPCWSTR)lpszaReading,dwStyle, - (LPCWSTR)lpszaUnregister); - HeapFree(GetProcessHeap(),0,lpszaReading); - HeapFree(GetProcessHeap(),0,lpszaUnregister); - return rc; - } - } - else - return FALSE; + FIXME("(%p, %s, %d, %s): stub\n", + hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister) + ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /*********************************************************************** @@ -2233,61 +2120,9 @@ LPIMEMENUITEMINFOA lpImeParentMenu, LPIMEMENUITEMINFOA lpImeMenu, DWORD dwSize) { - InputContextData *data = (InputContextData*)hIMC; - TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) - { - if (!is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) - return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - (IMEMENUITEMINFOW*)lpImeParentMenu, - (IMEMENUITEMINFOW*)lpImeMenu, dwSize); - else - { - IMEMENUITEMINFOW lpImeParentMenuW; - IMEMENUITEMINFOW *lpImeMenuW, *parent = NULL; - DWORD rc; - - if (lpImeParentMenu) - parent = &lpImeParentMenuW; - if (lpImeMenu) - { - int count = dwSize / sizeof(LPIMEMENUITEMINFOA); - dwSize = count * sizeof(IMEMENUITEMINFOW); - lpImeMenuW = HeapAlloc(GetProcessHeap(), 0, dwSize); - } - else - lpImeMenuW = NULL; - - rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - parent, lpImeMenuW, dwSize); - - if (lpImeParentMenu) - { - memcpy(lpImeParentMenu,&lpImeParentMenuW,sizeof(IMEMENUITEMINFOA)); - lpImeParentMenu->hbmpItem = lpImeParentMenuW.hbmpItem; - WideCharToMultiByte(CP_ACP, 0, lpImeParentMenuW.szString, - -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE, - NULL, NULL); - } - if (lpImeMenu && rc) - { - int i; - for (i = 0; i < rc; i++) - { - memcpy(&lpImeMenu[i],&lpImeMenuW[1],sizeof(IMEMENUITEMINFOA)); - lpImeMenu[i].hbmpItem = lpImeMenuW[i].hbmpItem; - WideCharToMultiByte(CP_ACP, 0, lpImeMenuW[i].szString, - -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE, - NULL, NULL); - } - } - HeapFree(GetProcessHeap(),0,lpImeMenuW); - return rc; - } - } - else - return 0; + FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + return 0; } /*********************************************************************** @@ -2297,59 +2132,9 @@ LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) { - InputContextData *data = (InputContextData*)hIMC; - TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) - { - if (is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) - return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - else - { - IMEMENUITEMINFOA lpImeParentMenuA; - IMEMENUITEMINFOA *lpImeMenuA, *parent = NULL; - DWORD rc; - - if (lpImeParentMenu) - parent = &lpImeParentMenuA; - if (lpImeMenu) - { - int count = dwSize / sizeof(LPIMEMENUITEMINFOW); - dwSize = count * sizeof(IMEMENUITEMINFOA); - lpImeMenuA = HeapAlloc(GetProcessHeap(), 0, dwSize); - } - else - lpImeMenuA = NULL; - - rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - (IMEMENUITEMINFOW*)parent, - (IMEMENUITEMINFOW*)lpImeMenuA, dwSize); - - if (lpImeParentMenu) - { - memcpy(lpImeParentMenu,&lpImeParentMenuA,sizeof(IMEMENUITEMINFOA)); - lpImeParentMenu->hbmpItem = lpImeParentMenuA.hbmpItem; - MultiByteToWideChar(CP_ACP, 0, lpImeParentMenuA.szString, - -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE); - } - if (lpImeMenu && rc) - { - int i; - for (i = 0; i < rc; i++) - { - memcpy(&lpImeMenu[i],&lpImeMenuA[1],sizeof(IMEMENUITEMINFOA)); - lpImeMenu[i].hbmpItem = lpImeMenuA[i].hbmpItem; - MultiByteToWideChar(CP_ACP, 0, lpImeMenuA[i].szString, - -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE); - } - } - HeapFree(GetProcessHeap(),0,lpImeMenuA); - return rc; - } - } - else - return 0; + FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + return 0; } /*********************************************************************** @@ -2496,97 +2281,252 @@ return TRUE; } -/*********************************************************************** -* ImmTranslateMessage(IMM32.@) -* ( Undocumented, call internally and from user32.dll ) -*/ -BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyData) -{ - InputContextData *data; - HIMC imc = ImmGetContext(hwnd); - BYTE state[256]; - UINT scancode; - LPVOID list = 0; - UINT msg_count; - UINT uVirtKey; - static const int list_count = 10; - - TRACE("%p %x %x %x\n",hwnd, msg, (UINT)wParam, (UINT)lKeyData); - - if (imc) - data = (InputContextData*)imc; +/***** + * Internal functions to help with IME window management + */ +static void PaintDefaultIMEWnd(HWND hwnd) +{ + PAINTSTRUCT ps; + RECT rect; + HDC hdc = BeginPaint(hwnd,&ps); + LPCOMPOSITIONSTRING compstr; + LPBYTE compdata = NULL; + HMONITOR monitor; + MONITORINFO mon_info; + INT offX=0, offY=0; + + GetClientRect(hwnd,&rect); + FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + + compdata = ImmLockIMCC(root_context->IMC.hCompStr); + compstr = (LPCOMPOSITIONSTRING)compdata; + + if (compstr->dwCompStrLen && compstr->dwCompStrOffset) + { + SIZE size; + POINT pt; + HFONT oldfont = NULL; + LPWSTR CompString; + + CompString = (LPWSTR)(compdata + compstr->dwCompStrOffset); + if (root_context->textfont) + oldfont = SelectObject(hdc,root_context->textfont); + + + GetTextExtentPoint32W(hdc, CompString, compstr->dwCompStrLen, &size); + pt.x = size.cx; + pt.y = size.cy; + LPtoDP(hdc,&pt,1); + + /* + * How this works based on tests on windows: + * CFS_POINT: then we start our window at the point and grow it as large + * as it needs to be for the string. + * CFS_RECT: we still use the ptCurrentPos as a starting point and our + * window is only as large as we need for the string, but we do not + * grow such that our window exceeds the given rect. Wrapping if + * needed and possible. If our ptCurrentPos is outside of our rect + * then no window is displayed. + * CFS_FORCE_POSITION: appears to behave just like CFS_POINT + * maybe becase the default MSIME does not do any IME adjusting. + */ + if (root_context->IMC.cfCompForm.dwStyle != CFS_DEFAULT) + { + POINT cpt = root_context->IMC.cfCompForm.ptCurrentPos; + ClientToScreen(root_context->IMC.hWnd,&cpt); + rect.left = cpt.x; + rect.top = cpt.y; + rect.right = rect.left + pt.x; + rect.bottom = rect.top + pt.y; + monitor = MonitorFromPoint(cpt, MONITOR_DEFAULTTOPRIMARY); + } + else /* CFS_DEFAULT */ + { + /* Windows places the default IME window in the bottom left */ + HWND target = root_context->IMC.hWnd; + if (!target) target = GetFocus(); + + GetWindowRect(target,&rect); + rect.top = rect.bottom; + rect.right = rect.left + pt.x + 20; + rect.bottom = rect.top + pt.y + 20; + offX=offY=10; + monitor = MonitorFromWindow(target, MONITOR_DEFAULTTOPRIMARY); + } + + if (root_context->IMC.cfCompForm.dwStyle == CFS_RECT) + { + RECT client; + client =root_context->IMC.cfCompForm.rcArea; + MapWindowPoints( root_context->IMC.hWnd, 0, (POINT *)&client, 2 ); + IntersectRect(&rect,&rect,&client); + /* TODO: Wrap the input if needed */ + } + + if (root_context->IMC.cfCompForm.dwStyle == CFS_DEFAULT) + { + /* make sure we are on the desktop */ + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW(monitor, &mon_info); + + if (rect.bottom > mon_info.rcWork.bottom) + { + int shift = rect.bottom - mon_info.rcWork.bottom; + rect.top -= shift; + rect.bottom -= shift; + } + if (rect.left < 0) + { + rect.right -= rect.left; + rect.left = 0; + } + if (rect.right > mon_info.rcWork.right) + { + int shift = rect.right - mon_info.rcWork.right; + rect.left -= shift; + rect.right -= shift; + } + } + + SetWindowPos(hwnd, HWND_TOPMOST, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOACTIVATE); + + TextOutW(hdc, offX,offY, CompString, compstr->dwCompStrLen); + + if (oldfont) + SelectObject(hdc,oldfont); + } + + ImmUnlockIMCC(root_context->IMC.hCompStr); + + EndPaint(hwnd,&ps); +} + +static void UpdateDataInDefaultIMEWindow(HWND hwnd, BOOL showable) +{ + LPCOMPOSITIONSTRING compstr; + + if (root_context->IMC.hCompStr) + compstr = ImmLockIMCC(root_context->IMC.hCompStr); else - return FALSE; - - if (!data->immKbd->hIME || !data->immKbd->pImeToAsciiEx) - return FALSE; - - GetKeyboardState(state); - scancode = lKeyData >> 0x10 & 0xff; - - list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list_count * sizeof(TRANSMSG) + sizeof(DWORD)); - ((DWORD*)list)[0] = list_count; - - if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST) - { - WCHAR chr; - - if (!is_himc_ime_unicode(data)) - ToAscii(data->lastVK, scancode, state, &chr, 0); - else - ToUnicodeEx(data->lastVK, scancode, state, &chr, 1, 0, GetKeyboardLayout(0)); - uVirtKey = MAKELONG(data->lastVK,chr); - } - else - uVirtKey = data->lastVK; - - msg_count = data->immKbd->pImeToAsciiEx(uVirtKey, scancode, state, list, 0, imc); - TRACE("%i messages generated\n",msg_count); - if (msg_count && msg_count <= list_count) - { - int i; - LPTRANSMSG msgs = (LPTRANSMSG)((LPBYTE)list + sizeof(DWORD)); - - for (i = 0; i < msg_count; i++) - ImmInternalPostIMEMessage(data, msgs[i].message, msgs[i].wParam, msgs[i].lParam); - } - else if (msg_count > list_count) - ImmGenerateMessage(imc); - - HeapFree(GetProcessHeap(),0,list); - - data->lastVK = VK_PROCESSKEY; - - return (msg_count > 0); -} - -/*********************************************************************** -* ImmProcessKey(IMM32.@) -* ( Undocumented, called from user32.dll ) -*/ -BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD unknown) -{ - InputContextData *data; - HIMC imc = ImmGetContext(hwnd); - BYTE state[256]; - - TRACE("%p %p %x %x %x\n",hwnd, hKL, vKey, (UINT)lKeyData, unknown); - - if (imc) - data = (InputContextData*)imc; - else - return FALSE; - - if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey) - return FALSE; - - GetKeyboardState(state); - if (data->immKbd->pImeProcessKey(imc, vKey, lKeyData, state)) - { - data->lastVK = vKey; - return TRUE; - } - - data->lastVK = VK_PROCESSKEY; - return FALSE; -} + compstr = NULL; + + if (compstr == NULL || compstr->dwCompStrLen == 0) + ShowWindow(hwndDefault,SW_HIDE); + else if (showable) + ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); + + RedrawWindow(hwnd,NULL,NULL,RDW_ERASENOW|RDW_INVALIDATE); + + if (compstr != NULL) + ImmUnlockIMCC(root_context->IMC.hCompStr); +} + +/* + * The window proc for the default IME window + */ +static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, + LPARAM lParam) +{ + LRESULT rc = 0; + + TRACE("Incoming Message 0x%x (0x%08x, 0x%08x)\n", msg, (UINT)wParam, + (UINT)lParam); + + switch(msg) + { + case WM_PAINT: + PaintDefaultIMEWnd(hwnd); + return FALSE; + + case WM_NCCREATE: + return TRUE; + + case WM_CREATE: + SetWindowTextA(hwnd,"Wine Ime Active"); + return TRUE; + + case WM_SETFOCUS: + if (wParam) + SetFocus((HWND)wParam); + else + FIXME("Received focus, should never have focus\n"); + break; + case WM_IME_COMPOSITION: + TRACE("IME message %s, 0x%x, 0x%x (%i)\n", + "WM_IME_COMPOSITION", (UINT)wParam, (UINT)lParam, + root_context->bRead); + if (lParam & GCS_RESULTSTR) + IMM_PostResult(root_context); + else + UpdateDataInDefaultIMEWindow(hwnd,TRUE); + break; + case WM_IME_STARTCOMPOSITION: + TRACE("IME message %s, 0x%x, 0x%x\n", + "WM_IME_STARTCOMPOSITION", (UINT)wParam, (UINT)lParam); + root_context->IMC.hWnd = GetFocus(); + ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); + break; + case WM_IME_ENDCOMPOSITION: + TRACE("IME message %s, 0x%x, 0x%x\n", + "WM_IME_ENDCOMPOSITION", (UINT)wParam, (UINT)lParam); + ShowWindow(hwndDefault,SW_HIDE); + break; + case WM_IME_SELECT: + TRACE("IME message %s, 0x%x, 0x%x\n","WM_IME_SELECT", + (UINT)wParam, (UINT)lParam); + break; + case WM_IME_CONTROL: + TRACE("IME message %s, 0x%x, 0x%x\n","WM_IME_CONTROL", + (UINT)wParam, (UINT)lParam); + rc = 1; + break; + case WM_IME_NOTIFY: + TRACE("!! IME NOTIFY\n"); + break; + default: + TRACE("Non-standard message 0x%x\n",msg); + } + /* check the MSIME messages */ + if (msg == WM_MSIME_SERVICE) + { + TRACE("IME message %s, 0x%x, 0x%x\n","WM_MSIME_SERVICE", + (UINT)wParam, (UINT)lParam); + rc = FALSE; + } + else if (msg == WM_MSIME_RECONVERTOPTIONS) + { + TRACE("IME message %s, 0x%x, 0x%x\n","WM_MSIME_RECONVERTOPTIONS", + (UINT)wParam, (UINT)lParam); + } + else if (msg == WM_MSIME_MOUSE) + { + TRACE("IME message %s, 0x%x, 0x%x\n","WM_MSIME_MOUSE", + (UINT)wParam, (UINT)lParam); + } + else if (msg == WM_MSIME_RECONVERTREQUEST) + { + TRACE("IME message %s, 0x%x, 0x%x\n","WM_MSIME_RECONVERTREQUEST", + (UINT)wParam, (UINT)lParam); + } + else if (msg == WM_MSIME_RECONVERT) + { + TRACE("IME message %s, 0x%x, 0x%x\n","WM_MSIME_RECONVERT", + (UINT)wParam, (UINT)lParam); + } + else if (msg == WM_MSIME_QUERYPOSITION) + { + TRACE("IME message %s, 0x%x, 0x%x\n","WM_MSIME_QUERYPOSITION", + (UINT)wParam, (UINT)lParam); + } + else if (msg == WM_MSIME_DOCUMENTFEED) + { + TRACE("IME message %s, 0x%x, 0x%x\n","WM_MSIME_DOCUMENTFEED", + (UINT)wParam, (UINT)lParam); + } + /* DefWndProc if not an IME message */ + else if (!rc && !((msg >= WM_IME_STARTCOMPOSITION && msg <= WM_IME_KEYLAST) || + (msg >= WM_IME_SETCONTEXT && msg <= WM_IME_KEYUP))) + rc = DefWindowProcW(hwnd,msg,wParam,lParam); + + return rc; +} Modified: trunk/reactos/dll/win32/imm32/imm32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.spec… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm32.spec [iso-8859-1] Thu May 8 11:03:10 2008 @@ -5,10 +5,10 @@ @ stdcall ImmConfigureIMEW(long long long ptr) @ stdcall ImmCreateContext() @ stdcall ImmCreateIMCC(long) -@ stdcall ImmCreateSoftKeyboard(long long long long) +@ stub ImmCreateSoftKeyboard @ stdcall ImmDestroyContext(long) @ stdcall ImmDestroyIMCC(long) -@ stdcall ImmDestroySoftKeyboard(long) +@ stub ImmDestroySoftKeyboard @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME @ stub ImmEnumInputContext @@ -72,15 +72,15 @@ @ stub ImmLockImeDpi @ stdcall ImmNotifyIME(long long long long) @ stub ImmPenAuxInput -@ stdcall ImmProcessKey(long long long long long) +@ stub ImmProcessKey @ stub ImmPutImeMenuItemsIntoMappedFile @ stdcall ImmReSizeIMCC(long long) @ stub ImmRegisterClient @ stdcall ImmRegisterWordA(long str long str) @ stdcall ImmRegisterWordW(long wstr long wstr) @ stdcall ImmReleaseContext(long long) -@ stdcall ImmRequestMessageA(ptr long long) -@ stdcall ImmRequestMessageW(ptr long long) +@ stub ImmRequestMessageA +@ stub ImmRequestMessageW @ stub ImmSendIMEMessageExA @ stub ImmSendIMEMessageExW @ stub ImmSendMessageToActiveDefImeWndW @@ -96,10 +96,10 @@ #@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey @ stdcall ImmSetOpenStatus(long long) @ stdcall ImmSetStatusWindowPos(long ptr) -@ stdcall ImmShowSoftKeyboard(long long) +@ stub ImmShowSoftKeyboard @ stdcall ImmSimulateHotKey(long long) @ stub ImmSystemHandler -@ stdcall ImmTranslateMessage(long long long long) +@ stub ImmTranslateMessage @ stub ImmUnlockClientImc @ stdcall ImmUnlockIMC(long) @ stdcall ImmUnlockIMCC(long)

16 years, 8 months

[hpoussin] 33366: Fix some .rbuild file problems See issue #2710 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu May 8 11:01:30 2008 New Revision: 33366 URL: http://svn.reactos.org/svn/reactos?rev=33366&view=rev Log: Fix some .rbuild file problems See issue #2710 for more details. Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/base/applications/calc/calc.rbuild trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild trunk/reactos/base/applications/dxdiag/dxdiag.rbuild trunk/reactos/base/applications/msconfig/msconfig.rbuild trunk/reactos/base/applications/network/route/route.rbuild trunk/reactos/base/applications/regedit/clb/clb.rbuild trunk/reactos/base/applications/regedit/regedit.rbuild trunk/reactos/base/applications/sc/sc.rbuild trunk/reactos/base/applications/screensavers/logon/logon.rbuild trunk/reactos/base/applications/sndvol32/sndvol32.rbuild trunk/reactos/base/services/eventlog/eventlog.rbuild trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild trunk/reactos/base/setup/setup/setup.rbuild trunk/reactos/base/setup/vmwinst/vmwinst.rbuild trunk/reactos/base/setup/welcome/welcome.rbuild trunk/reactos/base/shell/cmd/cmd.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/base/system/lsass/lsass.rbuild trunk/reactos/base/system/regsvr32/regsvr32.rbuild trunk/reactos/base/system/rundll32/rundll32.rbuild trunk/reactos/base/system/services/services.rbuild trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild trunk/reactos/dll/cpl/console/console.rbuild trunk/reactos/dll/cpl/input/input.rbuild trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/devenum/devenum.rbuild trunk/reactos/dll/directx/dinput/dinput.rbuild trunk/reactos/dll/directx/dinput8/dinput8.rbuild trunk/reactos/dll/directx/directx.rbuild trunk/reactos/dll/directx/dplay/dplay.rbuild trunk/reactos/dll/directx/dplayx/dplayx.rbuild trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild trunk/reactos/dll/shellext/devcpux/devcpux.rbuild trunk/reactos/dll/shellext/shellext.rbuild trunk/reactos/dll/shellext/slayer/slayer.rbuild trunk/reactos/dll/win32/acledit/acledit.rbuild trunk/reactos/dll/win32/aclui/aclui.rbuild trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/authz/authz.rbuild trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/browseui/browseui.rbuild trunk/reactos/dll/win32/cards/cards.rbuild trunk/reactos/dll/win32/compstui/compstui.rbuild trunk/reactos/dll/win32/crypt32/crypt32.rbuild trunk/reactos/dll/win32/devmgr/devmgr.rbuild trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild trunk/reactos/dll/win32/hid/hid.rbuild trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild trunk/reactos/dll/win32/msacm32/msacm32.rbuild trunk/reactos/dll/win32/msafd/msafd.rbuild trunk/reactos/dll/win32/mswsock/mswsock.rbuild trunk/reactos/dll/win32/msxml3/msxml3.rbuild trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild trunk/reactos/dll/win32/opengl32/opengl32.rbuild trunk/reactos/dll/win32/pdh/pdh.rbuild trunk/reactos/dll/win32/printui/printui.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/samsrv/samsrv.rbuild trunk/reactos/dll/win32/serialui/serialui.rbuild trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild trunk/reactos/dll/win32/tapi32/tapi32.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild trunk/reactos/dll/win32/winfax/winfax.rbuild trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/dll/win32/winspool/winspool.rbuild trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild trunk/reactos/dll/win32/ws2help/ws2help.rbuild trunk/reactos/dll/win32/wshirda/wshirda.rbuild trunk/reactos/dll/win32/wsock32/wsock32.rbuild trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/drivers/chew/chew.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -3,7 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="baseaddress.rbuild" /> - <define name="__REACTOS__" overridable="true" /> + <define name="__REACTOS__" /> <if property="DBG" value="1"> <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> Modified: trunk/reactos/base/applications/calc/calc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="true"> +<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" allowwarnings="yes"> <include base="calc">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe"> +<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <file>doskey.c</file> <file>doskey.rc</file> Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe"> +<module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes"> <include base="dxdiag">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x600</define> <library>kernel32</library> Modified: trunk/reactos/base/applications/msconfig/msconfig.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/msconfig.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe"> +<module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes"> <include base="msconfig">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/base/applications/network/route/route.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/route/route.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/route/route.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="route" type="win32cui" installbase="system32" installname="route.exe"> +<module name="route" type="win32cui" installbase="system32" installname="route.exe" unicode="yes"> <include base="route">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <library>ws2_32</library> <library>iphlpapi</library> Modified: trunk/reactos/base/applications/regedit/clb/clb.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/clb/clb.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/clb/clb.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll"> +<module name="clb" type="win32dll" baseaddress="${BASEADDRESS_CLB}" installbase="system32" installname="clb.dll" unicode="yes"> <importlibrary definition="clb.def" /> <include base="clb">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/base/applications/regedit/regedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="regedit" type="win32gui" installname="regedit.exe"> +<module name="regedit" type="win32gui" installname="regedit.exe" unicode="yes"> <include base="regedit">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0600</define> <library>uuid</library> Modified: trunk/reactos/base/applications/sc/sc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/sc.rb… ============================================================================== --- trunk/reactos/base/applications/sc/sc.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/sc/sc.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="sc" type="win32cui" installbase="system32" installname="sc.exe"> +<module name="sc" type="win32cui" installbase="system32" installname="sc.exe" unicode="yes"> <define name="DEFINE_GUID" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <library>advapi32</library> <file>control.c</file> Modified: trunk/reactos/base/applications/screensavers/logon/logon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="true"> +<module name="logon" type="win32scr" installbase="system32" installname="logon.scr" unicode="yes"> <importlibrary definition="logon.spec.def" /> <include base="logon">.</include> <library>scrnsave</library> Modified: trunk/reactos/base/applications/sndvol32/sndvol32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/sndvol32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/sndvol32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe"> +<module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe" unicode="yes"> <include base="ReactOS">include/wine</include> <include base="sndvol32">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/base/services/eventlog/eventlog.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe"> +<module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe" unicode="yes"> <include base="eventlog">.</include> <include base="eventlog_server">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,13 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe"> +<module name="umpnpmgr" type="win32cui" installbase="system32" installname="umpnpmgr.exe" unicode="yes"> <include base="umpnpmgr">.</include> <include base="pnp_server">.</include> <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>pnp_server</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/base/setup/setup/setup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/setup/setup.rbu… ============================================================================== --- trunk/reactos/base/setup/setup/setup.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/setup/setup.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="setup" type="win32gui" installbase="system32" installname="setup.exe"> +<module name="setup" type="win32gui" installbase="system32" installname="setup.exe" unicode="yes"> <include base="setup">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0400</define> <library>kernel32</library> <library>userenv</library> Modified: trunk/reactos/base/setup/vmwinst/vmwinst.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe"> +<module name="vmwinst" type="win32gui" installbase="system32" installname="vmwinst.exe" unicode="yes"> <include base="vmwinst">.</include> - <define name="UNICODE" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <library>kernel32</library> Modified: trunk/reactos/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe"> +<module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe" unicode="yes"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="welcome">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <library>gdi32</library> <library>user32</library> Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,14 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> - <module name="cmd_base" type="objectlibrary"> + <module name="cmd_base" type="objectlibrary" unicode="yes"> <include base="ReactOS">include/reactos/wine</include> <include base="cmd_base">.</include> <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> <define name="_DEBUG_MEM" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <pch>precomp.h</pch> <compilationunit name="unit.c"> <file>alias.c</file> Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,11 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> +<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes"> <linkerflag>-fexceptions</linkerflag> <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <include base="explorer">.</include> - <define name="UNICODE" /> <define name="WIN32" /> <define name="_ROS_" /> <define name="_WIN32_IE">0x0600</define> Modified: trunk/reactos/base/system/lsass/lsass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.rb… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe"> +<module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe" unicode="yes"> <include base="lsass">.</include> <include base="ReactOS">include/reactos/subsys</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>advapi32</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/base/system/regsvr32/regsvr32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe"> +<module name="regsvr32" type="win32gui" installbase="system32" installname="regsvr32.exe" unicode="yes"> <include base="regsvr32">.</include> - <define name="UNICODE" /> <library>kernel32</library> <library>user32</library> <library>shell32</library> Modified: trunk/reactos/base/system/rundll32/rundll32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe"> +<module name="rundll32" type="win32gui" installbase="system32" installname="rundll32.exe" unicode="yes"> <include base="rundll32">.</include> - <define name="UNICODE" /> <library>kernel32</library> <library>user32</library> <file>rundll32.c</file> Modified: trunk/reactos/base/system/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="services" type="win32cui" installbase="system32" installname="services.exe"> +<module name="services" type="win32cui" installbase="system32" installname="services.exe" unicode="yes"> <include base="services">.</include> <include base="scm_server">.</include> <include base="ReactOS">include/reactos/subsys</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>scm_server</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe"> +<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe" unicode="yes"> <include base="freeldr_fdebug">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.rb… ============================================================================== --- trunk/reactos/dll/cpl/console/console.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll"> +<module name="console" type="win32dll" baseaddress="${BASEADDRESS_CONSOLE}" installbase="system32" installname="console.dll" unicode="yes"> <importlibrary definition="console.def" /> <include base="console">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> Modified: trunk/reactos/dll/cpl/input/input.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -10,7 +10,7 @@ <library>user32</library> <library>comctl32</library> <library>msvcrt</library> - <library>gdi32</library> + <library>gdi32</library> <file>input.c</file> <file>settings.c</file> <file>keysettings.c</file> Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true"> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes"> <importlibrary definition="ddraw.def" /> <include base="ddraw">.</include> - <define name="UNICODE" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/dll/directx/devenum/devenum.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/devenu… ============================================================================== --- trunk/reactos/dll/directx/devenum/devenum.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/devenum/devenum.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true"> +<module name="devenum" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devenum.dll" allowwarnings="true" unicode="yes">  <importlibrary definition="devenum.spec.def" /> <include base="devenum">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.… ============================================================================== --- trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true"> +<module name="dinput" type="win32dll" baseaddress="${BASEADDRESS_DINPUT}" installbase="system32" installname="dinput.dll" allowwarnings ="true" unicode="yes"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dinput.spec.def" /> <include base="dinput">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dinput8/dinput8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/dinput… ============================================================================== --- trunk/reactos/dll/directx/dinput8/dinput8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dinput8/dinput8.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll"> +<module name="dinput8" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DINPUT8}" installbase="system32" installname="dinput8.dll" unicode="yes"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dinput8.spec.def" /> <include base="dinput8">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -4,11 +4,11 @@ <directory name="d3d8thk"> <xi:include href="d3d8thk/d3d8thk.rbuild" /> </directory> + <directory name="ddraw"> + <xi:include href="ddraw/ddraw.rbuild" /> + </directory> <directory name="devenum"> <xi:include href="devenum/devenum.rbuild" /> - </directory> - <directory name="ddraw"> - <xi:include href="ddraw/ddraw.rbuild" /> </directory> <directory name="dinput"> <xi:include href="dinput/dinput.rbuild" /> Modified: trunk/reactos/dll/directx/dplay/dplay.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/dplay.rb… ============================================================================== --- trunk/reactos/dll/directx/dplay/dplay.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplay/dplay.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll"> +<module name="dplay" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_DPLAY}" installbase="system32" installname="dplay.dll" unicode="yes"> <importlibrary definition="dplay.spec.def" /> <include base="dinput8">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.… ============================================================================== --- trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true"> +<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" allowwarnings ="true" unicode="yes">  <importlibrary definition="dplayx.spec.def" /> <include base="dplayx">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/dxdiag… ============================================================================== --- trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dxdiagn/dxdiagn.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true"> +<module name="dxdiagn" type="win32dll" baseaddress="${BASEADDRESS_DXDIAGN}" installbase="system32" installname="dxdiagn.dll" allowwarnings="true" unicode="yes"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="dxdiagn.spec.def" /> <include base="dxdiagn">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true"> +<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings ="true" unicode="yes"> <importlibrary definition="d3d8.spec.def" /> <include base="d3d8">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,11 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true"> +<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings ="true" unicode="yes"> <importlibrary definition="d3d9.spec.def" /> <include base="d3d9">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/shellext/devcpux/devcpux.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/devcp… ============================================================================== --- trunk/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/devcpux/devcpux.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ -<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll"> +<module name="devcpux" type="win32dll" installbase="system32" installname="devcpux.dll" unicode="yes"> <importlibrary definition="devcpux.def" /> <include base="devcpux">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/shellext/shellext.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/shellext.rbui… ============================================================================== --- trunk/reactos/dll/shellext/shellext.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/shellext.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="slayer"> - <xi:include href="slayer/slayer.rbuild" /> - </directory> <directory name="deskadp"> <xi:include href="deskadp/deskadp.rbuild" /> </directory> @@ -13,4 +10,7 @@ <directory name="devcpux"> <xi:include href="devcpux/devcpux.rbuild" /> </directory> + <directory name="slayer"> + <xi:include href="slayer/slayer.rbuild" /> + </directory> </group> Modified: trunk/reactos/dll/shellext/slayer/slayer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll"> +<module name="slayer" type="win32dll" baseaddress="${BASEADDRESS_SLAYER}" installbase="system32" installname="slayer.dll" unicode="yes"> <importlibrary definition="slayer.def" /> <include base="slayer">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x601</define> <library>kernel32</library> Modified: trunk/reactos/dll/win32/acledit/acledit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll"> +<module name="acledit" type="win32dll" baseaddress="${BASEADDRESS_ACLEDIT}" installbase="system32" installname="acledit.dll" unicode="yes"> <importlibrary definition="acledit.def" /> <include base="acledit">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <metadata description = "Access Control List Editor" /> Modified: trunk/reactos/dll/win32/aclui/aclui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.rbui… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll"> +<module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll" unicode="yes"> <importlibrary definition="aclui.spec.def" /> <include base="aclui">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,4 +1,4 @@ -<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> +<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll" unicode="yes"> <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> @@ -8,8 +8,6 @@ <define name="WINVER">0x600</define> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> - <define name="UNICODE"></define> - <define name="_UNICODE"></define> <library>scm_client</library> <library>lsa_client</library> <library>eventlog_client</library> Modified: trunk/reactos/dll/win32/authz/authz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/authz.rbui… ============================================================================== --- trunk/reactos/dll/win32/authz/authz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/authz/authz.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll"> +<module name="authz" type="win32dll" baseaddress="${BASEADDRESS_AUTHZ}" installbase="system32" installname="authz.dll" unicode="yes"> <importlibrary definition="authz.def" /> <include base="authz">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll"> +<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes"> <importlibrary definition="beepmidi.def" /> <include base="beepmidi">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>ntdll</library> <library>kernel32</library> <library>user32</library> Modified: trunk/reactos/dll/win32/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -6,7 +6,6 @@ <include base="browseui">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="explorer_new">.</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/cards/cards.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rbui… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll"> +<module name="cards" type="win32dll" baseaddress="${BASEADDRESS_CARDS}" installbase="system32" installname="cards.dll" unicode="yes"> <importlibrary definition="cards.def" /> <include base="cards">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" />  <define name="CARDSTYLE_DEFAULT" /> Modified: trunk/reactos/dll/win32/compstui/compstui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/compstu… ============================================================================== --- trunk/reactos/dll/win32/compstui/compstui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/compstui/compstui.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="compstui.spec.def" /> <include base="compstui">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.… ============================================================================== --- trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="crypt32.spec.def" /> <include base="crypt32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/devmgr/devmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rb… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true"> +<module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true" unicode="yes"> <include base="devmgr">.</include> <importlibrary definition="devmgr.spec.def" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,7 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes"> <importlibrary definition="gdi32.def" /> <include base="gdi32">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="UNICODE" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <define name="LANGPACK" /> Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="gdiplus.spec.def" /> <include base="gdiplus">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/hid/hid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll"> +<module name="hid" type="win32dll" baseaddress="${BASEADDRESS_HID}" installbase="system32" installname="hid.dll" unicode="yes"> <importlibrary definition="hid.def" /> <include base="hid">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="inetcomm.spec.def" /> <include base="inetcomm">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ -<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true"> +<module name="iphlpapi" type="win32dll" baseaddress="${BASEADDRESS_IPHLPAPI}" installbase="system32" installname="iphlpapi.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="iphlpapi.spec.def" /> <include base="iphlpapi">include</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>wine</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,7 @@ -<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll"> +<module name="lsasrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LSASRV}" installbase="system32" installname="lsasrv.dll" unicode="yes"> <importlibrary definition="lsasrv.def" /> <include base="lsasrv">.</include> <include base="lsa_server">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x0600</define> <linkerflag>-nostartfiles</linkerflag> Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.rbui… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll"> +<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"> <importlibrary definition="mmdrv.def" /> <include base="mmdrv">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="NDEBUG" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,7 @@ -<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll"> +<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes"> <importlibrary definition="msacm32.spec.def" /> <include base="msacm32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.rbui… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ -<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll"> +<module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll" unicode="yes"> <importlibrary definition="msafd.def" /> <include base="msafd">.</include> <include base="msafd">include</include> <include base="ReactOS">include/reactos/drivers</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <pch>msafd.h</pch> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/mswsock/mswsock.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,6 +1,5 @@ -<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll"> +<module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll" unicode="yes"> <importlibrary definition="mswsock.def" /> - <define name="UNICODE" /> <define name="LE" /> <library>kernel32</library> <library>ws2_32</library> Modified: trunk/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.rb… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -3,7 +3,6 @@ <importlibrary definition="msxml3.spec.def" /> <include base="msxml3">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… ============================================================================== --- trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="nddeapi.spec.def" /> <include base="nddeapi">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="ntdsapi.spec.def" /> <include base="ntdsapi">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll"> +<module name="ntmarta" type="win32dll" baseaddress="${BASEADDRESS_NTMARTA}" installbase="system32" installname="ntmarta.dll" unicode="yes"> <importlibrary definition="ntmarta.def" /> <include base="ntmarta">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x600</define> <define name="WINVER">0x0600</define> Modified: trunk/reactos/dll/win32/opengl32/opengl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,7 +1,5 @@ -<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll"> +<module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes"> <importlibrary definition="opengl32.def" /> - <include base="wsock32">.</include> - <define name="UNICODE" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/pdh/pdh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pdh/pdh.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="pdh.spec.def" /> <include base="pdh">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/printui/printui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="printui.spec.def" /> <include base="printui">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -3,7 +3,6 @@ <importlibrary definition="rpcrt4.spec.def" /> <include base="rpcrt4">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/samsrv/samsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rb… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll"> +<module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll" unicode="yes"> <importlibrary definition="samsrv.def" /> <include base="samsrv">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> <library>ntdll</library> Modified: trunk/reactos/dll/win32/serialui/serialui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… ============================================================================== --- trunk/reactos/dll/win32/serialui/serialui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/serialui/serialui.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll"> +<module name="serialui" type="win32dll" baseaddress="${BASEADDRESS_SERIALUI}" installbase="system32" installname="serialui.dll" unicode="yes"> <importlibrary definition="serialui.def" /> <include base="serialui">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>kernel32</library> <library>user32</library> <library>shlwapi</library> Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,12 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true"> +<module name="setupapi" type="win32dll" baseaddress="${BASEADDRESS_SETUPAPI}" installbase="system32" installname="setupapi.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="setupapi.spec.def" /> <include base="setupapi">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="pnp_client">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -3,7 +3,6 @@ <importlibrary definition="shdocvw.spec.def" /> <include base="shdocvw">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.… ============================================================================== --- trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/snmpapi/snmpapi.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,7 +1,6 @@ -<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll"> +<module name="snmpapi" type="win32dll" baseaddress="${BASEADDRESS_SNMPAPI}" installbase="system32" installname="snmpapi.dll" unicode="yes"> <importlibrary definition="snmpapi.def" /> <include base="snmpapi">.</include> - <define name="UNICODE" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/tapi32/tapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.rb… ============================================================================== --- trunk/reactos/dll/win32/tapi32/tapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/tapi32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -2,7 +2,6 @@ <importlibrary definition="tapi32.spec.def" /> <include base="tapi32">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> <define name="TAPI_CURRENT_VERSION">0x00020000</define> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,9 @@ -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="user32.def" /> <include base="user32">.</include> <include base="user32">include</include> <include base="ReactOS">include/reactos/subsys</include> <define name="_DISABLE_TIDENTS" /> - <define name="UNICODE" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>wine</library> Modified: trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vdmdbg/vdmdbg.rb… ============================================================================== --- trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vdmdbg/vdmdbg.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,8 +1,6 @@ -<module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll"> +<module name="vdmdbg" type="win32dll" baseaddress="${BASEADDRESS_VDMDBG}" installbase="system32" installname="vdmdbg.dll" unicode="yes"> <importlibrary definition="vdmdbg.def" /> <include base="vdmdbg">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <library>ntdll</library> <library>kernel32</library> <file>vdmdbg.c</file> Modified: trunk/reactos/dll/win32/winfax/winfax.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winfax/winfax.rb… ============================================================================== --- trunk/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winfax/winfax.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,7 +1,6 @@ <module name="winfax" type="win32dll" baseaddress="${BASEADDRESS_WINFAX}" installbase="system32" installname="winfax.dll" allowwarnings="true" entrypoint="0"> <importlibrary definition="winfax.def" /> <include base="winfax">.</include> - <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mi… ============================================================================== --- trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,7 @@ -<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true"> +<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="midimap.spec.def" /> <include base="midimap">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/wavemap/wa… ============================================================================== --- trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,7 @@ -<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true"> +<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true" unicode="yes"> <importlibrary definition="msacm.spec.def" /> <include base="wavemap">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbui… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -11,7 +11,6 @@ <importlibrary definition="winmm.spec.def" /> <include base="winmm">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> <define name="WINVER">0x501</define> Modified: trunk/reactos/dll/win32/winspool/winspool.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/winspoo… ============================================================================== --- trunk/reactos/dll/win32/winspool/winspool.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/winspool.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,10 +1,7 @@ -<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true"> +<module name="winspool" type="win32dll" extension=".drv" baseaddress="${BASEADDRESS_WINSPOOL}" installbase="system32" installname="winspool.drv" allowwarnings="true" unicode="yes"> <importlibrary definition="winspool.def" /> <include base="winspool">.</include> <define name="_DISABLE_TIDENTS" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> <library>ntdll</library> <library>kernel32</library> <file>info.c</file> Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -3,7 +3,6 @@ <importlibrary definition="wintrust.spec.def" /> <include base="wintrust">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">0x501</define> Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.rb… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,8 @@ -<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll"> +<module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll" unicode="yes"> <importlibrary definition="ws2_32.def" /> <include base="ws2_32">include</include> <include base="ReactOS">include/reactos/wine</include> <define name="_DISABLE_TIDENTS" /> - <define name="UNICODE" /> <define name="LE" /> <define name="_WIN32_WINNT">0x0500</define> <library>wine</library> Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,7 +1,6 @@ -<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll"> +<module name="ws2help" type="win32dll" baseaddress="${BASEADDRESS_WS2HELP}" installbase="system32" installname="ws2help.dll" unicode="yes"> <importlibrary definition="ws2help.def" /> <include base="ws2help">.</include> - <define name="UNICODE" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/wshirda/wshirda.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/wshirda.… ============================================================================== --- trunk/reactos/dll/win32/wshirda/wshirda.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/wshirda.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,7 +1,6 @@ -<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}" installbase="system32" installname="wshirda.dll"> +<module name="wshirda" type="win32dll" baseaddress="${BASEADDRESS_WSHIRDA}" installbase="system32" installname="wshirda.dll" unicode="yes"> <importlibrary definition="wshirda.def" /> <include base="wshirda">.</include> - <define name="UNICODE" /> <define name="_DISABLE_TIDENTS" /> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/wsock32/wsock32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,7 +1,6 @@ -<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll"> +<module name="wsock32" type="win32dll" baseaddress="${BASEADDRESS_WSOCK32}" installbase="system32" installname="wsock32.dll" unicode="yes"> <importlibrary definition="wsock32.def" /> <include base="wsock32">.</include> - <define name="UNICODE" /> <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> Modified: trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/wshtcpip/w… ============================================================================== --- trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/wshtcpip/wshtcpip.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -1,9 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll"> +<module name="wshtcpip" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_WSHTCPIP}" installbase="system32" installname="wshtcpip.dll" unicode="yes"> <importlibrary definition="wshtcpip.def"></importlibrary> <include base="wshtcpip">.</include> - <define name="UNICODE" /> <library>ntdll</library> <library>kernel32</library> <library>ws2_32</library> Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -3,7 +3,6 @@ <group> <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true"> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> - <include base="ReactOS">include/crt</include> <include base="mingw_common">include</include> <file>cpu_features.c</file> <file>CRTfmode.c</file> @@ -24,21 +23,18 @@ </if> </module> <module name="mingw_main" type="staticlibrary" isstartuplib="true" allowwarnings="true"> - <include base="ReactOS">include/crt</include> <include base="mingw_common">include</include> <file>binmode.c</file> <file>crt1.c</file> <file>main.c</file> </module> <module name="mingw_wmain" type="staticlibrary" isstartuplib="true" allowwarnings="true"> - <include base="ReactOS">include/crt</include> <include base="mingw_common">include</include> <file>wbinmode.c</file> <file>wcrt1.c</file> <file>wmain.c</file> </module> <module name="mingw_dllmain" type="staticlibrary" isstartuplib="true"> - <include base="ReactOS">include/crt</include> <include base="mingw_common">include</include> <file>dllcrt1.c</file> </module> Modified: trunk/reactos/lib/drivers/chew/chew.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/chew.rbui… ============================================================================== --- trunk/reactos/lib/drivers/chew/chew.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/chew.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -3,6 +3,5 @@ <module name="chew" type="staticlibrary"> <define name="_NTOSKRNL_" /> <include base="chew">include</include> - <include base="ReactOS">include/ddk</include> <file>workqueue.c</file> </module> Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Thu May 8 11:01:30 2008 @@ -9,7 +9,6 @@ <include base="freetype">include</include> <include base="ReactOS">include/reactos/subsys</include> <include base="ReactOS">include/reactos/drivers</include> - <define name="UNICODE" /> <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x600</define> <define name="LANGPACK" />

16 years, 8 months

[dchapyshev] 33365: - Fix typo

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu May 8 08:18:23 2008 New Revision: 33365 URL: http://svn.reactos.org/svn/reactos?rev=33365&view=rev Log: - Fix typo Modified: trunk/reactos/dll/cpl/input/add.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Thu May 8 08:18:23 2008 @@ -102,7 +102,6 @@ (GetLayoutCount(Lang) >= 1)) { wsprintf(SubPath, _T("d%03d%s"), GetLayoutCount(Lang)-1, Lang); - MessageBox(0, SubPath, NULL, MB_OK); } else SubPath[0] = '\0'; }

16 years, 8 months

[dchapyshev] 33364: - Adding and deleting layouts using Substitutes

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu May 8 05:47:30 2008 New Revision: 33364 URL: http://svn.reactos.org/svn/reactos?rev=33364&view=rev Log: - Adding and deleting layouts using Substitutes Modified: trunk/reactos/dll/cpl/input/add.c trunk/reactos/dll/cpl/input/settings.c Modified: trunk/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/add.c?rev=33… ============================================================================== --- trunk/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/add.c [iso-8859-1] Thu May 8 05:47:30 2008 @@ -36,14 +36,50 @@ } } +static INT +GetLayoutCount(LPTSTR szLang) +{ + HKEY hKey; + TCHAR szLayoutID[3 + 1], szPreload[CCH_LAYOUT_ID + 1], szLOLang[MAX_PATH]; + DWORD dwIndex = 0, dwType, dwSize; + INT Count = 0, i, j; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), + 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szLayoutID); + + while (RegEnumValue(hKey, dwIndex, szLayoutID, &dwSize, NULL, &dwType, NULL, NULL) == ERROR_SUCCESS) + { + dwSize = sizeof(szPreload); + RegQueryValueEx(hKey, szLayoutID, NULL, NULL, (LPBYTE)szPreload, &dwSize); + + for (i = 4, j = 0; i < _tcslen(szPreload)+1; i++, j++) + szLOLang[j] = szPreload[i]; + + if (_tcscmp(szLOLang, szLang) == 0) Count += 1; + + dwSize = sizeof(szLayoutID); + dwIndex++; + } + + RegCloseKey(hKey); + } + + return Count; +} + static VOID AddNewLayout(HWND hwndDlg) { - TCHAR NewLayout[CCH_ULONG_DEC + 1]; - INT iLayout; - HKEY hKey; + TCHAR NewLayout[CCH_ULONG_DEC + 1], Lang[MAX_PATH], + LangID[CCH_LAYOUT_ID + 1], Layout[MAX_PATH], + SubPath[CCH_LAYOUT_ID + 1]; + INT iLayout, iLang; + HKEY hKey, hSubKey; DWORD cValues; PTSTR pts; + LCID lcid; iLayout = SendMessage(hLayoutList, CB_GETCURSEL, 0, 0); if (iLayout == CB_ERR) return; @@ -54,7 +90,42 @@ { _ultot(cValues + 1, NewLayout, 10); + iLang = SendMessage(hLangList, CB_GETCURSEL, 0, 0); + lcid = SendMessage(hLangList, CB_GETITEMDATA, iLang, 0); + + GetLocaleInfo(MAKELCID(lcid, SORT_DEFAULT), LOCALE_ILANGUAGE, Lang, sizeof(Lang) / sizeof(TCHAR)); + wsprintf(LangID, _T("0000%s"), Lang); + + if (GetLayoutName(LangID, Layout)) + { + if ((SendMessage(hLayoutList, CB_SELECTSTRING, (WPARAM) -1, (LPARAM)Layout) != CB_ERR)&& + (GetLayoutCount(Lang) >= 1)) + { + wsprintf(SubPath, _T("d%03d%s"), GetLayoutCount(Lang)-1, Lang); + MessageBox(0, SubPath, NULL, MB_OK); + } + else SubPath[0] = '\0'; + } + pts = (PTSTR) SendMessage(hLayoutList, CB_GETITEMDATA, iLayout, 0); + + if (_tcslen(SubPath) != 0) + { + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, NULL, + REG_OPTION_NON_VOLATILE, KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WRITE, + NULL, &hSubKey, NULL) == ERROR_SUCCESS) + { + if (RegSetValueEx(hSubKey, SubPath, 0, REG_SZ, (LPBYTE)pts, + (DWORD)((CCH_LAYOUT_ID + 1) * sizeof(TCHAR))) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return; + } + RegCloseKey(hSubKey); + } + pts = SubPath; + } if (RegSetValueEx(hKey, NewLayout, @@ -66,6 +137,7 @@ UpdateLayoutsList(); } } + RegCloseKey(hKey); } } Modified: trunk/reactos/dll/cpl/input/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings.c?r… ============================================================================== --- trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings.c [iso-8859-1] Thu May 8 05:47:30 2008 @@ -256,9 +256,11 @@ { INT iIndex, LayoutNum; LVITEM item; - HKEY hKey; + HKEY hKey, hSubKey; HWND hLayoutList = GetDlgItem(MainDlgWnd, IDC_KEYLAYOUT_LIST); - TCHAR szLayoutNum[10 + 1], szTitle[MAX_PATH], szConf[MAX_PATH]; + TCHAR szLayoutNum[10 + 1], szTitle[MAX_PATH], + szConf[MAX_PATH], szPreload[CCH_LAYOUT_ID + 1]; + DWORD dwSize; iIndex = (INT) SendMessage(hLayoutList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); @@ -277,9 +279,29 @@ (VOID) ListView_GetItem(hLayoutList, &item); LayoutNum = (INT) item.lParam; - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, + KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) { _ultot(LayoutNum, szLayoutNum, 10); + + dwSize = sizeof(szPreload); + RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szPreload, &dwSize); + + if (szPreload[0] == 'd') + { + if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, + KEY_ALL_ACCESS, &hSubKey) == ERROR_SUCCESS) + { + if (RegDeleteValue(hSubKey, szPreload) != ERROR_SUCCESS) + { + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return; + } + RegCloseKey(hSubKey); + } + } + if (RegDeleteValue(hKey, szLayoutNum) == ERROR_SUCCESS) { UpdateLayoutsList();

16 years, 8 months

[gedmurphy] 33363: Pass in the full xml path. This should fix the crash when using the app when the 'run when windows starts' option is selected.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu May 8 04:50:50 2008 New Revision: 33363 URL: http://svn.reactos.org/svn/reactos?rev=33363&view=rev Log: Pass in the full xml path. This should fix the crash when using the app when the 'run when windows starts' option is selected. Modified: trunk/tools/Message Translator/GUI/App.config trunk/tools/Message Translator/GUI/MainForm.cs Modified: trunk/tools/Message Translator/GUI/App.config URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/App… ============================================================================== --- trunk/tools/Message Translator/GUI/App.config [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/App.config [iso-8859-1] Thu May 8 04:50:50 2008 @@ -1,10 +1,10 @@ ï»¿<?xml version="1.0" encoding="utf-8"?> <configuration> <appSettings> - <add key="NtstatusXml" value=".\Resources\ntstatus.xml" /> - <add key="WinerrorXml" value=".\Resources\winerror.xml" /> - <add key="HresultXml" value=".\Resources\hresult.xml" /> - <add key="WmXml" value=".\Resources\wm.xml" /> + <add key="NtstatusXml" value="Resources\ntstatus.xml" /> + <add key="WinerrorXml" value="Resources\winerror.xml" /> + <add key="HresultXml" value="Resources\hresult.xml" /> + <add key="WmXml" value="Resources\wm.xml" /> <add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" /> <add key="BugHomepage" value="http://www.reactos.org/bugzilla"/> </appSettings> Modified: trunk/tools/Message Translator/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] Thu May 8 04:50:50 2008 @@ -5,6 +5,7 @@ using MsgTrans.Library; using System.Resources; using System.Reflection; +using System.IO; using Microsoft.Win32; namespace MsgTranslator @@ -47,7 +48,22 @@ rk.SetValue(keyName, value); } } - + private static string PrependWorkingDirectory(string file) + { + string full; + string workDir; + + try + { + workDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + full = workDir + '\\' + file; + return full; + } + catch (Exception) + { + return file; + } + } private static void VerifyRequiredOption(string optionName, string optionValue) { @@ -65,6 +81,7 @@ string s = ConfigurationSettings.AppSettings[optionName]; VerifyRequiredOption(optionName, s); + s = PrependWorkingDirectory(s); return s; } } @@ -76,6 +93,7 @@ string s = ConfigurationSettings.AppSettings[optionName]; VerifyRequiredOption(optionName, s); + s = PrependWorkingDirectory(s); return s; } } @@ -87,6 +105,7 @@ string s = ConfigurationSettings.AppSettings[optionName]; VerifyRequiredOption(optionName, s); + s = PrependWorkingDirectory(s); return s; } } @@ -98,6 +117,7 @@ string s = ConfigurationSettings.AppSettings[optionName]; VerifyRequiredOption(optionName, s); + s = PrependWorkingDirectory(s); return s; } }

16 years, 8 months

[navaraf] 33362: Use correct path when loading plugins.

by navaraf＠svn.reactos.org

Author: navaraf Date: Thu May 8 03:00:35 2008 New Revision: 33362 URL: http://svn.reactos.org/svn/reactos?rev=33362&view=rev Log: Use correct path when loading plugins. Modified: trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs Modified: trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/Factor… ============================================================================== --- trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs [iso-8859-1] (original) +++ trunk/irc/TechBot/TechBot.Library/Factory/CommandFactory.cs [iso-8859-1] Thu May 8 03:00:35 2008 @@ -18,11 +18,9 @@ public static void LoadPlugins() { //get the file names of the dll files in the current directory. - FileInfo objExeInfo = new FileInfo(@"C:\Ros\current\irc\TechBot\TechBot.Console\bin\Debug\"); - - foreach (FileInfo objInfo in objExeInfo.Directory.GetFiles("*.dll")) + foreach (string fileName in Directory.GetFiles(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "*.dll")) { - LoadPluginsFromDLLFile(objInfo.FullName); + LoadPluginsFromDLLFile(fileName); } }

16 years, 8 months

[janderwald] 33361: - check if the requested MenuItem object was really found - makes user32_winetest not crash reactos

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu May 8 02:46:46 2008 New Revision: 33361 URL: http://svn.reactos.org/svn/reactos?rev=33361&view=rev Log: - check if the requested MenuItem object was really found - makes user32_winetest not crash reactos Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Thu May 8 02:46:46 2008 @@ -930,7 +930,7 @@ { int pos = (int)uItem; PMENU_ITEM MenuItem; - PMENU_OBJECT SubMenu; + PMENU_OBJECT SubMenu = NULL; if (MAX_MENU_ITEMS <= MenuObject->MenuInfo.MenuItemCount) { @@ -951,6 +951,13 @@ { pos = IntGetMenuItemByFlag(MenuObject, uItem, MF_BYCOMMAND, &SubMenu, NULL, NULL); } + if (SubMenu == NULL) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (pos < -1) { pos = -1;

16 years, 8 months

[pschweitzer] 33360: Updated French translation for Syssetup.dll

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu May 8 01:17:20 2008 New Revision: 33360 URL: http://svn.reactos.org/svn/reactos?rev=33360&view=rev Log: Updated French translation for Syssetup.dll Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Thu May 8 01:17:20 2008 @@ -220,7 +220,7 @@ BEGIN IDS_SYS_TOOLS "Outils système" IDS_CMT_CHARMAP "Table des Caractères" - IDS_CMT_KBSWITCH "Keyboard Layout Switcher" + IDS_CMT_KBSWITCH "Sélecteur de configuration clavier" END STRINGTABLE @@ -259,7 +259,7 @@ IDS_SHORT_CHARMAP "Table des Caractères.lnk" IDS_SHORT_MAGNIFY "Loupe.lnk" IDS_SHORT_RDESKTOP "Bureau Distant.lnk" - IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" + IDS_SHORT_KBSWITCH "Sélecteur de configuration clavier.lnk" END STRINGTABLE

16 years, 8 months

[pschweitzer] 33359: Added an Ext2 provider. Not yet used by Autochk.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu May 8 01:03:54 2008 New Revision: 33359 URL: http://svn.reactos.org/svn/reactos?rev=33359&view=rev Log: Added an Ext2 provider. Not yet used by Autochk. Added: trunk/reactos/dll/win32/uext2/ trunk/reactos/dll/win32/uext2/uext2.c (with props) trunk/reactos/dll/win32/uext2/uext2.def (with props) trunk/reactos/dll/win32/uext2/uext2.rbuild (with props) trunk/reactos/dll/win32/uext2/uext2.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=333… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Thu May 8 01:03:54 2008 @@ -17,6 +17,7 @@ <property name="BASEADDRESS_OBJSEL" value="0x5b400000" /> <property name="BASEADDRESS_UFAT" value="0x5b570000" /> <property name="BASEADDRESS_TAPIUI" value="0x5b770000" /> + <property name="BASEADDRESS_UEXT2" value="0x5b7a0000" /> <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" /> <property name="BASEADDRESS_USRMGR" value="0x5c900000" /> <property name="BASEADDRESS_COMMCTRL" value="0x5d090000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu May 8 01:03:54 2008 @@ -300,6 +300,7 @@ dll\win32\tapi32\tapi32.dll 1 dll\win32\tapiui\tapiui.dll 1 dll\win32\twain_32\twain_32.dll 1 +dll\win32\uext2\uext2.dll 1 dll\win32\ufat\ufat.dll 1 dll\win32\ufatx\ufatx.dll 1 optional dll\win32\untfs\untfs.dll 1 Added: trunk/reactos/dll/win32/uext2/uext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.c?re… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.c (added) +++ trunk/reactos/dll/win32/uext2/uext2.c [iso-8859-1] Thu May 8 01:03:54 2008 @@ -1,0 +1,27 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Ext2 File System Management + * FILE: dll/win32/uext2/uext2.c + * PURPOSE: uext2 DLL initialisation + * + * PROGRAMMERS: Pierre Schweitzer + */ + +#define WIN32_NO_STATUS +#include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> +#include <fmifs/fmifs.h> + +INT WINAPI +DllMain( + IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(hinstDLL); + UNREFERENCED_PARAMETER(dwReason); + UNREFERENCED_PARAMETER(lpvReserved); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/uext2/uext2.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/uext2/uext2.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.def?… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.def (added) +++ trunk/reactos/dll/win32/uext2/uext2.def [iso-8859-1] Thu May 8 01:03:54 2008 @@ -1,0 +1,4 @@ +LIBRARY UEXT2.DLL +EXPORTS +ChkdskEx=Ext2Chkdsk@24 +FormatEx=Ext2Format@24 Propchange: trunk/reactos/dll/win32/uext2/uext2.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/uext2/uext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.rbui… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.rbuild (added) +++ trunk/reactos/dll/win32/uext2/uext2.rbuild [iso-8859-1] Thu May 8 01:03:54 2008 @@ -1,0 +1,10 @@ +<module name="uext2" type="win32dll" baseaddress="${BASEADDRESS_UEXT2}" installbase="system32" installname="uext2.dll"> + <importlibrary definition="uext2.def" /> + <include base="uext2">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_WIN32_WINNT">0x0600</define> + <library>ext2lib</library> + <library>ntdll</library> + <file>uext2.c</file> + <file>uext2.rc</file> +</module> Propchange: trunk/reactos/dll/win32/uext2/uext2.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/uext2/uext2.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uext2/uext2.rc?r… ============================================================================== --- trunk/reactos/dll/win32/uext2/uext2.rc (added) +++ trunk/reactos/dll/win32/uext2/uext2.rc [iso-8859-1] Thu May 8 01:03:54 2008 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Ext2 File System Management\0" +#define REACTOS_STR_INTERNAL_NAME "uext2\0" +#define REACTOS_STR_ORIGINAL_FILENAME "uext2.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/win32/uext2/uext2.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Thu May 8 01:03:54 2008 @@ -310,6 +310,9 @@ <directory name="twain_32"> <xi:include href="twain_32/twain_32.rbuild" /> </directory> +<directory name="uext2"> + <xi:include href="uext2/uext2.rbuild" /> +</directory> <directory name="ufat"> <xi:include href="ufat/ufat.rbuild" /> </directory>

16 years, 8 months

[dchapyshev] 33358: - Add more languages to usetup

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Thu May 8 00:13:28 2008 New Revision: 33358 URL: http://svn.reactos.org/svn/reactos?rev=33358&view=rev Log: - Add more languages to usetup Modified: trunk/reactos/base/setup/usetup/mui.c trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Thu May 8 00:13:28 2008 @@ -49,35 +49,53 @@ static const MUI_LANGUAGE LanguageList[] = { - /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ - {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, - {L"00000403", L"00000403", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings }, - {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, - {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, - {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, - {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, - {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, - {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, - {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, - {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, - {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, - {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, - {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, - {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, - {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, + /* Lang ID, DefKbdLayout, SecKbLayout, ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings, other strings */ + {L"00000409", L"00000409", NULL, L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041C", L"0000041C", L"00000409", L"1250", L"852", L"10029", L"Albanian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000401", L"00000401", L"00000409", L"1256", L"720", L"10004", L"Arabic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000813", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Belgian (Dutch)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000080C", L"0000080C", L"00000409", L"1252", L"850", L"10000", L"Belgian (French)",enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000402", L"00000402", L"00000409", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries, bgBGStrings }, + {L"00000455", L"00000455", L"00000409", L"0", L"1", L"2", L"Burmese", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only + {L"00000C0C", L"00000C0C", L"00000409", L"1252", L"850", L"10000", L"Canadian (French)",enUSPages,enUSErrorEntries, enUSStrings }, + {L"00000403", L"00000403", L"00000409", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000804", L"00000804", L"00000409", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000405", L"00000405", L"00000409", L"1250", L"852", L"10029", L"Czech", csCZPages, csCZErrorEntries, csCZStrings }, + {L"00000406", L"00000406", L"00000409", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000407", L"00000407", L"00000409", L"1252", L"850", L"10000", L"Deutsch", deDEPages, deDEErrorEntries, deDEStrings }, + {L"00000413", L"00000813", L"00000409", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000425", L"00000425", L"00000409", L"1257", L"775", L"10029", L"Estonian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040B", L"0000040B", L"00000409", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040C", L"0000040C", L"00000409", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries, frFRStrings }, + {L"00000437", L"00000437", L"00000409", L"0", L"1", L"2", L"Georgian", enUSPages, enUSErrorEntries, enUSStrings },// Unicode only + {L"00000408", L"00000408", L"00000409", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries, elGRStrings }, + {L"0000040D", L"0000040D", L"00000409", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040E", L"0000040E", L"00000409", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000040F", L"0000040F", L"00000409", L"1252", L"850", L"10079", L"Icelandic", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000410", L"00000410", L"00000409", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries, itITStrings }, + {L"00000411", L"00000411", L"00000409", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000412", L"00000412", L"00000409", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000426", L"00000426", L"00000409", L"1257", L"775", L"10029", L"Latvian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000427", L"00000427", L"00000409", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries, ltLTStrings }, + {L"0000042F", L"0000042F", L"00000409", L"1251", L"866", L"10007", L"Macedonian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000414", L"00000414", L"00000409", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000418", L"00000418", L"00000409", L"1250", L"852", L"10029", L"Romanian", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000419", L"00000419", L"00000409", L"1251", L"866", L"10007", L"Russkij", ruRUPages, ruRUErrorEntries, ruRUStrings }, + {L"00000415", L"00000415", L"00000409", L"1250", L"852", L"10029", L"Polski", plPLPages, plPLErrorEntries, plPLStrings }, + {L"00000816", L"00000816", L"00000409", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000C1A", L"00000C1A", L"00000409", L"1251", L"855", L"10007", L"Serbian (Cyrillic)",enUSPages,enUSErrorEntries,enUSStrings }, + {L"0000081A", L"0000081A", L"00000409", L"1250", L"852", L"10029", L"Serbian (Latin)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041B", L"0000041B", L"00000409", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries, skSKStrings }, + {L"0000040A", L"0000040A", L"00000409", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries, esESStrings }, + {L"00000807", L"00000807", L"00000409", L"1252", L"850", L"10000", L"Swiss (German)", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041D", L"0000041D", L"00000409", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries, svSEStrings }, + {L"00000444", L"00000444", L"00000409", L"1251", L"866", L"10007", L"Tatar", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041E", L"0000041E", L"00000409", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000041F", L"0000041F", L"00000409", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000422", L"00000422", L"00000409", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries, ukUAStrings }, + {L"00000809", L"00000809", L"00000409", L"1252", L"850", L"10000", L"United Kingdom", enUSPages, enUSErrorEntries, enUSStrings }, + {L"00000843", L"00000843", L"00000409", L"1251", L"866", L"10007", L"Uzbek", enUSPages, enUSErrorEntries, enUSStrings }, + {L"0000042A", L"0000042A", L"00000409", L"1258", L"1258",L"10000", L"Vietnamese", enUSPages, enUSErrorEntries, enUSStrings }, {NULL, NULL, NULL, NULL, NULL, NULL} }; Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu May 8 00:13:28 2008 @@ -71,7 +71,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5011" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout File",0x00000000,"kbdsg.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout Text",0x00000000,"Swiss German" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout Text",0x00000000,"Swiss (German)" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000807","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5024" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000408","Layout File",0x00000000,"kbdhe.dll" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu May 8 00:13:28 2008 @@ -100,34 +100,52 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" [Language] +0000041C = "Albanian" 00000401 = "Arabic" +00000813 = "Belgian (Dutch)" +0000080C = "Belgian (French)" 00000402 = "Bulgarian" +00000455 = "Burmese" +00000C0C = "Canadian (French)" 00000403 = "Catalan" 00000804 = "Chinese (PRC)" 00000405 = "Czech" 00000406 = "Danish" 00000413 = "Dutch" 00000409 = "English" +00000425 = "Estonian" 0000040B = "Finnish" 0000040C = "French" +00000437 = "Georgian" 00000407 = "German" 00000408 = "Greek" 0000040D = "Hebrew" 0000040E = "Hungarian" +0000040F = "Icelandic" 00000410 = "Italian" 00000411 = "Japanese" 00000412 = "Korean" +00000426 = "Latvian" 00000427 = "Lithuanian" +0000042F = "Macedonian" 00000414 = "Norwegian" 00000415 = "Polish" 00000816 = "Portuguese" +00000418 = "Romanian" 00000419 = "Russian" +00000C1A = "Serbian (Cyrillic)" +0000081A = "Serbian (Latin)" 0000041B = "Slovak" 0000040A = "Spanish" +00000807 = "Swiss (German)" 0000041D = "Swedish" +00000444 = "Tatar" 0000041E = "Thai" 0000041F = "Turkish" 00000422 = "Ukrainian" +00000809 = "United Kingdom" +00000843 = "Uzbek" +0000042A = "Vietnamese" [KeyboardLayout]

16 years, 8 months

← Newer
1
...
40
41
42
43
44
45
46
...
59
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 2008