Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[winesync] 32844: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 4 08:20:27 2008 New Revision: 32844 URL: http://svn.reactos.org/svn/reactos?rev=32844&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.rbuild 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] Fri Apr 4 08:20:27 2008 @@ -30,6 +30,8 @@ #include "imm.h" #include "ddk/imm.h" #include "winnls.h" +#include "winreg.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -42,6 +44,35 @@ DWORD dwLock; DWORD dwSize; } IMCCInternal; + +#define MAKE_FUNCPTR(f) typeof(f) * p##f +typedef struct _tagImmHkl{ + struct list entry; + HKL hkl; + HMODULE hIME; + IMEINFO imeInfo; + WCHAR imeClassName[17]; /* 16 character max */ + ULONG uSelected; + + /* Function Pointers */ + MAKE_FUNCPTR(ImeInquire); + MAKE_FUNCPTR(ImeConfigure); + MAKE_FUNCPTR(ImeDestroy); + MAKE_FUNCPTR(ImeEscape); + MAKE_FUNCPTR(ImeSelect); + MAKE_FUNCPTR(ImeSetActiveContext); + MAKE_FUNCPTR(ImeToAsciiEx); + MAKE_FUNCPTR(NotifyIME); + MAKE_FUNCPTR(ImeRegisterWord); + MAKE_FUNCPTR(ImeUnregisterWord); + MAKE_FUNCPTR(ImeEnumRegisterWord); + MAKE_FUNCPTR(ImeSetCompositionString); + MAKE_FUNCPTR(ImeConversionList); + MAKE_FUNCPTR(ImeProcessKey); + MAKE_FUNCPTR(ImeGetRegisterWordStyle); + MAKE_FUNCPTR(ImeGetImeMenuItems); +} ImmHkl; +#undef MAKE_FUNCPTR typedef struct tagInputContextData { @@ -52,13 +83,23 @@ DWORD dwLock; INPUTCONTEXT IMC; + + ImmHkl *immKbd; } InputContextData; + +typedef struct _tagTRANSMSG { + UINT message; + WPARAM wParam; + LPARAM lParam; +} TRANSMSG, *LPTRANSMSG; 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 */ static UINT WM_MSIME_SERVICE; @@ -69,15 +110,86 @@ static UINT WM_MSIME_QUERYPOSITION; 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}; /* * prototypes */ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static void UpdateDataInDefaultIMEWindow(HWND hwnd, BOOL showable); -static void ImmInternalPostIMEMessage(UINT, WPARAM, LPARAM); +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);} +static ImmHkl *IMM_GetImmHkl(HKL hkl) +{ + ImmHkl *ptr; + WCHAR filename[MAX_PATH]; + + TRACE("Seeking ime for keyboard 0x%x\n",(unsigned)hkl); + + LIST_FOR_EACH_ENTRY(ptr, &ImmHklList, ImmHkl, entry) + { + if (ptr->hkl == hkl) + return ptr; + } + /* not found... create it */ + + ptr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ImmHkl)); + + ptr->hkl = hkl; + if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); + if (ptr->hIME) + { + LOAD_FUNCPTR(ImeInquire); + LOAD_FUNCPTR(ImeDestroy); + LOAD_FUNCPTR(ImeSelect); + if (!ptr->pImeInquire || !ptr->pImeDestroy || !ptr->pImeSelect) + { + FreeLibrary(ptr->hIME); + ptr->hIME = NULL; + } + else + { + 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); + + return ptr; +} +#undef LOAD_FUNCPTR + +static void IMM_FreeAllImmHkl(void) +{ + ImmHkl *ptr,*cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(ptr, cursor2, &ImmHklList, ImmHkl, entry) + { + list_remove(&ptr->entry); + if (ptr->hIME) + { + ptr->pImeDestroy(1); + FreeLibrary(ptr->hIME); + } + HeapFree(GetProcessHeap(),0,ptr); + } +} static VOID IMM_PostResult(InputContextData *data) { @@ -93,7 +205,7 @@ ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); for (i = 0; i < compstr->dwResultStrLen; i++) - ImmInternalPostIMEMessage (WM_IME_CHAR, ResultStr[i], 1); + ImmInternalPostIMEMessage (root_context, WM_IME_CHAR, ResultStr[i], 1); ImmUnlockIMCC(root_context->IMC.hCompStr); @@ -160,26 +272,27 @@ hwndDefault = 0; } IMM_Unregister(); + IMM_FreeAllImmHkl(); break; } return TRUE; } /* for posting messages as the IME */ -static void ImmInternalPostIMEMessage(UINT msg, WPARAM wParam, LPARAM lParam) +static void ImmInternalPostIMEMessage(InputContextData *data, UINT msg, WPARAM wParam, LPARAM lParam) { HWND target = GetFocus(); if (!target) - PostMessageW(root_context->IMC.hWnd,msg,wParam,lParam); + PostMessageW(data->IMC.hWnd,msg,wParam,lParam); else PostMessageW(target, msg, wParam, lParam); } -static LRESULT ImmInternalSendIMENotify(WPARAM notify, LPARAM lParam) +static LRESULT ImmInternalSendIMENotify(InputContextData *data, WPARAM notify, LPARAM lParam) { HWND target; - target = root_context->IMC.hWnd; + target = data->IMC.hWnd; if (!target) target = GetFocus(); if (target) @@ -188,23 +301,33 @@ return 0; } +static HIMCC ImmCreateBlankCompStr(void) +{ + HIMCC rc; + LPCOMPOSITIONSTRING ptr; + rc = ImmCreateIMCC(sizeof(COMPOSITIONSTRING)); + ptr = (LPCOMPOSITIONSTRING)ImmLockIMCC(rc); + memset(ptr,0,sizeof(COMPOSITIONSTRING)); + ptr->dwSize = sizeof(COMPOSITIONSTRING); + ImmUnlockIMCC(rc); + return rc; +} + static void ImmInternalSetOpenStatus(BOOL fOpen) { TRACE("Setting internal state to %s\n",(fOpen)?"OPEN":"CLOSED"); - root_context->IMC.fOpen = fOpen; - root_context->bInternalState = fOpen; - - if (fOpen == FALSE) - { + if (root_context->IMC.fOpen && fOpen == FALSE) + { ShowWindow(hwndDefault,SW_HIDE); ImmDestroyIMCC(root_context->IMC.hCompStr); - root_context->IMC.hCompStr = NULL; - } - else - ShowWindow(hwndDefault, SW_SHOWNOACTIVATE); - - ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); + 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, @@ -501,12 +624,10 @@ */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { + HIMC old = NULL; InputContextData *data = (InputContextData*)hIMC; - WARN("(%p, %p): semi-stub\n", hWnd, hIMC); - - if (!hIMC) - return NULL; + TRACE("(%p, %p):\n", hWnd, hIMC); /* * WINE SPECIFIC! MAY CONFLICT @@ -520,8 +641,29 @@ /* * If already associated just return */ - if (data->IMC.hWnd == hWnd) + if (hIMC && data->IMC.hWnd == hWnd) return hIMC; + + if (hWnd) + { + old = (HIMC)RemovePropW(hWnd,szwWineIMCProperty); + + if (old == NULL) + old = (HIMC)root_context; + else if (old == (HIMC)-1) + old = NULL; + + 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 (!hIMC) + return old; if (IsWindow(data->IMC.hWnd)) { @@ -541,11 +683,7 @@ SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); } - /* - * TODO: We need to keep track of the old context associated - * with a window and return it for now we will return NULL; - */ - return NULL; + return old; } /*********************************************************************** @@ -593,6 +731,34 @@ 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"); + + /* hCompStr is never NULL */ + new_context->IMC.hCompStr = ImmCreateBlankCompStr(); + new_context->IMC.hMsgBuf = ImmCreateIMCC(1); + + /* Initialize the IME Private */ + new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); + + if (new_context->immKbd->hIME && + !new_context->immKbd->pImeSelect(new_context, TRUE)) + { + TRACE("Selection of IME failed\n"); + ImmDestroyContext(new_context); + return 0; + } + + new_context->immKbd->uSelected++; + TRACE("Created context 0x%x\n",(UINT)new_context); + return (HIMC)new_context; } @@ -607,11 +773,15 @@ if (hIMC) { - ImmDestroyIMCC(root_context->IMC.hCompStr); - ImmDestroyIMCC(root_context->IMC.hCandInfo); - ImmDestroyIMCC(root_context->IMC.hGuideLine); - ImmDestroyIMCC(root_context->IMC.hPrivate); - ImmDestroyIMCC(root_context->IMC.hMsgBuf); + data->immKbd->uSelected --; + if (data->immKbd->hIME) + data->immKbd->pImeSelect(hIMC, FALSE); + + ImmDestroyIMCC(data->IMC.hCompStr); + ImmDestroyIMCC(data->IMC.hCandInfo); + ImmDestroyIMCC(data->IMC.hGuideLine); + ImmDestroyIMCC(data->IMC.hPrivate); + ImmDestroyIMCC(data->IMC.hMsgBuf); if (data->textfont) { @@ -763,9 +933,19 @@ */ BOOL WINAPI ImmGetCompositionFontA(HIMC hIMC, LPLOGFONTA lplf) { - FIXME("(%p, %p): stub\n", hIMC, lplf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LOGFONTW lfW; + BOOL rc; + + TRACE("(%p, %p):\n", hIMC, lplf); + + rc = ImmGetCompositionFontW(hIMC,&lfW); + if (rc) + { + memcpy(lplf,&lfW,sizeof(LOGFONTA)); + WideCharToMultiByte(CP_ACP, 0, lfW.lfFaceName, -1, lplf->lfFaceName, + LF_FACESIZE, NULL, NULL); + } + return rc; } /*********************************************************************** @@ -773,9 +953,16 @@ */ BOOL WINAPI ImmGetCompositionFontW(HIMC hIMC, LPLOGFONTW lplf) { - FIXME("(%p, %p): stub\n", hIMC, lplf); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + InputContextData *data = (InputContextData*)hIMC; + + TRACE("(%p, %p):\n", hIMC, lplf); + + if (!data) + return FALSE; + + *lplf = data->IMC.lfFont.W; + + return TRUE; } /*********************************************************************** @@ -995,7 +1182,7 @@ if (!data) return FALSE; - memcpy(lpCompForm,&(data->IMC.cfCompForm),sizeof(COMPOSITIONFORM)); + *lpCompForm = data->IMC.cfCompForm; return 1; } @@ -1005,13 +1192,24 @@ */ HIMC WINAPI ImmGetContext(HWND hWnd) { + HIMC rc = NULL; + TRACE("%p\n", hWnd); - if (!root_context) - return NULL; - - root_context->IMC.hWnd = hWnd; - return (HIMC)root_context; + rc = (HIMC)GetPropW(hWnd,szwWineIMCProperty); + if (rc == (HIMC)-1) + rc = NULL; + else if (rc == NULL) + rc = (HIMC)root_context; + + if (rc) + { + InputContextData *data = (InputContextData*)rc; + data->IMC.hWnd = hWnd; + } + TRACE("returning %p\n", rc); + + return rc; } /*********************************************************************** @@ -1158,23 +1356,83 @@ /*********************************************************************** * ImmGetIMEFileNameA (IMM32.@) */ -UINT WINAPI ImmGetIMEFileNameA( - HKL hKL, LPSTR lpszFileName, UINT uBufLen) -{ - FIXME("(%p, %p, %d): stub\n", hKL, lpszFileName, uBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) +{ + LPWSTR bufW = NULL; + UINT wBufLen = uBufLen; + UINT rc; + + if (uBufLen && lpszFileName) + bufW = HeapAlloc(GetProcessHeap(),0,uBufLen * sizeof(WCHAR)); + else /* We need this to get the number of byte required */ + { + bufW = HeapAlloc(GetProcessHeap(),0,MAX_PATH * sizeof(WCHAR)); + wBufLen = MAX_PATH; + } + + rc = ImmGetIMEFileNameW(hKL,bufW,wBufLen); + + if (rc > 0) + { + if (uBufLen && lpszFileName) + rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, lpszFileName, + uBufLen, NULL, NULL); + else /* get the length */ + rc = WideCharToMultiByte(CP_ACP, 0, bufW, -1, NULL, 0, NULL, + NULL); + } + + HeapFree(GetProcessHeap(),0,bufW); + return rc; } /*********************************************************************** * ImmGetIMEFileNameW (IMM32.@) */ -UINT WINAPI ImmGetIMEFileNameW( - HKL hKL, LPWSTR lpszFileName, UINT uBufLen) -{ - FIXME("(%p, %p, %d): stub\n", hKL, lpszFileName, uBufLen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) +{ + static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; + static const WCHAR fmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','x',0}; + + HKEY hkey; + DWORD length; + DWORD rc; + WCHAR regKey[sizeof(fmt)/sizeof(WCHAR)+8]; + + wsprintfW( regKey, fmt, (unsigned)hKL ); + rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + return 0; + } + + length = 0; + rc = RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, NULL, &length); + + if (rc != ERROR_SUCCESS) + { + RegCloseKey(hkey); + SetLastError(rc); + return 0; + } + if (length > uBufLen * sizeof(WCHAR) || !lpszFileName) + { + RegCloseKey(hkey); + if (lpszFileName) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return 0; + } + else + return length / sizeof(WCHAR); + } + + RegGetValueW(hkey, NULL, szImeFileW, RRF_RT_REG_SZ, NULL, lpszFileName, &length); + + RegCloseKey(hkey); + + return length / sizeof(WCHAR); } /*********************************************************************** @@ -1407,17 +1665,20 @@ TRACE("%s - %s\n","NI_COMPOSITIONSTR","CPS_CANCEL"); { BOOL send; + LPCOMPOSITIONSTRING lpCompStr; if (pX11DRV_ForceXIMReset) pX11DRV_ForceXIMReset(root_context->IMC.hWnd); - send = (root_context->IMC.hCompStr!=NULL); + lpCompStr = ImmLockIMCC(root_context->IMC.hCompStr); + send = (lpCompStr->dwCompStrLen != 0); + ImmUnlockIMCC(root_context->IMC.hCompStr); ImmDestroyIMCC(root_context->IMC.hCompStr); - root_context->IMC.hCompStr = NULL; + root_context->IMC.hCompStr = ImmCreateBlankCompStr(); if (send) - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, 0, GCS_COMPSTR); rc = TRUE; } @@ -1458,15 +1719,15 @@ root_context->bRead = FALSE; - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, 0, + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, 0, GCS_COMPSTR); - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, param, GCS_RESULTSTR|GCS_RESULTCLAUSE); } - ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION, 0, 0); + ImmInternalPostIMEMessage(root_context, WM_IME_ENDCOMPOSITION, 0, 0); root_context->bInComposition = FALSE; } break; @@ -1569,7 +1830,7 @@ MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->IMC.lfFont.W.lfFaceName, LF_FACESIZE); - ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); + ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1592,8 +1853,8 @@ if (!data) return FALSE; - memcpy(&data->IMC.lfFont.W,lplf,sizeof(LOGFONTW)); - ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); + data->IMC.lfFont.W = *lplf; + ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1682,7 +1943,7 @@ HIMCC newCompStr; if (!root_context->bInComposition) { - ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION, 0, 0); + ImmInternalPostIMEMessage(root_context, WM_IME_STARTCOMPOSITION, 0, 0); root_context->bInComposition = TRUE; } @@ -1707,7 +1968,7 @@ UpdateDataInDefaultIMEWindow(hwndDefault,FALSE); - ImmInternalPostIMEMessage(WM_IME_COMPOSITION, wParam, flags); + ImmInternalPostIMEMessage(root_context, WM_IME_COMPOSITION, wParam, flags); return TRUE; } @@ -1729,7 +1990,7 @@ if (!data) return FALSE; - memcpy(&data->IMC.cfCompForm,lpCompForm,sizeof(COMPOSITIONFORM)); + data->IMC.cfCompForm = *lpCompForm; if (IsWindowVisible(hwndDefault)) { @@ -1742,7 +2003,7 @@ if (reshow) ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); - ImmInternalSendIMENotify(IMN_SETCOMPOSITIONWINDOW, 0); + ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; } @@ -1776,7 +2037,7 @@ if (hIMC == (HIMC)FROM_IME) { ImmInternalSetOpenStatus(fOpen); - ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); + ImmInternalSendIMENotify(root_context, IMN_SETOPENSTATUS, 0); return TRUE; } @@ -1789,17 +2050,17 @@ pX11DRV_ForceXIMReset(data->IMC.hWnd); if (fOpen == FALSE) - ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_ENDCOMPOSITION,0,0); else - ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_STARTCOMPOSITION,0,0); ImmInternalSetOpenStatus(fOpen); ImmInternalSetOpenStatus(!fOpen); if (data->IMC.fOpen == FALSE) - ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_ENDCOMPOSITION,0,0); else - ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION,0,0); + ImmInternalPostIMEMessage(data, WM_IME_STARTCOMPOSITION,0,0); return FALSE; } @@ -1993,6 +2254,31 @@ internal = (IMCCInternal*) imcc; return internal->dwSize; +} + +/*********************************************************************** +* ImmGenerateMessage(IMM32.@) +*/ +BOOL WINAPI ImmGenerateMessage(HIMC hIMC) +{ + InputContextData *data = (InputContextData*)hIMC; + + TRACE("%i messages queued\n",data->IMC.dwNumMsgBuf); + if (data->IMC.dwNumMsgBuf > 0) + { + LPTRANSMSG lpTransMsg; + INT i; + + lpTransMsg = (LPTRANSMSG)ImmLockIMCC(data->IMC.hMsgBuf); + for (i = 0; i < data->IMC.dwNumMsgBuf; i++) + ImmInternalPostIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam); + + ImmUnlockIMCC(data->IMC.hMsgBuf); + + data->IMC.dwNumMsgBuf = 0; + } + + return TRUE; } /***** @@ -2052,7 +2338,6 @@ rect.top = cpt.y; rect.right = rect.left + pt.x; rect.bottom = rect.top + pt.y; - offX=offY=10; monitor = MonitorFromPoint(cpt, MONITOR_DEFAULTTOPRIMARY); } else /* CFS_DEFAULT */ Modified: trunk/reactos/dll/win32/imm32/imm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.rbui… ============================================================================== --- trunk/reactos/dll/win32/imm32/imm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imm32/imm32.rbuild [iso-8859-1] Fri Apr 4 08:20:27 2008 @@ -8,13 +8,14 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>imm.c</file> + <file>version.rc</file> + <file>imm32.spec</file> <library>wine</library> <library>user32</library> <library>gdi32</library> + <library>advapi32</library> <library>kernel32</library> <library>ntdll</library> - <file>imm.c</file> - <file>version.rc</file> - <file>imm32.spec</file> </module> </group> 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] Fri Apr 4 08:20:27 2008 @@ -17,7 +17,7 @@ @ stdcall ImmEscapeA(long long long ptr) @ stdcall ImmEscapeW(long long long ptr) @ stub ImmFreeLayout -@ stub ImmGenerateMessage +@ stdcall ImmGenerateMessage(ptr) @ stdcall ImmGetCandidateListA(long long ptr long) @ stdcall ImmGetCandidateListCountA(long ptr) @ stdcall ImmGetCandidateListCountW(long ptr)

16 years, 8 months

[winesync] 32843: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 4 08:13:15 2008 New Revision: 32843 URL: http://svn.reactos.org/svn/reactos?rev=32843&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/hlink/extserv.c trunk/reactos/dll/win32/hlink/hlink.rbuild trunk/reactos/dll/win32/hlink/hlink.spec trunk/reactos/dll/win32/hlink/hlink_main.c trunk/reactos/dll/win32/hlink/link.c Modified: trunk/reactos/dll/win32/hlink/extserv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?… ============================================================================== --- trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/extserv.c [iso-8859-1] Fri Apr 4 08:13:15 2008 @@ -63,7 +63,7 @@ } if(*ppv) { - IUnknown_AddRef(EXTSERVUNK(This)); + IUnknown_AddRef((IUnknown*)*ppv); return S_OK; } @@ -209,6 +209,9 @@ HttpNegotiate_OnResponse }; +/*********************************************************************** + * HlinkCreateExtensionServices (HLINK.@) + */ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, HWND phwnd, LPCWSTR pszUsername, LPCWSTR pszPassword, IUnknown *punkOuter, REFIID riid, void** ppv) Modified: trunk/reactos/dll/win32/hlink/hlink.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.rbui… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink.rbuild [iso-8859-1] Fri Apr 4 08:13:15 2008 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> <module name="hlink" type="win32dll" baseaddress="${BASEADDRESS_HLINK}" installbase="system32" installname="hlink.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="hlink.spec.def" /> @@ -8,6 +9,11 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <file>browse_ctx.c</file> + <file>extserv.c</file> + <file>hlink_main.c</file> + <file>link.c</file> + <file>hlink.spec</file> <library>wine</library> <library>shell32</library> <library>ole32</library> @@ -16,9 +22,5 @@ <library>urlmon</library> <library>uuid</library> <library>ntdll</library> - <file>browse_ctx.c</file> - <file>extserv.c</file> - <file>hlink_main.c</file> - <file>link.c</file> - <file>hlink.spec</file> </module> +</group> Modified: trunk/reactos/dll/win32/hlink/hlink.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.spec… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink.spec [iso-8859-1] Fri Apr 4 08:13:15 2008 @@ -8,10 +8,10 @@ 10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) 11 stdcall HlinkUpdateStackItem(ptr ptr long ptr wstr wstr) 12 stub HlinkOnRenameDocument -14 stub HlinkResolveMonikerForData +14 stdcall HlinkResolveMonikerForData(ptr long ptr long ptr ptr ptr) 15 stub HlinkResolveStringForData 16 stub OleSaveToStreamEx -18 stub HlinkParseDisplayName +18 stdcall HlinkParseDisplayName(ptr wstr long ptr ptr) 20 stdcall HlinkQueryCreateFromData(ptr) 21 stub HlinkSetSpecialReference 22 stdcall HlinkGetSpecialReference(long ptr) Modified: trunk/reactos/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/hlink_main.c [iso-8859-1] Fri Apr 4 08:13:15 2008 @@ -41,8 +41,6 @@ switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; @@ -52,12 +50,18 @@ return TRUE; } +/*********************************************************************** + * DllCanUnloadNow (HLINK.@) + */ HRESULT WINAPI DllCanUnloadNow( void ) { FIXME("\n"); return S_OK; } +/*********************************************************************** + * HlinkCreateFromMoniker (HLINK.@) + */ HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, IHlinkSite* pihlsite, DWORD dwSiteData, IUnknown* piunkOuter, REFIID riid, void** ppvObj) @@ -89,6 +93,9 @@ return r; } +/*********************************************************************** + * HlinkCreateFromString (HLINK.@) + */ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, IHlinkSite* pihlsite, DWORD dwSiteData, IUnknown* piunkOuter, REFIID riid, void** ppvObj) @@ -151,6 +158,9 @@ } +/*********************************************************************** + * HlinkNavigate (HLINK.@) + */ HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) { HRESULT r = S_OK; @@ -164,6 +174,9 @@ return r; } +/*********************************************************************** + * HlinkNavigate (HLINK.@) + */ HRESULT WINAPI HlinkNavigate(IHlink *phl, IHlinkFrame *phlFrame, DWORD grfHLNF, LPBC pbc, IBindStatusCallback *pbsc, IHlinkBrowseContext *phlbc) @@ -180,6 +193,9 @@ return r; } +/*********************************************************************** + * HlinkOnNavigate (HLINK.@) + */ HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, IHlinkBrowseContext* phlbc, DWORD grfHLNF, IMoniker *pmkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG* puHLID) @@ -199,6 +215,9 @@ return r; } +/*********************************************************************** + * HlinkCreateFromData (HLINK.@) + */ HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, REFIID riid, void **ppvObj) @@ -209,12 +228,18 @@ return E_NOTIMPL; } +/*********************************************************************** + * HlinkQueryCreateFromData (HLINK.@) + */ HRESULT WINAPI HlinkQueryCreateFromData(IDataObject* piDataObj) { FIXME("%p\n", piDataObj); return E_NOTIMPL; } +/*********************************************************************** + * HlinkNavigateToStringReference (HLINK.@) + */ HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, LPCWSTR pwzLocation, IHlinkSite *pihlsite, DWORD dwSiteData, IHlinkFrame *pihlframe, DWORD grfHLNF, LPBC pibc, @@ -235,6 +260,9 @@ return r; } +/*********************************************************************** + * HlinkIsShortcut (HLINK.@) + */ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) { int len; @@ -253,6 +281,9 @@ return strcmpiW(pwzFileName+len, url_ext) ? S_FALSE : S_OK; } +/*********************************************************************** + * HlinkGetSpecialReference (HLINK.@) + */ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) { DWORD res, type, size = 100; @@ -308,18 +339,89 @@ return S_OK; } +/*********************************************************************** + * HlinkTranslateURL (HLINK.@) + */ HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL) { FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL); return E_NOTIMPL; } +/*********************************************************************** + * HlinkUpdateStackItem (HLINK.@) + */ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext *pihlbc, ULONG uHLID, IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) { FIXME("(%p %p %u %p %s %s)\n", pihlframe, pihlbc, uHLID, pimkTrgt, debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); return E_NOTIMPL; +} + +/*********************************************************************** + * HlinkParseDisplayName (HLINK.@) + */ +HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNoForceAbs, + ULONG *pcchEaten, IMoniker **ppimk) +{ + HRESULT hres; + + TRACE("(%p %s %x %p %p)\n", pibc, debugstr_w(pwzDisplayName), fNoForceAbs, pcchEaten, ppimk); + + if(fNoForceAbs) + FIXME("Unsupported fNoForceAbs\n"); + + hres = MkParseDisplayNameEx(pibc, pwzDisplayName, pcchEaten, ppimk); + if(SUCCEEDED(hres)) + return hres; + + hres = MkParseDisplayName(pibc, pwzDisplayName, pcchEaten, ppimk); + if(SUCCEEDED(hres)) + return hres; + + hres = CreateFileMoniker(pwzDisplayName, ppimk); + if(SUCCEEDED(hres)) + *pcchEaten = strlenW(pwzDisplayName); + + return hres; +} + +/*********************************************************************** + * HlinkResolveMonikerForData (HLINK.@) + */ +HRESULT WINAPI HlinkResolveMonikerForData(LPMONIKER pimkReference, DWORD reserved, LPBC pibc, + ULONG cFmtetc, FORMATETC *rgFmtetc, IBindStatusCallback *pibsc, LPMONIKER pimkBase) +{ + LPOLESTR name = NULL; + IBindCtx *bctx; + DWORD mksys = 0; + void *obj = NULL; + HRESULT hres; + + TRACE("(%p %x %p %d %p %p %p)\n", pimkReference, reserved, pibc, cFmtetc, rgFmtetc, pibsc, pimkBase); + + if(cFmtetc || rgFmtetc || pimkBase) + FIXME("Unsupported args\n"); + + hres = RegisterBindStatusCallback(pibc, pibsc, NULL /* FIXME */, 0); + if(FAILED(hres)) + return hres; + + hres = IMoniker_IsSystemMoniker(pimkReference, &mksys); + if(SUCCEEDED(hres) && mksys != MKSYS_URLMONIKER) + WARN("sysmk = %x\n", mksys); + + /* FIXME: What is it for? */ + CreateBindCtx(0, &bctx); + hres = IMoniker_GetDisplayName(pimkReference, bctx, NULL, &name); + IBindCtx_Release(bctx); + if(SUCCEEDED(hres)) { + TRACE("got display name %s\n", debugstr_w(name)); + CoTaskMemFree(name); + } + + return IMoniker_BindToStorage(pimkReference, pibc, NULL, &IID_IUnknown, &obj); } static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, @@ -435,6 +537,9 @@ return S_OK; } +/*********************************************************************** + * DllRegisterServer (HLINK.@) + */ HRESULT WINAPI DllRegisterServer(void) { HRESULT r; Modified: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hlink/link.c [iso-8859-1] Fri Apr 4 08:13:15 2008 @@ -602,7 +602,7 @@ { HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); TRACE("(%p)\n", This); - memcpy(pClassID, &CLSID_StdHlink, sizeof(CLSID)); + *pClassID = CLSID_StdHlink; return S_OK; }

16 years, 8 months

[hpoussin] 32842: Update header

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Apr 4 08:10:46 2008 New Revision: 32842 URL: http://svn.reactos.org/svn/reactos?rev=32842&view=rev Log: Update header Modified: trunk/reactos/include/ddk/imm.h Modified: trunk/reactos/include/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/imm.h?rev=3284… ============================================================================== --- trunk/reactos/include/ddk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/imm.h [iso-8859-1] Fri Apr 4 08:10:46 2008 @@ -1,4 +1,23 @@ -#ifndef __IMM_H +/* + * Copyright (C) 2007 CodeWeavers, Aric Stewart + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _DDKIMM_H_ +#define _DDKIMM_H_ #define __IMM_H #if __GNUC__ >=3 @@ -9,8 +28,41 @@ extern "C" { #endif -typedef struct _COMPOSITIONSTRING -{ +typedef struct _tagINPUTCONTEXT { + HWND hWnd; + BOOL fOpen; + HWND hwndImeInUse; + POINT ptStatusWndPos; + POINT ptSoftKbdPos; + DWORD fdwConversion; + DWORD fdwSentence; + union { + LOGFONTA A; + LOGFONTW W; + } lfFont; + COMPOSITIONFORM cfCompForm; + CANDIDATEFORM cfCandForm[4]; + HIMCC hCompStr; + HIMCC hCandInfo; + HIMCC hGuideLine; + HIMCC hPrivate; + DWORD dwNumMsgBuf; + HIMCC hMsgBuf; + DWORD fdwInit; + DWORD dwReserve[3]; +} INPUTCONTEXT, *PINPUTCONTEXT, *LPINPUTCONTEXT; + +typedef struct _tagIMEINFO { + DWORD dwPrivateDataSize; + DWORD fdwProperty; + DWORD fdwConversionCaps; + DWORD fdwSentenceCaps; + DWORD fdwUICaps; + DWORD fdwSCSCaps; + DWORD fdwSelectCaps; +} IMEINFO, *LPIMEINFO; + +typedef struct tagCOMPOSITIONSTRING { DWORD dwSize; DWORD dwCompReadAttrLen; DWORD dwCompReadAttrOffset; @@ -38,39 +90,65 @@ DWORD dwPrivateOffset; } COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; -typedef struct _INPUTCONTEXT -{ - HWND hWnd; - BOOL fOpen; - HWND hwndImeInUse; - POINT ptStatusWndPos; - POINT ptSoftKbdPos; - DWORD fdwConversion; - DWORD fdwSentence; - union - { - LOGFONTA A; - LOGFONTW W; - } lfFont; - COMPOSITIONFORM cfCompForm; - CANDIDATEFORM cfCandForm[4]; - HIMCC hCompStr; - HIMCC hCandInfo; - HIMCC hGuideLine; - HIMCC hPrivate; - DWORD dwNumMsgBuf; - HIMCC hMsgBuf; - DWORD fdwInit; - DWORD dwReserve[3] -} INPUTCONTEXT, *PINPUTCONTEXT, *LPINPUTCONTEXT; +LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); +BOOL WINAPI ImmUnlockIMC(HIMC); +DWORD WINAPI ImmGetIMCLockCount(HIMC); +HIMCC WINAPI ImmCreateIMCC(DWORD); +HIMCC WINAPI ImmDestroyIMCC(HIMCC); +LPVOID WINAPI ImmLockIMCC(HIMCC); +BOOL WINAPI ImmUnlockIMCC(HIMCC); +DWORD WINAPI ImmGetIMCCLockCount(HIMCC); +HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD); +DWORD WINAPI ImmGetIMCCSize(HIMCC); -HIMCC WINAPI ImmCreateIMCC(DWORD dwSize); -HIMCC WINAPI ImmDestroyIMCC(HIMCC hIMCC); -LPVOID WINAPI ImmLockIMCC(HIMCC hIMCC); -BOOL WINAPI ImmUnlockIMCC(HIMCC hIMCC); +#define IMMGWL_IMC 0 +#define IMMGWL_PRIVATE (sizeof(LONG)) + +/* IME Property bits */ +#define IME_PROP_END_UNLOAD 0x0001 +#define IME_PROP_KBD_CHAR_FIRST 0x0002 +#define IME_PROP_IGNORE_UPKEYS 0x0004 +#define IME_PROP_NEED_ALTKEY 0x0008 +#define IME_PROP_NO_KEYS_ON_CLOSE 0x0010 + +/* for NI_CONTEXTUPDATED */ +#define IMC_SETCONVERSIONMODE 0x0002 +#define IMC_SETSENTENCEMODE 0x0004 +#define IMC_SETOPENSTATUS 0x0006 + +/* dwAction for ImmNotifyIME */ +#define NI_CONTEXTUPDATED 0x0003 +#define NI_OPENCANDIDATE 0x0010 +#define NI_CLOSECANDIDATE 0x0011 +#define NI_SELECTCANDIDATESTR 0x0012 +#define NI_CHANGECANDIDATELIST 0x0013 +#define NI_FINALIZECONVERSIONRESULT 0x0014 +#define NI_COMPOSITIONSTR 0x0015 +#define NI_SETCANDIDATE_PAGESTART 0x0016 +#define NI_SETCANDIDATE_PAGESIZE 0x0017 +#define NI_IMEMENUSELECTED 0x0018 + +BOOL WINAPI ImmGenerateMessage(HIMC); + +BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); +BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); +DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); +BOOL WINAPI ImeDestroy(UINT); +LRESULT WINAPI ImeEscape(HIMC, UINT, LPVOID); +BOOL WINAPI ImeProcessKey(HIMC, UINT, LPARAM, CONST LPBYTE); +BOOL WINAPI ImeSelect(HIMC, BOOL); +BOOL WINAPI ImeSetActiveContext(HIMC, BOOL); +UINT WINAPI ImeToAsciiEx(UINT, UINT, CONST LPBYTE, LPDWORD, UINT, HIMC); +BOOL WINAPI NotifyIME(HIMC, DWORD, DWORD, DWORD); +BOOL WINAPI ImeRegisterWord(LPCWSTR, DWORD, LPCWSTR); +BOOL WINAPI ImeUnregisterWord(LPCWSTR, DWORD, LPCWSTR); +UINT WINAPI ImeGetRegisterWordStyle(UINT, LPSTYLEBUFW); +UINT WINAPI ImeEnumRegisterWord(REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); +BOOL WINAPI ImeSetCompositionString(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD); +DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD); #ifdef __cplusplus -} +} /* extern "C" */ #endif -#endif /* __IMM_H */ +#endif /* _DDKIMM_H_ */

16 years, 8 months

[hpoussin] 32841: Try to fix build

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Apr 4 07:30:11 2008 New Revision: 32841 URL: http://svn.reactos.org/svn/reactos?rev=32841&view=rev Log: Try to fix build Added: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff (with props) Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild [iso-8859-1] Fri Apr 4 07:30:11 2008 @@ -6,9 +6,11 @@ <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS" root="intermediate">include/reactos</include> <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> + <dependency>wineheaders</dependency> <file>chm.c</file> <file>content.c</file> <file>help.c</file> Added: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff [iso-8859-1] Fri Apr 4 07:30:11 2008 @@ -1,0 +1,16 @@ +Index: hhctrl.ocx.rbuild +=================================================================== +--- hhctrl.ocx.rbuild (revision 32840) ++++ hhctrl.ocx.rbuild (working copy) +@@ -6,9 +6,11 @@ + <importlibrary definition="hhctrl.ocx.spec.def" /> + <include base="hhctrl">.</include> + <include base="ReactOS">include/reactos/wine</include> ++ <include base="ReactOS" root="intermediate">include/reactos</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> ++ <dependency>wineheaders</dependency> + <file>chm.c</file> + <file>content.c</file> + <file>help.c</file> Propchange: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 8 months

[winesync] 32840: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 4 07:21:42 2008 New Revision: 32840 URL: http://svn.reactos.org/svn/reactos?rev=32840&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/hhctrl.ocx/El.rc (with props) trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc (with props) Removed: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c trunk/reactos/dll/win32/hhctrl.ocx/help.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc Added: trunk/reactos/dll/win32/hhctrl.ocx/El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/El.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/El.rc (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/El.rc [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -1,0 +1,58 @@ +/* + * HTML Help resources + * Greek Language Support + * + * Copyright 2008 Apostolos Alexiadis + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Ðåñéå÷üìåíá" + IDS_INDEX "I&ndex" + IDS_SEARCH "&ÁíáæÞôçóç" + IDS_FAVORITES "Á&ãáðçìÝíá" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "ÅìöÜíéóç" + IDTB_CONTRACT "Áðüêñõøç" + IDTB_STOP "Ôåñìáôéóìüò" + IDTB_REFRESH "ÁíáíÝùóç" + IDTB_BACK "Ðßóù" + IDTB_HOME "Home" + IDTB_SYNC "Sync" + IDTB_PRINT "Åêôýðùóç" + IDTB_OPTIONS "ÅðéëïãÝò" + IDTB_FORWARD "Forward" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Jump1" + IDTB_JUMP2 "Jump2" + IDTB_CUSTOMIZE "Customize" + IDTB_ZOOM "Zoom" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END Propchange: trunk/reactos/dll/win32/hhctrl.ocx/El.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc (added) +++ trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -1,0 +1,58 @@ +/* + * HTML Help resources + * Russia Language Support + * + * Copyright 2008 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Ñîäåðæàíèå" + IDS_INDEX "&Îãëàâëåíèå" + IDS_SEARCH "&Ïîèñê" + IDS_FAVORITES "&Èçáðàííîå" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Ïîêàçàòü" + IDTB_CONTRACT "Ñïðÿòàòü" + IDTB_STOP "Îñòàíîâèòü" + IDTB_REFRESH "Îáíîâèòü" + IDTB_BACK "Íàçàä" + IDTB_HOME "Â íà÷àëî" + IDTB_SYNC "Ñèíõðîíèçèðîâàòü" + IDTB_PRINT "Ïå÷ÿòü" + IDTB_OPTIONS "Íàñòðîéêè" + IDTB_FORWARD "Â ïåð¸ä" + IDTB_NOTES "Çàïèñêè" + IDTB_BROWSE_FWD "Ïðîñìîòð â ïåð¸ä" + IDTB_BROWSE_BACK "Ïðîñìîòð íàçàä" + IDTB_CONTENTS "Ñîäåðæàíèå" + IDTB_INDEX "Îãëàâëåíèå" + IDTB_SEARCH "Ïîèñê" + IDTB_HISTORY "Èñòîðèÿ" + IDTB_FAVORITES "Èçáðàííîå" + IDTB_JUMP1 "Ïåðåõîä 1" + IDTB_JUMP2 "Ïåðåõîä 2" + IDTB_CUSTOMIZE "Ïåðñîíàëèçîâàòü" + IDTB_ZOOM "Ìàñøòàá" + IDTB_TOC_NEXT "Ñëåäóþùàÿ ãëàâà" + IDTB_TOC_PREV "Ïðåäûäóùàÿ ãëàâà" +END Propchange: trunk/reactos/dll/win32/hhctrl.ocx/Ru.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/chm.c… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/chm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/chm.c [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -113,11 +113,20 @@ break; switch(entry.code) { + case 0x0: + TRACE("TOC is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->defToc); + chm->defToc = strdupnAtoW(buf, entry.len); + break; case 0x2: TRACE("Default topic is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->defTopic); + chm->defTopic = strdupnAtoW(buf, entry.len); break; case 0x3: TRACE("Title is %s\n", debugstr_an(buf, entry.len)); + heap_free(chm->defTitle); + chm->defTitle = strdupnAtoW(buf, entry.len); break; case 0x5: TRACE("Default window is %s\n", debugstr_an(buf, entry.len)); @@ -212,7 +221,26 @@ hr = IStorage_OpenStream(pStorage, windowsW, NULL, STGM_READ, 0, &pStream); if (FAILED(hr)) - return FALSE; + { + /* no defined window types so use (hopefully) sane defaults */ + static const WCHAR defaultwinW[] = {'d','e','f','a','u','l','t','w','i','n','\0'}; + static const WCHAR null[] = {0}; + memset((void*)&(info->WinType), 0, sizeof(info->WinType)); + info->WinType.cbStruct=sizeof(info->WinType); + info->WinType.fUniCodeStrings=TRUE; + info->WinType.pszType=strdupW(defaultwinW); + info->WinType.pszToc = strdupW(info->pCHMInfo->defToc); + info->WinType.pszIndex = strdupW(null); + info->WinType.fsValidMembers=0; + info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; + info->WinType.pszCaption=strdupW(info->pCHMInfo->defTitle); + info->WinType.dwStyles=WS_POPUP; + info->WinType.dwExStyles=0; + info->WinType.nShowState=SW_SHOW; + info->WinType.pszFile=strdupW(info->pCHMInfo->defTopic); + info->WinType.curNavType=HHWIN_NAVTYPE_TOC; + return TRUE; + } /* jump past the #WINDOWS header */ liOffset.QuadPart = sizeof(DWORD) * 2; @@ -304,7 +332,7 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) { IStorage *storage; - IStream *stream; + IStream *stream = NULL; HRESULT hres; TRACE("%s (%s :: %s)\n", debugstr_w(parent_chm), debugstr_w(chm_file->chm_file), @@ -342,7 +370,7 @@ CHMInfo *ret = heap_alloc_zero(sizeof(CHMInfo)); - res = GetFullPathNameW(szFile, sizeof(file), file, NULL); + res = GetFullPathNameW(szFile, sizeof(file)/sizeof(file[0]), file, NULL); ret->szFile = strdupW(file); hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, @@ -393,6 +421,9 @@ } heap_free(chm->strings); + heap_free(chm->defTitle); + heap_free(chm->defTopic); + heap_free(chm->defToc); heap_free(chm); return NULL; Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/help.c [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -51,13 +51,14 @@ static LPWSTR HH_LoadString(DWORD dwID) { LPWSTR string = NULL; + LPCWSTR stringresource; int iSize; - iSize = LoadStringW(hhctrl_hinstance, dwID, NULL, 0); - iSize += 2; /* some strings (tab text) needs double-null termination */ - - string = heap_alloc(iSize * sizeof(WCHAR)); - LoadStringW(hhctrl_hinstance, dwID, string, iSize); + iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); + + string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ + memcpy(string, stringresource, iSize*sizeof(WCHAR)); + string[iSize] = 0; return string; } @@ -115,7 +116,7 @@ if (!info->web_browser) return FALSE; - if(!GetFullPathNameW(file, sizeof(full_path), full_path, NULL)) { + if(!GetFullPathNameW(file, sizeof(full_path)/sizeof(full_path[0]), full_path, NULL)) { WARN("GetFullPathName failed: %u\n", GetLastError()); return FALSE; } Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -114,6 +114,7 @@ memcpy(chm_file, filename, (index-filename)*sizeof(WCHAR)); chm_file[index-filename] = 0; filename = chm_file; + index += 2; /* advance beyond "::" for calling NavigateToChm() later */ } else { Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -74,6 +74,10 @@ IStream *strings_stream; char **strings; DWORD strings_size; + + WCHAR *defTopic; + WCHAR *defTitle; + WCHAR *defToc; } CHMInfo; #define TAB_CONTENTS 0 @@ -177,7 +181,7 @@ return ret; } -static inline LPWSTR strdupAtoW(LPCSTR str) +static inline LPWSTR strdupnAtoW(LPCSTR str, LONG lenA) { LPWSTR ret; DWORD len; @@ -185,12 +189,27 @@ if(!str) return NULL; - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + if (lenA > 0) + { + /* find length of string */ + LPCSTR eos = memchr(str, 0, lenA); + if (eos) lenA = eos - str; + } + + len = MultiByteToWideChar(CP_ACP, 0, str, lenA, NULL, 0)+1; /* +1 for null pad */ ret = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + MultiByteToWideChar(CP_ACP, 0, str, lenA, ret, len); + ret[len-1] = 0; return ret; } + +static inline LPWSTR strdupAtoW(LPCSTR str) +{ + return strdupnAtoW(str, -1); +} + + extern HINSTANCE hhctrl_hinstance; extern BOOL hh_process; Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -6,11 +6,17 @@ <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> - <include base="ReactOS" root="intermediate">include/reactos</include> <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <dependency>wineheaders</dependency> + <file>chm.c</file> + <file>content.c</file> + <file>help.c</file> + <file>hhctrl.c</file> + <file>regsvr.c</file> + <file>webbrowser.c</file> + <file>hhctrl.rc</file> + <file>hhctrl.ocx.spec</file> <library>wine</library> <library>advapi32</library> <library>comctl32</library> @@ -22,13 +28,5 @@ <library>kernel32</library> <library>uuid</library> <library>ntdll</library> - <file>chm.c</file> - <file>content.c</file> - <file>help.c</file> - <file>hhctrl.c</file> - <file>regsvr.c</file> - <file>webbrowser.c</file> - <file>hhctrl.rc</file> - <file>hhctrl.ocx.spec</file> </module> </group> Removed: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx_ros.diff (removed) @@ -1,16 +1,0 @@ -Index: hhctrl.ocx.rbuild -=================================================================== ---- hhctrl.ocx.rbuild (revision 27782) -+++ hhctrl.ocx.rbuild (working copy) -@@ -5,9 +5,11 @@ - <importlibrary definition="hhctrl.ocx.spec.def" /> - <include base="hhctrl">.</include> - <include base="ReactOS">include/reactos/wine</include> -+ <include base="ReactOS" root="intermediate">include/reactos</include> - <define name="__WINESRC__" /> - <define name="WINVER">0x600</define> - <define name="_WIN32_WINNT">0x600</define> -+ <dependency>wineheaders</dependency> - <library>wine</library> - <library>advapi32</library> - <library>comctl32</library> Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc [iso-8859-1] Fri Apr 4 07:21:42 2008 @@ -31,6 +31,7 @@ #include "Cs.rc" #include "De.rc" +#include "El.rc" #include "En.rc" #include "Fr.rc" #include "Fi.rc" @@ -39,5 +40,6 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Ru.rc" #include "Sv.rc" #include "Tr.rc"

16 years, 8 months

[winesync] 32839: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 4 07:16:03 2008 New Revision: 32839 URL: http://svn.reactos.org/svn/reactos?rev=32839&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/comdlg32/cdlg_El.rc (with props) trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc (with props) Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc trunk/reactos/dll/win32/comdlg32/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/colordlg.c trunk/reactos/dll/win32/comdlg32/colordlg16.c trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlg16.c trunk/reactos/dll/win32/comdlg32/fontdlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/dll/win32/comdlg32/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Cn… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_De… Added: trunk/reactos/dll/win32/comdlg32/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_El… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_En… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Es… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Fr… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_It… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Nl… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pl… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pt… Added: trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ro… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ru… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Si… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sv… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Th… Modified: trunk/reactos/dll/win32/comdlg32/colordlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… Modified: trunk/reactos/dll/win32/comdlg32/colordlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/colordl… Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlg16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/fontdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/fontdlg… Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc…

16 years, 8 months

[winesync] 32838: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 4 07:13:16 2008 New Revision: 32838 URL: http://svn.reactos.org/svn/reactos?rev=32838&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/comctl32/comctl_Ro.rc (with props) Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_El.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/imagelist.h trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/pager.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate… Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Added: trunk/reactos/dll/win32/comctl32/comctl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr… Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim… Modified: trunk/reactos/dll/win32/comctl32/imagelist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… Modified: trunk/reactos/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c… Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba… Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… Modified: trunk/reactos/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.…

16 years, 8 months

[winesync] 32837: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 4 07:05:56 2008 New Revision: 32837 URL: http://svn.reactos.org/svn/reactos?rev=32837&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.rbuild [iso-8859-1] Fri Apr 4 07:05:56 2008 @@ -8,13 +8,13 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>kernel32</library> - <library>ntdll</library> <file>cabinet_main.c</file> <file>fci.c</file> <file>fdi.c</file> <file>cabinet.rc</file> <file>cabinet.spec</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> </module> </group> Modified: trunk/reactos/dll/win32/cabinet/fci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fci.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fci.c [iso-8859-1] Fri Apr 4 07:05:56 2008 @@ -75,7 +75,7 @@ cab_UBYTE versionMajor; /* 1 */ cab_UWORD cFolders; /* number of CFFOLDER entries in the cabinet*/ cab_UWORD cFiles; /* number of CFFILE entries in the cabinet*/ - cab_UWORD flags; /* 1=prev cab, 2=next cabinet, 4=reserved setions*/ + cab_UWORD flags; /* 1=prev cab, 2=next cabinet, 4=reserved sections*/ cab_UWORD setID; /* identification number of all cabinets in a set*/ cab_UWORD iCabinet; /* number of the cabinet in a set */ /* additional area if "flags" were set*/ @@ -86,7 +86,7 @@ cab_UWORD cCFData; /* number of this folder's CFDATA sections */ cab_UWORD typeCompress; /* compression type of data in CFDATA section*/ /* additional area if reserve flag was set */ -} CFFOLDER; /* minumum 8 bytes */ +} CFFOLDER; /* minimum 8 bytes */ typedef struct { cab_ULONG cbFile; /* size of the uncompressed file in bytes */ @@ -379,7 +379,7 @@ /* add optional reserved area */ /* This allocation and freeing at each CFData block is a bit */ - /* inefficent, but it's harder to forget about freeing the buffer :-). */ + /* inefficient, but it's harder to forget about freeing the buffer :-). */ /* Reserved areas are used seldom besides that... */ if (cbReserveCFData!=0) { if(!(reserved = (char*)PFCI_ALLOC(hfci, cbReserveCFData))) { @@ -525,7 +525,7 @@ split_block=TRUE; /* In this case split_block is abused to store */ /* the complete data block into the next cabinet and not into the */ /* current one. Originally split_block is the indicator that a */ - /* data block has been splitted across different cabinets. */ + /* data block has been split across different cabinets. */ } else { /* read CFDATA from p_fci_internal->handleCFDATA1 to cfdata*/ @@ -615,13 +615,13 @@ strlen(p_fci_internal->pccab->szDisk)+1; savedUncomp = pcfdata->cbUncomp; - pcfdata->cbUncomp = 0; /* on splitted blocks of data this is zero */ + pcfdata->cbUncomp = 0; /* on split blocks of data this is zero */ /* if split_block==TRUE then the above while loop won't */ /* be executed again */ split_block=TRUE; /* split_block is the indicator that */ - /* a data block has been splitted across */ - /* diffentent cabinets.*/ + /* a data block has been split across */ + /* different cabinets.*/ } /* This should never happen !!! */ @@ -799,7 +799,7 @@ /* report status with pfnfcis about copied size of folder */ if( (*pfnfcis)(statusFolder, - p_fci_internal->statusFolderCopied,/*cfdata.cbData(+revious ones)*/ + p_fci_internal->statusFolderCopied,/*cfdata.cbData(+previous ones)*/ p_fci_internal->statusFolderTotal, /* total folder size */ p_fci_internal->pv) == -1) { fci_set_error( FCIERR_USER_ABORT, 0, TRUE ); @@ -1331,7 +1331,7 @@ ) ) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */ @@ -1649,7 +1649,7 @@ cfheader.cFolders=p_fci_internal->cFolders; /* number of CFFILE entries in the cabinet */ cfheader.cFiles=p_fci_internal->cFiles; - cfheader.flags=0; /* 1=prev cab, 2=next cabinet, 4=reserved setions */ + cfheader.flags=0; /* 1=prev cab, 2=next cabinet, 4=reserved sections */ if( p_fci_internal->fPrevCab ) { cfheader.flags = cfheadPREV_CABINET; @@ -1904,7 +1904,7 @@ /* add optional reserved area */ /* This allocation and freeing at each CFFolder block is a bit */ - /* inefficent, but it's harder to forget about freeing the buffer :-). */ + /* inefficient, but it's harder to forget about freeing the buffer :-). */ /* Reserved areas are used seldom besides that... */ if (cbReserveCFFolder!=0) { if(!(reserved = PFCI_ALLOC(hfci, cbReserveCFFolder))) { @@ -2244,7 +2244,7 @@ CB_MAX_CABINET_NAME + CB_MAX_DISK_NAME )) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */ @@ -2477,7 +2477,7 @@ ) ) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */ @@ -2644,7 +2644,7 @@ ) ) { /* save CCAB */ - memcpy(&(p_fci_internal->oldCCAB), p_fci_internal->pccab, sizeof(CCAB)); + p_fci_internal->oldCCAB = *p_fci_internal->pccab; /* increment cabinet index */ ++(p_fci_internal->pccab->iCab); /* get name of next cabinet */ @@ -2713,7 +2713,7 @@ * * FCIFlushFolder completes the CFFolder structure under construction. * - * All further data which is added by FCIAddFile will be associateed to + * All further data which is added by FCIAddFile will be associated to * the next CFFolder structure. * * FCIFlushFolder will be called by FCIAddFile automatically if the Modified: trunk/reactos/dll/win32/cabinet/fdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/fdi.c?re… ============================================================================== --- trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c [iso-8859-1] Fri Apr 4 07:05:56 2008 @@ -2229,7 +2229,7 @@ for (file = cab->firstfile; (file); file = file->next) { if ((file->index & cffileCONTINUED_FROM_PREV) == cffileCONTINUED_FROM_PREV) { /* check to ensure a real match */ - if (strcasecmp(fi->filename, file->filename) == 0) { + if (lstrcmpiA(fi->filename, file->filename) == 0) { success = TRUE; if (PFDI_SEEK(CAB(hfdi), cab->cabhf, cab->firstfol->offset, SEEK_SET) == -1) return DECR_INPUT;

16 years, 8 months

[hpoussin] 32836: Try to fix build

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Apr 4 07:03:43 2008 New Revision: 32836 URL: http://svn.reactos.org/svn/reactos?rev=32836&view=rev Log: Try to fix build Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=32… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Fri Apr 4 07:03:43 2008 @@ -74,8 +74,6 @@ /* other GUIDs */ -#include "vfw.h" - #if 0 /* FIXME */ #include "uuids.h" #endif

16 years, 8 months

[winesync] 32835: Autosyncing with Wine HEAD

by winesync＠svn.reactos.org

Author: winesync Date: Fri Apr 4 07:03:12 2008 New Revision: 32835 URL: http://svn.reactos.org/svn/reactos?rev=32835&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/avifil32/acmstream.c trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/avifil32/avifile.c trunk/reactos/dll/win32/avifil32/avifile_Ko.rc trunk/reactos/dll/win32/avifil32/editstream.c trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/getframe.c trunk/reactos/dll/win32/avifil32/icmstream.c trunk/reactos/dll/win32/avifil32/wavfile.c Modified: trunk/reactos/dll/win32/avifil32/acmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/acmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/acmstream.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -467,7 +467,7 @@ if (This->acmStreamHdr.pbSrc == NULL) This->acmStreamHdr.pbSrc = HeapAlloc(GetProcessHeap(), 0, size); else - This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size); + This->acmStreamHdr.pbSrc = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size); if (This->acmStreamHdr.pbSrc == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwSrcUser = size; Modified: trunk/reactos/dll/win32/avifil32/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/api.c?r… ============================================================================== --- trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/api.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -249,7 +249,7 @@ if (! AVIFILE_GetFileHandlerByExtension(szFile, &clsidHandler)) return AVIERR_UNSUPPORTED; } else - memcpy(&clsidHandler, lpHandler, sizeof(clsidHandler)); + clsidHandler = *lpHandler; /* create instance of handler */ hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIFile, (LPVOID*)ppfile); @@ -746,7 +746,7 @@ if (AVIFILE_CLSIDFromString(szValue, &clsidHandler) != S_OK) return AVIERR_UNSUPPORTED; } else - memcpy(&clsidHandler, pclsidHandler, sizeof(clsidHandler)); + clsidHandler = *pclsidHandler; hr = CoCreateInstance(&clsidHandler, NULL, CLSCTX_INPROC, &IID_IAVIStream, (LPVOID*)ppsCompressed); if (FAILED(hr) || *ppsCompressed == NULL) @@ -1077,7 +1077,7 @@ break; /* a new one */ } - if (count - i == -1U) { + if (i == count + 1) { /* it's a new CLSID */ /* FIXME: How do we get info's about read/write capabilities? */ @@ -1148,7 +1148,7 @@ /* add "All files" "*.*" filter if enough space left */ size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, - szAllFiles, sizeof(szAllFiles)) + 1; + szAllFiles, sizeof(szAllFiles)/sizeof(szAllFiles[0])) + 1; if (cbFilter > size) { int i; @@ -1336,7 +1336,8 @@ } } else { LoadStringW(AVIFILE_hModule, IDS_UNCOMPRESSED, - icinfo.szDescription, sizeof(icinfo.szDescription)); + icinfo.szDescription, + sizeof(icinfo.szDescription)/sizeof(icinfo.szDescription[0])); lstrcatW(szFormat, icinfo.szDescription); } } else if (sInfo.fccType == streamtypeAUDIO) { Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -9,16 +9,6 @@ <define name="__WINESRC__" /> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x600</define> - <library>wine</library> - <library>msacm32</library> - <library>msvfw32</library> - <library>winmm</library> - <library>ole32</library> - <library>user32</library> - <library>advapi32</library> - <library>kernel32</library> - <library>uuid</library> - <library>ntdll</library> <file>acmstream.c</file> <file>api.c</file> <file>avifile.c</file> @@ -32,5 +22,15 @@ <file>wavfile.c</file> <file>rsrc.rc</file> <file>avifil32.spec</file> + <library>wine</library> + <library>msacm32</library> + <library>msvfw32</library> + <library>winmm</library> + <library>ole32</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> </module> </group> Modified: trunk/reactos/dll/win32/avifil32/avifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -590,7 +590,7 @@ if (pClassID == NULL) return AVIERR_BADPARAM; - memcpy(pClassID, &CLSID_AVIFile, sizeof(CLSID_AVIFile)); + *pClassID = CLSID_AVIFile; return AVIERR_OK; } @@ -623,7 +623,7 @@ if (This->paf->hmmio != NULL) return AVIERR_ERROR; /* No reuse of this object for another file! */ - /* remeber mode and name */ + /* remember mode and name */ This->paf->uMode = dwMode; len = lstrlenW(pszFileName) + 1; @@ -951,7 +951,7 @@ if (This->lpFormat == NULL) { /* initial format */ if (This->paf->dwMoviChunkPos != 0) - return AVIERR_ERROR; /* user has used API in wrong sequnece! */ + return AVIERR_ERROR; /* user has used API in wrong sequence! */ This->lpFormat = HeapAlloc(GetProcessHeap(), 0, formatsize); if (This->lpFormat == NULL) @@ -1413,7 +1413,7 @@ break; }; - /* first frame is alwasy a keyframe */ + /* first frame is always a keyframe */ if (This->lLastFrame == -1) flags |= AVIIF_KEYFRAME; @@ -1656,7 +1656,7 @@ This->fInfo.dwWidth = MainAVIHdr.dwWidth; This->fInfo.dwHeight = MainAVIHdr.dwHeight; LoadStringW(AVIFILE_hModule, IDS_AVIFILETYPE, This->fInfo.szFileType, - sizeof(This->fInfo.szFileType)); + sizeof(This->fInfo.szFileType)/sizeof(This->fInfo.szFileType[0])); /* go back to into header list */ if (mmioAscend(This->hmmio, &ck, 0) != S_OK) @@ -1767,9 +1767,9 @@ /* generate description for stream like "filename.avi Type #n" */ if (streamHdr.fccType == streamtypeVIDEO) - LoadStringW(AVIFILE_hModule, IDS_VIDEO, szType, sizeof(szType)); + LoadStringW(AVIFILE_hModule, IDS_VIDEO, szType, sizeof(szType)/sizeof(szType[0])); else if (streamHdr.fccType == streamtypeAUDIO) - LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, sizeof(szType)); + LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, sizeof(szType)/sizeof(szType[0])); else wsprintfW(szType, streamTypeFmt, (char*)&streamHdr.fccType); @@ -1782,7 +1782,7 @@ memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName)); - LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt)); + LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt)/sizeof(streamNameFmt[0])); /* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */ wsprintfW(pStream->sInfo.szName, streamNameFmt, @@ -2226,7 +2226,7 @@ /* ... some optional additional extra chunk for this stream ... */ if (pStream->extra.lp != NULL && pStream->extra.cb > 0) { - /* the chunk header(s) are already in the strucuture */ + /* the chunk header(s) are already in the structure */ if (mmioWrite(This->hmmio, (HPSTR)pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb) return AVIERR_FILEWRITE; } @@ -2332,7 +2332,7 @@ return AVIERR_FILEWRITE; if (This->fInfo.dwFlags & AVIFILEINFO_ISINTERLEAVED) { - /* is interleaved -- write block of coresponding frames */ + /* is interleaved -- write block of corresponding frames */ LONG lInitialFrames = 0; LONG stepsize; LONG i; Modified: trunk/reactos/dll/win32/avifil32/avifile_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Ko.rc [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -31,8 +31,8 @@ AUTOCHECKBOX "Ç×»ó »óÈ£¹èÄ¡(&I)",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL LTEXT "ÇÁ·¹ÀÓ",-1,104,43,36,9 - LTEXT "ÇöÀç Æ÷¸Ë:",-1,3,56,53,9 - LTEXT "»ç¿ëÀ» ¸ñÀûÀ¸·Î ÇÏ´Â °ø",IDC_FORMATTEXT,55,56,90,26 + LTEXT "ÇöÀç Çü½Ä:",-1,3,56,53,9 + LTEXT "ÇÊ¿äÇÑ °ø°£",IDC_FORMATTEXT,55,56,90,26 DEFPUSHBUTTON "È®ÀÎ",IDOK,145,42,45,14 PUSHBUTTON "Ãë¼Ò",IDCANCEL,145,61,45,14 END @@ -46,6 +46,6 @@ IDS_VIDEO "ºñµð¿À" IDS_AUDIO "¿Àµð¿À" IDS_AVISTREAMFORMAT "%s %s #%d" - IDS_AVIFILETYPE "Wine AVI-±âº»-ÆÄÀÏÇÚµé·¯r" + IDS_AVIFILETYPE "Wine AVI-±âº»-ÆÄÀÏÇÚµé·¯" IDS_UNCOMPRESSED "ºñ¾ÐÃà" } Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -424,7 +424,7 @@ if (plStart == NULL || plLength == NULL || *plStart < 0) return AVIERR_BADPARAM; - /* if asked for cutted part copy it before deleting */ + /* if asked for cut part copy it before deleting */ if (ppResult != NULL) { hr = IAVIEditStream_Copy(iface, plStart, plLength, ppResult); if (FAILED(hr)) @@ -620,7 +620,7 @@ AVIFILE_ReadFrame(This, This->pStreams[0].pStream, This->pStreams[0].dwStart); - /* Check if we could convert the source streams to the disired format... */ + /* Check if we could convert the source streams to the desired format... */ if (pEdit != NULL) { if (FAILED(AVIFILE_FindStreamInTable(pEdit, lStart, &pStream, &startPos, &streamNr, TRUE))) Modified: trunk/reactos/dll/win32/avifil32/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/factory… ============================================================================== --- trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/factory.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -25,16 +25,15 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" - #include "ole2.h" + +#include "initguid.h" #include "vfw.h" +#include "avifile_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(avifile); - -#include "initguid.h" -#include "avifile_private.h" HMODULE AVIFILE_hModule = NULL; @@ -78,7 +77,7 @@ pClassFactory->lpVtbl = &iclassfact; pClassFactory->dwRef = 0; - memcpy(&pClassFactory->clsid, pclsid, sizeof(pClassFactory->clsid)); + pClassFactory->clsid = *pclsid; hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv); if (FAILED(hr)) { Modified: trunk/reactos/dll/win32/avifil32/getframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/getfram… ============================================================================== --- trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/getframe.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -212,7 +212,7 @@ if (This->lpOutFormat != NULL) { BITMAPINFOHEADER bi; - memcpy(&bi, This->lpOutFormat, sizeof(bi)); + bi = *This->lpOutFormat; AVIFILE_CloseCompressor(This); if (FAILED(IGetFrame_SetFormat(iface, &bi, NULL, 0, 0, -1, -1))) { Modified: trunk/reactos/dll/win32/avifil32/icmstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/icmstre… ============================================================================== --- trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/icmstream.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -558,7 +558,7 @@ if (ICCompressBegin(This->hic, lpbi, This->lpbiOutput) != S_OK) return AVIERR_COMPRESSOR; - /* check if we need to restart decompresion also */ + /* check if we need to restart decompression also */ if (This->lKeyFrameEvery != 1 && (This->dwICMFlags & VIDCF_FASTTEMPORALC) == 0) { ICDecompressEnd(This->hic); Modified: trunk/reactos/dll/win32/avifil32/wavfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/wavfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/wavfile.c [iso-8859-1] Fri Apr 4 07:03:12 2008 @@ -540,7 +540,7 @@ if (pClassID == NULL) return AVIERR_BADPARAM; - memcpy(pClassID, &CLSID_WAVFile, sizeof(CLSID_WAVFile)); + *pClassID = CLSID_WAVFile; return AVIERR_OK; } @@ -574,7 +574,7 @@ if (This->hmmio != NULL) return AVIERR_ERROR; /* No reuse of this object for another file! */ - /* remeber mode and name */ + /* remember mode and name */ This->uMode = dwMode; len = lstrlenW(pszFileName) + 1; @@ -607,9 +607,9 @@ memset(& This->sInfo, 0, sizeof(This->sInfo)); LoadStringW(AVIFILE_hModule, IDS_WAVEFILETYPE, This->fInfo.szFileType, - sizeof(This->fInfo.szFileType)); + sizeof(This->fInfo.szFileType)/sizeof(This->fInfo.szFileType[0])); if (LoadStringW(AVIFILE_hModule, IDS_WAVESTREAMFORMAT, - wszStreamFmt, sizeof(wszStreamFmt)) > 0) { + wszStreamFmt, sizeof(wszStreamFmt)/sizeof(wszStreamFmt[0])) > 0) { wsprintfW(This->sInfo.szName, wszStreamFmt, AVIFILE_BasenameW(This->szFileName)); }

16 years, 8 months

← Newer
1
...
33
34
35
36
37
38
39
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008