Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 26087: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:44:22 2007 New Revision: 26087 URL: http://svn.reactos.org/svn/reactos?rev=26087&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/objsel/objsel.c trunk/reactos/dll/win32/objsel/objsel_private.h Modified: trunk/reactos/dll/win32/objsel/objsel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel.c (original) +++ trunk/reactos/dll/win32/objsel/objsel.c Wed Mar 14 17:44:22 2007 @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(objsel); LONG dll_refs = 0; -HINSTANCE hInstance; +static HINSTANCE hInstance; /*********************************************************************** * DllEntryPoint Modified: trunk/reactos/dll/win32/objsel/objsel_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pr… ============================================================================== --- trunk/reactos/dll/win32/objsel/objsel_private.h (original) +++ trunk/reactos/dll/win32/objsel/objsel_private.h Wed Mar 14 17:44:22 2007 @@ -29,7 +29,6 @@ #include "winuser.h" #define COBJMACROS -#define COM_NO_WINDOWS_H #include "ole2.h" #include "strmif.h"

1 0

[winesync] 26086: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:43:17 2007 New Revision: 26086 URL: http://svn.reactos.org/svn/reactos?rev=26086&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/mpr/mpr_Pl.rc (with props) Modified: trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/mpr/mpr_It.rc trunk/reactos/dll/win32/mpr/mpr_Pt.rc trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=2… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr.rc Wed Mar 14 17:43:17 2007 @@ -37,6 +37,7 @@ #include "mpr_Ko.rc" #include "mpr_Nl.rc" #include "mpr_No.rc" +#include "mpr_Pl.rc" #include "mpr_Pt.rc" #include "mpr_Ru.rc" #include "mpr_Sv.rc" Modified: trunk/reactos/dll/win32/mpr/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_It.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_It.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_It.rc Wed Mar 14 17:43:17 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Added: trunk/reactos/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Pl.rc (added) +++ trunk/reactos/dll/win32/mpr/mpr_Pl.rc Wed Mar 14 17:43:17 2007 @@ -1,0 +1,47 @@ +/* + * MPR dll resources + * + * Copyright (C) 2004 Juan Lang + * Copyright (C) 2007 Mikolaj Zalewski + * + * 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_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_ENTIRENETWORK "Ca³a sieæ" +} + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wprowad has³o do sieci" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Proszê wprowadziæ nazwê u¿ytkownika i has³o:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Obszar", -1, 40, 46, 50, 10 */ + LTEXT "U¿ytkownik", -1, 40, 66, 50, 10 + LTEXT "Has³o", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Zapamiêtaj to has³o (nie bezpieczne)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Anuluj", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Propchange: trunk/reactos/dll/win32/mpr/mpr_Pl.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mpr/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pt.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Pt.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Pt.rc Wed Mar 14 17:43:17 2007 @@ -2,6 +2,7 @@ * MPR dll resources * * Copyright (C) 2004 Marcelo Duarte + * Copyright (C) 2006 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,12 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE DISCARDABLE { IDS_ENTIRENETWORK "Toda a rede" } + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -44,3 +48,25 @@ PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Indique a senha da rede" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Proxy", -1, 40, 26, 50, 10 +/* LTEXT "Realm", -1, 40, 46, 50, 10 */ + LTEXT "Utilizador", -1, 40, 66, 50, 10 + LTEXT "Senha", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Gravar esta senha (Inseguro)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Cancelar", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff Wed Mar 14 17:43:17 2007 @@ -2,9 +2,9 @@ =================================================================== --- mpr.rc (revision 23782) +++ mpr.rc (working copy) -@@ -38,4 +38,7 @@ - #include "mpr_Nl.rc" +@@ -39,4 +39,7 @@ #include "mpr_No.rc" + #include "mpr_Pl.rc" #include "mpr_Pt.rc" +#include "mpr_Ru.rc" +#include "mpr_Sv.rc" Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=2… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c (original) +++ trunk/reactos/dll/win32/mpr/wnet.c Wed Mar 14 17:43:17 2007 @@ -99,7 +99,7 @@ */ static DWORD _findProviderIndexW(LPCWSTR lpProvider); -PWNetProviderTable providerTable; +static PWNetProviderTable providerTable; /* * Global provider table functions @@ -447,7 +447,7 @@ * if not all members of the array could be thunked, and something else on * failure. */ -static DWORD _thunkNetResourceArrayWToA(const LPNETRESOURCEW lpNetArrayIn, +static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; @@ -466,7 +466,7 @@ for (i = 0, numToThunk = 0, totalBytes = 0; i < *lpcCount; i++) { - LPNETRESOURCEW lpNet = lpNetArrayIn + i; + const NETRESOURCEW *lpNet = lpNetArrayIn + i; totalBytes += sizeof(NETRESOURCEA); if (lpNet->lpLocalName) @@ -488,7 +488,7 @@ for (i = 0; i < numToThunk; i++) { LPNETRESOURCEA lpNetOut = (LPNETRESOURCEA)lpBuffer + i; - LPNETRESOURCEW lpNetIn = lpNetArrayIn + i; + const NETRESOURCEW *lpNetIn = lpNetArrayIn + i; memcpy(lpNetOut, lpNetIn, sizeof(NETRESOURCEA)); /* lie about string lengths, we already verified how many @@ -532,7 +532,7 @@ * if not all members of the array could be thunked, and something else on * failure. */ -static DWORD _thunkNetResourceArrayAToW(const LPNETRESOURCEA lpNetArrayIn, +static DWORD _thunkNetResourceArrayAToW(const NETRESOURCEA *lpNetArrayIn, LPDWORD lpcCount, LPVOID lpBuffer, LPDWORD lpBufferSize) { DWORD i, numToThunk, totalBytes, ret; @@ -551,7 +551,7 @@ for (i = 0, numToThunk = 0, totalBytes = 0; i < *lpcCount; i++) { - LPNETRESOURCEA lpNet = lpNetArrayIn + i; + const NETRESOURCEA *lpNet = lpNetArrayIn + i; totalBytes += sizeof(NETRESOURCEW); if (lpNet->lpLocalName) @@ -573,7 +573,7 @@ for (i = 0; i < numToThunk; i++) { LPNETRESOURCEW lpNetOut = (LPNETRESOURCEW)lpBuffer + i; - LPNETRESOURCEA lpNetIn = lpNetArrayIn + i; + const NETRESOURCEA *lpNetIn = lpNetArrayIn + i; memcpy(lpNetOut, lpNetIn, sizeof(NETRESOURCEW)); /* lie about string lengths, we already verified how many @@ -819,7 +819,7 @@ ret = WN_BAD_POINTER; else if (!lpcCount) ret = WN_BAD_POINTER; - if (!lpBuffer) + else if (!lpBuffer) ret = WN_BAD_POINTER; else if (!lpBufferSize) ret = WN_BAD_POINTER;

1 0

[winesync] 26085: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:39:18 2007 New Revision: 26085 URL: http://svn.reactos.org/svn/reactos?rev=26085&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mapi32/prop.c Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c (original) +++ trunk/reactos/dll/win32/mapi32/prop.c Wed Mar 14 17:39:18 2007 @@ -1553,6 +1553,7 @@ This->lpFree(current->value); This->lpFree(current); } + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); This->lpFree(This); } @@ -2543,6 +2544,7 @@ lpPropData->ulNumValues = 0; list_init(&lpPropData->values); InitializeCriticalSection(&lpPropData->cs); + lpPropData->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IPropDataImpl.cs"); *lppPropData = (LPPROPDATA)lpPropData; } return scode;

1 0

[winesync] 26084: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:38:17 2007 New Revision: 26084 URL: http://svn.reactos.org/svn/reactos?rev=26084&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/lz32/lz32_ros.diff (with props) trunk/reactos/dll/win32/lz32/version.rc (with props) Modified: trunk/reactos/dll/win32/lz32/lz32.rbuild Modified: trunk/reactos/dll/win32/lz32/lz32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lz32.rbuild… ============================================================================== --- trunk/reactos/dll/win32/lz32/lz32.rbuild (original) +++ trunk/reactos/dll/win32/lz32/lz32.rbuild Wed Mar 14 17:38:17 2007 @@ -12,5 +12,6 @@ <library>kernel32</library> <library>ntdll</library> <file>lzexpand_main.c</file> + <file>version.rc</file> <file>lz32.spec</file> </module> Added: trunk/reactos/dll/win32/lz32/lz32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lz32_ros.di… ============================================================================== --- trunk/reactos/dll/win32/lz32/lz32_ros.diff (added) +++ trunk/reactos/dll/win32/lz32/lz32_ros.diff Wed Mar 14 17:38:17 2007 @@ -1,0 +1,9 @@ +Index: lz32.rbuild +=================================================================== +--- lz32.rbuild (revision 23782) ++++ lz32.rbuild (working copy) +@@ -1,3 +1,3 @@ ++<module name="lz32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll" allowwarnings="true"> +-<module name="lz32" type="win32dll" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll" allowwarnings="true"> + <importlibrary definition="lz32.spec.def" /> + <include base="lz32">.</include> Propchange: trunk/reactos/dll/win32/lz32/lz32_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/lz32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/version.rc?… ============================================================================== --- trunk/reactos/dll/win32/lz32/version.rc (added) +++ trunk/reactos/dll/win32/lz32/version.rc Wed Mar 14 17:38:17 2007 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2007 Alexandre Julliard + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine lz32" +#define WINE_FILENAME_STR "lz32.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/lz32/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[winesync] 26083: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:34:47 2007 New Revision: 26083 URL: http://svn.reactos.org/svn/reactos?rev=26083&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/imm32/version.rc (with props) 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 (original) +++ trunk/reactos/dll/win32/imm32/imm.c Wed Mar 14 17:34:47 2007 @@ -51,6 +51,7 @@ BOOL bOpen; BOOL bInternalState; BOOL bRead; + BOOL bInComposition; LOGFONTW font; HFONT textfont; COMPOSITIONFORM CompForm; @@ -60,6 +61,7 @@ static HWND hwndDefault = NULL; static HANDLE hImeInst; static const WCHAR WC_IMECLASSNAME[] = {'I','M','E',0}; +static ATOM atIMEClass = 0; /* MSIME messages */ static UINT WM_MSIME_SERVICE; @@ -109,12 +111,14 @@ wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW +1); wndClass.lpszMenuName = 0; wndClass.lpszClassName = WC_IMECLASSNAME; - RegisterClassW(&wndClass); + atIMEClass = RegisterClassW(&wndClass); } static void IMM_Unregister(void) { - UnregisterClassW(WC_IMECLASSNAME, NULL); + if (atIMEClass) { + UnregisterClassW(WC_IMECLASSNAME, NULL); + } } static void IMM_RegisterMessages(void) @@ -165,6 +169,18 @@ PostMessageW(target, msg, wParam, lParam); } +static LRESULT ImmInternalSendIMENotify(WPARAM notify, LPARAM lParam) +{ + HWND target; + + target = root_context->hwnd; + if (!target) target = GetFocus(); + + if (target) + return SendMessageW(target, WM_IME_NOTIFY, notify, lParam); + + return 0; +} static void ImmInternalSetOpenStatus(BOOL fOpen) { @@ -198,7 +214,7 @@ else ShowWindow(hwndDefault, SW_SHOWNOACTIVATE); - SendMessageW(root_context->hwnd, WM_IME_NOTIFY, IMN_SETOPENSTATUS, 0); + ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); } @@ -551,6 +567,21 @@ rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString, data->dwCompStringLength/ sizeof(WCHAR), NULL, + 0, NULL, NULL); + + if (dwBufLen >= sizeof(DWORD)*2) + { + ((LPDWORD)lpBuf)[0] = 0; + ((LPDWORD)lpBuf)[1] = rc; + } + rc = sizeof(DWORD)*2; + } + else if (dwIndex == GCS_RESULTCLAUSE) + { + TRACE("GSC_RESULTCLAUSE %p %i\n", data->ResultString, data->dwResultStringSize); + + rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->ResultString, + data->dwResultStringSize/ sizeof(WCHAR), NULL, 0, NULL, NULL); if (dwBufLen >= sizeof(DWORD)*2) @@ -1112,6 +1143,9 @@ ImmInternalPostIMEMessage(WM_IME_COMPOSITION, root_context->ResultString[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); + + ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION, 0, 0); + root_context->bInComposition = FALSE; } break; case CPS_CONVERT: @@ -1209,7 +1243,7 @@ MultiByteToWideChar(CP_ACP, 0, lplf->lfFaceName, -1, data->font.lfFaceName, LF_FACESIZE); - SendMessageW(root_context->hwnd, WM_IME_NOTIFY, IMN_SETCOMPOSITIONFONT, 0); + ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1233,7 +1267,7 @@ return FALSE; memcpy(&data->font,lplf,sizeof(LOGFONTW)); - SendMessageW(root_context->hwnd, WM_IME_NOTIFY, IMN_SETCOMPOSITIONFONT, 0); + ImmInternalSendIMENotify(IMN_SETCOMPOSITIONFONT, 0); if (data->textfont) { @@ -1319,6 +1353,12 @@ if (dwIndex == SCS_SETSTR) { + if (!root_context->bInComposition) + { + ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION, 0, 0); + root_context->bInComposition = TRUE; + } + flags = GCS_COMPSTR; if (root_context->dwCompStringLength) @@ -1378,7 +1418,7 @@ if (reshow) ShowWindow(hwndDefault,SW_SHOWNOACTIVATE); - SendMessageW(root_context->hwnd, WM_IME_NOTIFY,IMN_SETCOMPOSITIONWINDOW, 0); + ImmInternalSendIMENotify(IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; } @@ -1406,14 +1446,8 @@ if (hIMC == (HIMC)FROM_IME) { - if (fOpen) - ImmInternalPostIMEMessage(WM_IME_STARTCOMPOSITION, 0, 0); - ImmInternalSetOpenStatus(fOpen); - - if (!fOpen) - ImmInternalPostIMEMessage(WM_IME_ENDCOMPOSITION, 0, 0); - + ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); return TRUE; } @@ -1489,6 +1523,29 @@ return FALSE; } +/*********************************************************************** + * ImmGetImeMenuItemsA (IMM32.@) + */ +DWORD WINAPI ImmGetImeMenuItemsA( HIMC hIMC, DWORD dwFlags, DWORD dwType, + LPIMEMENUITEMINFOA lpImeParentMenu, LPIMEMENUITEMINFOA lpImeMenu, + DWORD dwSize) +{ + FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + return 0; +} + +/*********************************************************************** +* ImmGetImeMenuItemsW (IMM32.@) +*/ +DWORD WINAPI ImmGetImeMenuItemsW( HIMC hIMC, DWORD dwFlags, DWORD dwType, + LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, + DWORD dwSize) +{ + FIXME("(%p, %i, %i, %p, %p, %i): stub\n", hIMC, dwFlags, dwType, + lpImeParentMenu, lpImeMenu, dwSize); + return 0; +} /***** * Internal functions to help with IME window management @@ -1566,7 +1623,7 @@ TRACE("IME message %s, 0x%x, 0x%x (%i)\n", "WM_IME_COMPOSITION", (UINT)wParam, (UINT)lParam, root_context->bRead); - if ((lParam & GCS_RESULTSTR) && (!root_context->bRead)) + if (lParam & GCS_RESULTSTR) IMM_PostResult(root_context); else UpdateDataInDefaultIMEWindow(hwnd); 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 (original) +++ trunk/reactos/dll/win32/imm32/imm32.rbuild Wed Mar 14 17:34:47 2007 @@ -14,5 +14,6 @@ <library>kernel32</library> <library>ntdll</library> <file>imm.c</file> + <file>version.rc</file> <file>imm32.spec</file> </module> 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 (original) +++ trunk/reactos/dll/win32/imm32/imm32.spec Wed Mar 14 17:34:47 2007 @@ -43,10 +43,10 @@ @ stub ImmGetIMCCSize @ stub ImmGetIMCLockCount @ stdcall ImmGetIMEFileNameA(long ptr long) -@ stdcall ImmGetIMEFileNameW(long ptr long) +@ stdcall ImmGetIMEFileNameW(long ptr long) @ stub ImmGetImeInfoEx -@ stub ImmGetImeMenuItemsA -@ stub ImmGetImeMenuItemsW +@ stdcall ImmGetImeMenuItemsA(long long long ptr ptr long) +@ stdcall ImmGetImeMenuItemsW(long long long ptr ptr long) @ stdcall ImmGetOpenStatus(long) @ stdcall ImmGetProperty(long long) @ stdcall ImmGetRegisterWordStyleA(long long ptr) Added: trunk/reactos/dll/win32/imm32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/version.rc… ============================================================================== --- trunk/reactos/dll/win32/imm32/version.rc (added) +++ trunk/reactos/dll/win32/imm32/version.rc Wed Mar 14 17:34:47 2007 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2007 Alexandre Julliard + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine imm32" +#define WINE_FILENAME_STR "imm32.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/imm32/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[winesync] 26082: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:33:33 2007 New Revision: 26082 URL: http://svn.reactos.org/svn/reactos?rev=26082&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.c (original) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.c Wed Mar 14 17:33:33 2007 @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); -HMODULE CRYPTDLL_hModule = 0; +static HMODULE CRYPTDLL_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {

1 0

[winesync] 26081: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:29:38 2007 New Revision: 26081 URL: http://svn.reactos.org/svn/reactos?rev=26081&view=rev Log: Autosyncing with Wine HEAD 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_ros.diff trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/string.c trunk/reactos/dll/win32/comctl32/syslink.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/treeview.c trunk/reactos/dll/win32/comctl32/updown.c trunk/reactos/include/psdk/commctrl.h [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_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_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.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/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre… 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/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/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… Modified: trunk/reactos/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/string.… Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… 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/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.… Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re…

1 0

[winesync] 26080: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:20:42 2007 New Revision: 26080 URL: http://svn.reactos.org/svn/reactos?rev=26080&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/cabinet/fci.c trunk/reactos/dll/win32/cabinet/fdi.c 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 (original) +++ trunk/reactos/dll/win32/cabinet/fci.c Wed Mar 14 17:20:42 2007 @@ -1343,7 +1343,7 @@ return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } @@ -2251,7 +2251,7 @@ fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE ); return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } @@ -2480,7 +2480,7 @@ fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE ); return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } @@ -2647,7 +2647,7 @@ fci_set_error( FCIERR_NONE, ERROR_FUNCTION_FAILED, TRUE ); return FALSE; } - /* Skip a few lines of code. This is catched by the next if. */ + /* Skip a few lines of code. This is caught by the next if. */ p_fci_internal->fGetNextCabInVain=TRUE; } 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 (original) +++ trunk/reactos/dll/win32/cabinet/fdi.c Wed Mar 14 17:20:42 2007 @@ -363,8 +363,8 @@ { HFDI rv; - TRACE("(pfnalloc == ^%p, pfnfree == ^%p, pfnopen == ^%p, pfnread == ^%p, pfnwrite == ^%p, \ - pfnclose == ^%p, pfnseek == ^%p, cpuType == %d, perf == ^%p)\n", + TRACE("(pfnalloc == ^%p, pfnfree == ^%p, pfnopen == ^%p, pfnread == ^%p, pfnwrite == ^%p, " + "pfnclose == ^%p, pfnseek == ^%p, cpuType == %d, perf == ^%p)\n", pfnalloc, pfnfree, pfnopen, pfnread, pfnwrite, pfnclose, pfnseek, cpuType, perf); @@ -865,8 +865,21 @@ * LZXfdi_init (internal) */ static int LZXfdi_init(int window, fdi_decomp_state *decomp_state) { + static const cab_UBYTE bits[] = + { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, + 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, + 15, 15, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, + 17, 17, 17}; + static const cab_ULONG base[] = + { 0, 1, 2, 3, 4, 6, 8, 12, + 16, 24, 32, 48, 64, 96, 128, 192, + 256, 384, 512, 768, 1024, 1536, 2048, 3072, + 4096, 6144, 8192, 12288, 16384, 24576, 32768, 49152, + 65536, 98304, 131072, 196608, 262144, 393216, 524288, 655360, + 786432, 917504, 1048576, 1179648, 1310720, 1441792, 1572864, 1703936, + 1835008, 1966080, 2097152}; cab_ULONG wndsize = 1 << window; - int i, j, posn_slots; + int posn_slots; /* LZX supports window sizes of 2^15 (32Kb) through 2^21 (2Mb) */ /* if a previously allocated window is big enough, keep it */ @@ -882,14 +895,8 @@ LZX(window_size) = wndsize; /* initialize static tables */ - for (i=0, j=0; i <= 50; i += 2) { - CAB(extra_bits)[i] = CAB(extra_bits)[i+1] = j; /* 0,0,0,0,1,1,2,2,3,3... */ - if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */ - } - for (i=0, j=0; i <= 50; i++) { - CAB(lzx_position_base)[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */ - j += 1 << CAB(extra_bits)[i]; /* 1,1,1,1,2,2,4,4,8,8,16,16,32,32,... */ - } + memcpy(CAB(extra_bits), bits, sizeof(bits)); + memcpy(CAB(lzx_position_base), base, sizeof(base)); /* calculate required position slots */ if (window == 20) posn_slots = 42; @@ -909,8 +916,8 @@ LZX(window_posn) = 0; /* initialize tables to 0 (because deltas will be applied to them) */ - for (i = 0; i < LZX_MAINTREE_MAXSYMBOLS; i++) LZX(MAINTREE_len)[i] = 0; - for (i = 0; i < LZX_LENGTH_MAXSYMBOLS; i++) LZX(LENGTH_len)[i] = 0; + memset(LZX(MAINTREE_len), 0, sizeof(LZX(MAINTREE_len))); + memset(LZX(LENGTH_len), 0, sizeof(LZX(LENGTH_len))); return DECR_OK; } @@ -2439,7 +2446,7 @@ { FDICABINETINFO fdici; FDINOTIFICATION fdin; - int cabhf, filehf, idx; + int cabhf, filehf = 0, idx; unsigned int i; char fullpath[MAX_PATH]; size_t pathlen, filenamelen; @@ -2450,8 +2457,8 @@ fdi_decomp_state _decomp_state; fdi_decomp_state *decomp_state = &_decomp_state; - TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, \ - pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", + TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, " + "pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", hfdi, pszCabinet, pszCabPath, flags, pfnfdin, pfnfdid, pvUser); if (!REALLY_IS_FDI(hfdi)) { @@ -2809,6 +2816,18 @@ err = fdi_decomp(file, 1, decomp_state, pszCabPath, pfnfdin, pvUser); if (err) CAB(current) = NULL; else CAB(offset) += file->length; + /* fdintCLOSE_FILE_INFO notification */ + ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); + fdin.pv = pvUser; + fdin.psz1 = (char *)file->filename; + fdin.hf = filehf; + fdin.cb = (file->attribs & cffile_A_EXEC) ? TRUE : FALSE; /* FIXME: is that right? */ + fdin.date = file->date; + fdin.time = file->time; + fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ + ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); + filehf = 0; + switch (err) { case DECR_OK: break; @@ -2829,28 +2848,6 @@ PFDI_INT(hfdi)->perf->fError = TRUE; goto bail_and_fail; } - - /* fdintCLOSE_FILE_INFO notification */ - ZeroMemory(&fdin, sizeof(FDINOTIFICATION)); - fdin.pv = pvUser; - fdin.psz1 = (char *)file->filename; - fdin.hf = filehf; - fdin.cb = (file->attribs & cffile_A_EXEC) ? TRUE : FALSE; /* FIXME: is that right? */ - fdin.date = file->date; - fdin.time = file->time; - fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ - err = ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); - if (err == FALSE || err == -1) { - /* - * SDK states that even though they indicated failure, - * we are not supposed to try and close the file, so we - * just treat this like all the others - */ - PFDI_INT(hfdi)->perf->erfOper = FDIERROR_USER_ABORT; - PFDI_INT(hfdi)->perf->erfType = 0; - PFDI_INT(hfdi)->perf->fError = TRUE; - goto bail_and_fail; - } } } @@ -2917,6 +2914,8 @@ } break; } + + if (filehf) PFDI_CLOSE(hfdi, filehf); while (decomp_state) { fdi_decomp_state *prev_fds;

1 0

[winesync] 26079: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 17:13:17 2007 New Revision: 26079 URL: http://svn.reactos.org/svn/reactos?rev=26079&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/avifil32/api.c trunk/reactos/dll/win32/avifil32/avifil32_ros.diff trunk/reactos/dll/win32/avifil32/avifile_It.rc trunk/reactos/dll/win32/avifil32/avifile_Pt.rc trunk/reactos/dll/win32/avifil32/extrachunk.c trunk/reactos/dll/win32/avifil32/extrachunk.h trunk/reactos/dll/win32/avifil32/factory.c trunk/reactos/dll/win32/avifil32/tmpfile.c 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 (original) +++ trunk/reactos/dll/win32/avifil32/api.c Wed Mar 14 17:13:17 2007 @@ -185,7 +185,7 @@ */ void WINAPI AVIFileExit(void) { /* need to free ole32.dll if we are the last exit call */ - /* OleUnitialize() */ + /* OleUninitialize() */ FIXME("(): stub!\n"); } Modified: trunk/reactos/dll/win32/avifil32/avifil32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32_ros.diff (original) +++ trunk/reactos/dll/win32/avifil32/avifil32_ros.diff Wed Mar 14 17:13:17 2007 @@ -13,3 +13,58 @@ #ifndef DIBWIDTHBYTES #define WIDTHBYTES(i) (((i+31)&(~31))/8) #define DIBWIDTHBYTES(bi) WIDTHBYTES((bi).biWidth * (bi).biBitCount) +Index: avifile_Uk.rc +=================================================================== +--- avifile_Uk.rc (revision 23782) ++++ avifile_Uk.rc (working copy) +@@ -0,0 +1,40 @@ ++/* ++ * PROJECT: AVI File support library ++ * LICENSE: GPL - See COPYING in the top level directory ++ * FILE: dll/win32/avifil32/avifile_Uk.rc ++ * PURPOSE: Ukraianian resource file for avifil32 ++ * TRANSLATOR: Artem Reznikov ++ */ ++ ++LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT ++ ++IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 ++STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU ++CAPTION "Ïàðàìåòðè ñòèñíåííÿ" ++FONT 8, "MS Shell Dlg" ++BEGIN ++ LTEXT "&Îáåð³òü ïîò³ê:",-1,2,5,114,10 ++ COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | ++ WS_TABSTOP ++ PUSHBUTTON "Ï&àðàìåòðè...",IDC_OPTIONS,145,17,45,14 ++ AUTOCHECKBOX "&²íòåðâàë ÷åðãóâàííÿ",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 ++ DEFPUSHBUTTON "OK",IDOK,145,42,45,14 ++ PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,145,61,45,14 ++END ++ ++STRINGTABLE DISCARDABLE ++{ ++ IDS_WAVESTREAMFORMAT "Çâóêîâèé ïîò³ê: %s" ++ IDS_WAVEFILETYPE "Çâóêîâèé ïîò³ê" ++ IDS_ALLMULTIMEDIA "Óñ³ ìóëüòèìåä³éí³ ôàéëè" ++ IDS_ALLFILES "Óñ³ ôàéëè (*.*)(a)*.*" ++ IDS_VIDEO "â³äåî" ++ IDS_AUDIO "àóä³î" ++ IDS_AVISTREAMFORMAT "%s %s #%d" ++ IDS_AVIFILETYPE "Wine îáðîáíèê AVI-ôàéë³â çà çàìîâ÷óâàííÿì" ++ IDS_UNCOMPRESSED "áåç ñòèñíåííÿ" ++} ++ +Index: rsrc.rc +=================================================================== +--- rsrc.rc (revision 23782) ++++ rsrc.rc (working copy) +@@ -54,3 +54,4 @@ + #include "avifile_Ru.rc" + #include "avifile_Si.rc" + #include "avifile_Tr.rc" ++#include "avifile_Uk.rc" Modified: trunk/reactos/dll/win32/avifil32/avifile_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_It.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_It.rc Wed Mar 14 17:13:17 2007 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/avifil32/avifile_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifile_Pt.rc (original) +++ trunk/reactos/dll/win32/avifil32/avifile_Pt.rc Wed Mar 14 17:13:17 2007 @@ -1,5 +1,6 @@ /* * Copyright 2003 Marcelo Duarte + * Copyright 2006 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -36,6 +37,29 @@ PUSHBUTTON "Cancelar",IDCANCEL,145,61,45,14 END +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_SAVEOPTIONS DIALOG FIXED IMPURE 43, 37, 196, 82 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Opções de compressão" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Escolha a stream:",-1,2,5,114,10 + COMBOBOX IDC_STREAM,2,18,134,61,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + PUSHBUTTON "&Opções...",IDC_OPTIONS,145,17,45,14 + AUTOCHECKBOX "&Interlaçar a todos os",IDC_INTERLEAVE,3,42,60,11,WS_TABSTOP + EDITTEXT IDC_INTERLEAVEEVERY,66,41,32,12,ES_AUTOHSCROLL + LTEXT "molduras",-1,104,43,36,9 + LTEXT "Formato actual:",-1,3,56,53,9 + LTEXT "This space for rent",IDC_FORMATTEXT,55,56,90,26 + DEFPUSHBUTTON "OK",IDOK,145,42,45,14 + PUSHBUTTON "Cancelar",IDCANCEL,145,61,45,14 +END + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE DISCARDABLE { IDS_WAVESTREAMFORMAT "Formato wave: %s" @@ -48,3 +72,18 @@ IDS_AVIFILETYPE "Wine AVI-manipulador padrão de arquivo" IDS_UNCOMPRESSED "sem compressão" } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE DISCARDABLE +{ + IDS_WAVESTREAMFORMAT "Formato wave: %s" + IDS_WAVEFILETYPE "Formato wave" + IDS_ALLMULTIMEDIA "Todos os ficheiros multimédia" + IDS_ALLFILES "Todos os ficheiros (*.*)(a)*.*" + IDS_VIDEO "vídeo" + IDS_AUDIO "áudio" + IDS_AVISTREAMFORMAT "%s %s #%d" + IDS_AVIFILETYPE "Manipulador AVI Wine predefinido" + IDS_UNCOMPRESSED "sem compressão" +} Modified: trunk/reactos/dll/win32/avifil32/extrachunk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.c (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.c Wed Mar 14 17:13:17 2007 @@ -29,8 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData, - LPLONG size) +HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData,LPLONG size) { LPBYTE lp; DWORD cb; @@ -68,8 +67,7 @@ } /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lpData, - LONG size) +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lpData, LONG size) { LPDWORD lp; Modified: trunk/reactos/dll/win32/avifil32/extrachunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/extrach… ============================================================================== --- trunk/reactos/dll/win32/avifil32/extrachunk.h (original) +++ trunk/reactos/dll/win32/avifil32/extrachunk.h Wed Mar 14 17:13:17 2007 @@ -35,10 +35,10 @@ } EXTRACHUNKS, *LPEXTRACHUNKS; /* reads a chunk outof the extrachunk-structure */ -HRESULT ReadExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size); +HRESULT ReadExtraChunk(const LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LPLONG size); /* writes a chunk into the extrachunk-structure */ -HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPVOID lp,LONG size); +HRESULT WriteExtraChunk(LPEXTRACHUNKS extra,FOURCC ckid,LPCVOID lp,LONG size); /* reads a chunk fomr the HMMIO into the extrachunk-structure */ HRESULT ReadChunkIntoExtra(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck); 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 (original) +++ trunk/reactos/dll/win32/avifil32/factory.c Wed Mar 14 17:13:17 2007 @@ -40,8 +40,8 @@ HMODULE AVIFILE_hModule = NULL; -BOOL AVIFILE_bLocked = FALSE; -UINT AVIFILE_uUseCount = 0; +static BOOL AVIFILE_bLocked; +static UINT AVIFILE_uUseCount; static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj); static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface); Modified: trunk/reactos/dll/win32/avifil32/tmpfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/tmpfile… ============================================================================== --- trunk/reactos/dll/win32/avifil32/tmpfile.c (original) +++ trunk/reactos/dll/win32/avifil32/tmpfile.c Wed Mar 14 17:13:17 2007 @@ -112,7 +112,7 @@ { register DWORD tmp; - tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), \ + tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000); if (tmpFile->fInfo.dwLength < tmp) tmpFile->fInfo.dwLength = tmp;

1 0

[hpoussin] 26078: Add missing file for autosync of cabinet.dll
by hpoussin＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: hpoussin Date: Wed Mar 14 16:05:40 2007 New Revision: 26078 URL: http://svn.reactos.org/svn/reactos?rev=26078&view=rev Log: Add missing file for autosync of cabinet.dll Added: trunk/reactos/dll/win32/cabinet/cabinet_ros.diff (with props) Added: trunk/reactos/dll/win32/cabinet/cabinet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_ros.diff (added) +++ trunk/reactos/dll/win32/cabinet/cabinet_ros.diff Wed Mar 14 16:05:40 2007 @@ -1,0 +1,9 @@ +Index: cabinet.rbuild +=================================================================== +--- cabinet.rbuild (revision 23782) ++++ cabinet.rbuild (working copy) +@@ -1,3 +1,3 @@ ++<module name="cabinet" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true"> +-<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true"> + <importlibrary definition="cabinet.spec.def" /> + <include base="cabinet">.</include> Propchange: trunk/reactos/dll/win32/cabinet/cabinet_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs