Ros-diffs November 2006

ros-diffs@reactos.org

16 participants
324 discussions

[weiden] 24847: Fix GCC4 warnings
by weiden＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: weiden Date: Mon Nov 27 00:44:57 2006 New Revision: 24847 URL: http://svn.reactos.org/svn/reactos?rev=24847&view=rev Log: Fix GCC4 warnings Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Mon Nov 27 00:44:57 2006 @@ -80,7 +80,7 @@ dummy.mask = LVCF_SUBITEM | LVCF_WIDTH; dummy.iSubItem = 0; dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); - ListView_InsertColumn(hwndBackgroundList, 0, &dummy); + (void)ListView_InsertColumn(hwndBackgroundList, 0, &dummy); /* Add the "None" item */ backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; @@ -98,7 +98,7 @@ listItem.iItem = pGlobalData->listViewItemCount; listItem.lParam = pGlobalData->listViewItemCount; - ListView_InsertItem(hwndBackgroundList, &listItem); + (void)ListView_InsertItem(hwndBackgroundList, &listItem); ListView_SetItemState(hwndBackgroundList, pGlobalData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); pGlobalData->listViewItemCount++; @@ -120,7 +120,7 @@ { if (i++ == 0) { - ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); + (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); } backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; @@ -138,7 +138,7 @@ listItem.iItem = pGlobalData->listViewItemCount; listItem.lParam = pGlobalData->listViewItemCount; - ListView_InsertItem(hwndBackgroundList, &listItem); + (void)ListView_InsertItem(hwndBackgroundList, &listItem); ListView_SetItemState(hwndBackgroundList, pGlobalData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); pGlobalData->listViewItemCount++; @@ -183,7 +183,7 @@ if (i++ == 0) { - ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); + (void)ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); } backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; @@ -201,7 +201,7 @@ listItem.iItem = pGlobalData->listViewItemCount; listItem.lParam = pGlobalData->listViewItemCount; - ListView_InsertItem(hwndBackgroundList, &listItem); + (void)ListView_InsertItem(hwndBackgroundList, &listItem); pGlobalData->listViewItemCount++; } @@ -442,7 +442,7 @@ listItem.iItem = pGlobalData->listViewItemCount; listItem.lParam = pGlobalData->listViewItemCount; - ListView_InsertItem(hwndBackgroundList, &listItem); + (void)ListView_InsertItem(hwndBackgroundList, &listItem); pGlobalData->listViewItemCount++; }

1 0

[winesync] 24846: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: winesync Date: Mon Nov 27 00:36:50 2006 New Revision: 24846 URL: http://svn.reactos.org/svn/reactos?rev=24846&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mpr/mpr_De.rc trunk/reactos/dll/win32/mpr/mpr_Ko.rc trunk/reactos/dll/win32/mpr/mpr_Nl.rc trunk/reactos/dll/win32/mpr/mpr_Pt.rc trunk/reactos/dll/win32/mpr/multinet.c trunk/reactos/dll/win32/mpr/nps.c trunk/reactos/dll/win32/mpr/pwcache.c trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_De.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_De.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_De.rc Mon Nov 27 00:36:50 2006 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ko.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ko.rc Mon Nov 27 00:36:50 2006 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { Modified: trunk/reactos/dll/win32/mpr/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Nl.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Nl.rc (original) +++ trunk/reactos/dll/win32/mpr/mpr_Nl.rc Mon Nov 27 00:36:50 2006 @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { 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 Mon Nov 27 00:36:50 2006 @@ -30,10 +30,10 @@ CAPTION "Entre a senha da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, entre como o nome de usuÃ¡rio e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 + LTEXT "Por favor, entre como o nome de usuário e a senha:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "Proxy", -1, 40, 26, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "UsuÃ¡rio", -1, 40, 66, 50, 10 + LTEXT "Usuário", -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 Modified: trunk/reactos/dll/win32/mpr/multinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/multinet.c?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/multinet.c (original) +++ trunk/reactos/dll/win32/mpr/multinet.c Mon Nov 27 00:36:50 2006 @@ -66,7 +66,7 @@ */ DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z ) { - FIXME( "(%lx, %lx, %lx): stub\n", x, y, z ); + FIXME( "(%x, %x, %x): stub\n", x, y, z ); return 0; } @@ -75,7 +75,6 @@ */ DWORD WINAPI MultinetGetErrorTextW( DWORD x, DWORD y, DWORD z ) { - FIXME( "(%lx, %lx, %lx ): stub\n", x, y, z ); + FIXME( "(%x, %x, %x ): stub\n", x, y, z ); return 0; } - Modified: trunk/reactos/dll/win32/mpr/nps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/nps.c?rev=24… ============================================================================== --- trunk/reactos/dll/win32/mpr/nps.c (original) +++ trunk/reactos/dll/win32/mpr/nps.c Mon Nov 27 00:36:50 2006 @@ -155,7 +155,7 @@ */ DWORD WINAPI NPSSetExtendedErrorA( DWORD NetSpecificError, LPSTR lpExtendedErrorText ) { - FIXME( "(%08lx, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) ); + FIXME( "(%08x, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) ); return WN_NOT_SUPPORTED; } @@ -190,7 +190,7 @@ */ DWORD WINAPI NPSDeviceGetStringA( DWORD dwNumber, DWORD dwType, LPSTR lpLocalName, LPDWORD lpdwBufferSize ) { - FIXME( "(%ld, %ld, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize ); + FIXME( "(%d, %d, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize ); return WN_NOT_SUPPORTED; } @@ -217,7 +217,7 @@ */ DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD status ) { - FIXME("%s %ld %p\n", debugstr_a(lpProvider), dwIndex, status ); + FIXME("%s %d %p\n", debugstr_a(lpProvider), dwIndex, status ); *status = 0; return WN_SUCCESS; } @@ -227,7 +227,7 @@ */ DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD status ) { - FIXME("%s %ld %p\n", debugstr_w(lpProvider), dwIndex, status ); + FIXME("%s %d %p\n", debugstr_w(lpProvider), dwIndex, status ); *status = 0; return WN_SUCCESS; } @@ -237,7 +237,7 @@ */ DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD status ) { - FIXME("%s %ld %ld\n", debugstr_a(lpProvider), dwIndex, status ); + FIXME("%s %d %d\n", debugstr_a(lpProvider), dwIndex, status ); return WN_SUCCESS; } @@ -246,7 +246,7 @@ */ DWORD WINAPI PwdSetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, DWORD status ) { - FIXME("%s %ld %ld\n", debugstr_w(lpProvider), dwIndex, status ); + FIXME("%s %d %d\n", debugstr_w(lpProvider), dwIndex, status ); return WN_SUCCESS; } @@ -267,7 +267,7 @@ */ DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOA info ) { - FIXME("%s %p %lx %p\n", debugstr_a(lpProvider), hWnd, flags, info ); + FIXME("%s %p %x %p\n", debugstr_a(lpProvider), hWnd, flags, info ); return WN_SUCCESS; } @@ -276,6 +276,6 @@ */ DWORD WINAPI PwdChangePasswordW( LPCWSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOW info ) { - FIXME("%s %p %lx %p\n", debugstr_w(lpProvider), hWnd, flags, info ); - return WN_SUCCESS; -} + FIXME("%s %p %x %p\n", debugstr_w(lpProvider), hWnd, flags, info ); + return WN_SUCCESS; +} Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c Mon Nov 27 00:36:50 2006 @@ -248,7 +248,7 @@ PASSWORD_CACHE_ENTRY *entry; CHAR val[256], prefix[6]; - WARN( "(%s, %d, %d, %p, 0x%08lx) totally insecure\n", + WARN( "(%s, %d, %d, %p, 0x%08x) totally insecure\n", debugstr_an(pbPrefix,cbPrefix), cbPrefix, nType, enumPasswordProc, param ); 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 Mon Nov 27 00:36:50 2006 @@ -166,7 +166,7 @@ provider->getCaps = getCaps; provider->dwSpecVersion = getCaps(WNNC_SPEC_VERSION); provider->dwNetType = getCaps(WNNC_NET_TYPE); - TRACE("net type is 0x%08lx\n", provider->dwNetType); + TRACE("net type is 0x%08x\n", provider->dwNetType); provider->dwEnumScopes = getCaps(WNNC_ENUMERATION); if (provider->dwEnumScopes) { @@ -520,7 +520,7 @@ } } ret = numToThunk < *lpcCount ? WN_MORE_DATA : WN_SUCCESS; - TRACE("numToThunk is %ld, *lpcCount is %ld, returning %ld\n", numToThunk, + TRACE("numToThunk is %d, *lpcCount is %d, returning %d\n", numToThunk, *lpcCount, ret); return ret; } @@ -605,7 +605,7 @@ } } ret = numToThunk < *lpcCount ? WN_MORE_DATA : WN_SUCCESS; - TRACE("numToThunk is %ld, *lpcCount is %ld, returning %ld\n", numToThunk, + TRACE("numToThunk is %d, *lpcCount is %d, returning %d\n", numToThunk, *lpcCount, ret); return ret; } @@ -620,7 +620,7 @@ { DWORD ret; - TRACE( "(%08lX, %08lX, %08lX, %p, %p)\n", + TRACE( "(%08X, %08X, %08X, %p, %p)\n", dwScope, dwType, dwUsage, lpNet, lphEnum ); if (!lphEnum) @@ -663,7 +663,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -709,7 +709,7 @@ { DWORD ret; - TRACE( "(%08lX, %08lX, %08lX, %p, %p)\n", + TRACE( "(%08X, %08X, %08X, %p, %p)\n", dwScope, dwType, dwUsage, lpNet, lphEnum ); if (!lphEnum) @@ -795,13 +795,13 @@ ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; default: - WARN("unknown scope 0x%08lx\n", dwScope); + WARN("unknown scope 0x%08x\n", dwScope); ret = WN_BAD_VALUE; } } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -856,7 +856,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -938,7 +938,7 @@ *lpcCount = count; ret = count > 0 ? WN_SUCCESS : WN_MORE_DATA; } - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1023,7 +1023,7 @@ enumerator->providerDone = TRUE; } } - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1062,10 +1062,10 @@ lpBufferSize); break; default: - WARN("unexpected scope 0x%08lx\n", enumerator->dwScope); + WARN("unexpected scope 0x%08x\n", enumerator->dwScope); ret = WN_NO_MORE_ENTRIES; } - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1167,7 +1167,7 @@ *lpBufferSize = bytesNeeded; } } - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1222,7 +1222,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1268,7 +1268,7 @@ ret = WN_BAD_HANDLE; if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1365,7 +1365,7 @@ LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %s, 0x%08lX): stub\n", + FIXME( "(%p, %p, %s, 0x%08X): stub\n", lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); SetLastError(WN_NO_NETWORK); @@ -1379,7 +1379,7 @@ LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %s, 0x%08lX): stub\n", + FIXME( "(%p, %p, %s, 0x%08X): stub\n", lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags ); SetLastError(WN_NO_NETWORK); @@ -1393,7 +1393,7 @@ LPCSTR lpPassword, LPCSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %p, %s, 0x%08lX), stub\n", + FIXME( "(%p, %p, %p, %s, 0x%08X), stub\n", hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags ); SetLastError(WN_NO_NETWORK); @@ -1407,7 +1407,7 @@ LPCWSTR lpPassword, LPCWSTR lpUserID, DWORD dwFlags ) { - FIXME( "(%p, %p, %p, %s, 0x%08lX), stub\n", + FIXME( "(%p, %p, %p, %s, 0x%08X), stub\n", hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags ); SetLastError(WN_NO_NETWORK); @@ -1422,7 +1422,7 @@ LPSTR lpAccessName, LPDWORD lpBufferSize, LPDWORD lpResult ) { - FIXME( "(%p, %p, %p, %s, 0x%08lX, %s, %p, %p), stub\n", + FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", hwndOwner, lpNetResource, lpPassword, debugstr_a(lpUserID), dwFlags, debugstr_a(lpAccessName), lpBufferSize, lpResult ); @@ -1438,7 +1438,7 @@ LPWSTR lpAccessName, LPDWORD lpBufferSize, LPDWORD lpResult ) { - FIXME( "(%p, %p, %p, %s, 0x%08lX, %s, %p, %p), stub\n", + FIXME( "(%p, %p, %p, %s, 0x%08X, %s, %p, %p), stub\n", hwndOwner, lpNetResource, lpPassword, debugstr_w(lpUserID), dwFlags, debugstr_w(lpAccessName), lpBufferSize, lpResult ); @@ -1471,7 +1471,7 @@ */ DWORD WINAPI WNetCancelConnection2A( LPCSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08lX, %d), stub\n", debugstr_a(lpName), dwFlags, fForce ); + FIXME( "(%s, %08X, %d), stub\n", debugstr_a(lpName), dwFlags, fForce ); return WN_SUCCESS; } @@ -1481,7 +1481,7 @@ */ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08lX, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); + FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); return WN_SUCCESS; } @@ -1603,7 +1603,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1666,7 +1666,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1676,7 +1676,7 @@ DWORD WINAPI WNetSetConnectionA( LPCSTR lpName, DWORD dwProperty, LPVOID pvValue ) { - FIXME( "(%s, %08lX, %p): stub\n", debugstr_a(lpName), dwProperty, pvValue ); + FIXME( "(%s, %08X, %p): stub\n", debugstr_a(lpName), dwProperty, pvValue ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; @@ -1688,7 +1688,7 @@ DWORD WINAPI WNetSetConnectionW( LPCWSTR lpName, DWORD dwProperty, LPVOID pvValue ) { - FIXME( "(%s, %08lX, %p): stub\n", debugstr_w(lpName), dwProperty, pvValue ); + FIXME( "(%s, %08X, %p): stub\n", debugstr_w(lpName), dwProperty, pvValue ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; @@ -1700,7 +1700,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, LPVOID lpBuffer, LPDWORD lpBufferSize ) { - FIXME( "(%s, 0x%08lX, %p, %p): stub\n", + FIXME( "(%s, 0x%08X, %p, %p): stub\n", debugstr_a(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); SetLastError(WN_NO_NETWORK); @@ -1716,7 +1716,7 @@ LPUNIVERSAL_NAME_INFOW uniw; DWORD err, len; - FIXME( "(%s, 0x%08lX, %p, %p): stub\n", + FIXME( "(%s, 0x%08X, %p, %p): stub\n", debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); switch (dwInfoLevel) @@ -1778,7 +1778,7 @@ */ DWORD WINAPI WNetConnectionDialog( HWND hwnd, DWORD dwType ) { - FIXME( "(%p, %08lX): stub\n", hwnd, dwType ); + FIXME( "(%p, %08X): stub\n", hwnd, dwType ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; @@ -1811,7 +1811,7 @@ */ DWORD WINAPI WNetDisconnectDialog( HWND hwnd, DWORD dwType ) { - FIXME( "(%p, %08lX): stub\n", hwnd, dwType ); + FIXME( "(%p, %08X): stub\n", hwnd, dwType ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; @@ -1846,7 +1846,7 @@ LPSTR lpErrorBuf, DWORD nErrorBufSize, LPSTR lpNameBuf, DWORD nNameBufSize ) { - FIXME( "(%p, %p, %ld, %p, %ld): stub\n", + FIXME( "(%p, %p, %d, %p, %d): stub\n", lpError, lpErrorBuf, nErrorBufSize, lpNameBuf, nNameBufSize ); SetLastError(WN_NO_NETWORK); @@ -1860,7 +1860,7 @@ LPWSTR lpErrorBuf, DWORD nErrorBufSize, LPWSTR lpNameBuf, DWORD nNameBufSize ) { - FIXME( "(%p, %p, %ld, %p, %ld): stub\n", + FIXME( "(%p, %p, %d, %p, %d): stub\n", lpError, lpErrorBuf, nErrorBufSize, lpNameBuf, nNameBufSize ); SetLastError(WN_NO_NETWORK); @@ -1903,7 +1903,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1951,7 +1951,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -1963,7 +1963,7 @@ { DWORD ret; - TRACE("(0x%08lx, %s, %p)\n", dwNetType, debugstr_a(lpProvider), + TRACE("(0x%08x, %s, %p)\n", dwNetType, debugstr_a(lpProvider), lpBufferSize); if (!lpProvider) @@ -2006,7 +2006,7 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); + TRACE("Returning %d\n", ret); return ret; } @@ -2018,7 +2018,7 @@ { DWORD ret; - TRACE("(0x%08lx, %s, %p)\n", dwNetType, debugstr_w(lpProvider), + TRACE("(0x%08x, %s, %p)\n", dwNetType, debugstr_w(lpProvider), lpBufferSize); if (!lpProvider) @@ -2059,6 +2059,6 @@ } if (ret) SetLastError(ret); - TRACE("Returning %ld\n", ret); - return ret; -} + TRACE("Returning %d\n", ret); + return ret; +}

1 0

[cwittich] 24845: handle IFable data
by cwittich＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: cwittich Date: Mon Nov 27 00:36:40 2006 New Revision: 24845 URL: http://svn.reactos.org/svn/reactos?rev=24845&view=rev Log: handle IFable data Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Mon Nov 27 00:36:40 2006 @@ -385,6 +385,16 @@ { const IfableData& data = *ifs_list.back(); ifs_list.pop_back(); + for ( i = 0; i < data.ifs.size(); i++ ) + { + const Property* property = _lookup_property( module, data.ifs[i]->property ); + if ( property != NULL ) + { + if ( data.ifs[i]->value == property->value && data.ifs[i]->negated == false || + data.ifs[i]->value != property->value && data.ifs[i]->negated) + ifs_list.push_back ( &data.ifs[i]->data ); + } + } const vector<File*>& files = data.files; for ( i = 0; i < files.size(); i++ ) { @@ -770,3 +780,24 @@ module.non_if_data.libraries.push_back ( pLibrary ); } } + +const Property* +CBBackend::_lookup_property ( const Module& module, const std::string& name ) const +{ + /* Check local values */ + for ( size_t i = 0; i < module.non_if_data.properties.size(); i++ ) + { + const Property& property = *module.non_if_data.properties[i]; + if ( property.name == name ) + return &property; + } + // TODO FIXME - should we check local if-ed properties? + for ( size_t i = 0; i < module.project.non_if_data.properties.size(); i++ ) + { + const Property& property = *module.project.non_if_data.properties[i]; + if ( property.name == name ) + return &property; + } + // TODO FIXME - should we check global if-ed properties? + return NULL; +}

1 0

[winesync] 24844: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: winesync Date: Mon Nov 27 00:19:02 2006 New Revision: 24844 URL: http://svn.reactos.org/svn/reactos?rev=24844&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/mapi32/imalloc.c trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/sendmail.c trunk/reactos/dll/win32/mapi32/util.c Modified: trunk/reactos/dll/win32/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c… ============================================================================== --- trunk/reactos/dll/win32/mapi32/imalloc.c (original) +++ trunk/reactos/dll/win32/mapi32/imalloc.c Mon Nov 27 00:19:02 2006 @@ -111,7 +111,7 @@ */ static LPVOID WINAPI IMAPIMalloc_fnAlloc(LPMALLOC iface, DWORD cb) { - TRACE("(%p)->(%ld)\n", iface, cb); + TRACE("(%p)->(%d)\n", iface, cb); return LocalAlloc(LMEM_FIXED, cb); } @@ -121,7 +121,7 @@ */ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) { - TRACE("(%p)->(%p, %ld)\n", iface, pv, cb); + TRACE("(%p)->(%p, %d)\n", iface, pv, cb); if (!pv) return LocalAlloc(LMEM_FIXED, cb); Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c Mon Nov 27 00:19:02 2006 @@ -37,7 +37,7 @@ */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("(%p,%ld,%p)\n", hinstDLL, fdwReason, fImpLoad); + TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); switch (fdwReason) { @@ -45,7 +45,7 @@ DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: - TRACE("DLL_PROCESS_DETACH: %ld objects remaining\n", MAPI_ObjectCount); + TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); break; } return TRUE; @@ -77,7 +77,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - FIXME("(0x%08lx %s %p 0x%08lx 0x%08lx %p) Stub\n", uiparam, + FIXME("(0x%08lx %s %p 0x%08lx 0x%08x %p) Stub\n", uiparam, debugstr_a(profile), password, flags, reserved, session); if (session) *session = 1; @@ -87,7 +87,7 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { - FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08lx) Stub\n", session, + FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08x) Stub\n", session, uiparam, flags, reserved); return SUCCESS_SUCCESS; } @@ -95,7 +95,7 @@ HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, LPWSTR password, ULONG flags, LPMAPISESSION *session) { - FIXME("(0x%08lx %s %p 0x%08lx %p) Stub\n", uiparam, + FIXME("(0x%08lx %s %p 0x%08x %p) Stub\n", uiparam, debugstr_w(profile), password, flags, session); return SUCCESS_SUCCESS; } 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 Mon Nov 27 00:19:02 2006 @@ -125,7 +125,7 @@ break; /* Note that we could allocate the memory for each value in a - * multi-value property seperately, however if an allocation failed + * multi-value property separately, however if an allocation failed * we would be left with a bunch of allocated memory, which (while * not really leaked) is unusable until lpOrig is freed. So for * strings and binary arrays we make a single allocation for all @@ -293,7 +293,7 @@ */ BOOL WINAPI FPropContainsProp(LPSPropValue lpHaystack, LPSPropValue lpNeedle, ULONG ulFuzzy) { - TRACE("(%p,%p,0x%08lx)\n", lpHaystack, lpNeedle, ulFuzzy); + TRACE("(%p,%p,0x%08x)\n", lpHaystack, lpNeedle, ulFuzzy); if (FBadProp(lpHaystack) || FBadProp(lpNeedle) || PROP_TYPE(lpHaystack->ulPropTag) != PROP_TYPE(lpNeedle->ulPropTag)) @@ -394,7 +394,7 @@ { LONG iCmp; - TRACE("(%p,%ld,%p)\n", lpPropLeft, ulOp, lpPropRight); + TRACE("(%p,%d,%p)\n", lpPropLeft, ulOp, lpPropRight); if (ulOp > RELOP_RE || FBadProp(lpPropLeft) || FBadProp(lpPropRight)) return FALSE; @@ -436,7 +436,7 @@ { LONG iRet; - TRACE("(%p->0x%08lx,%p->0x%08lx)\n", lpPropLeft, lpPropLeft->ulPropTag, + TRACE("(%p->0x%08x,%p->0x%08x)\n", lpPropLeft, lpPropLeft->ulPropTag, lpPropRight, lpPropRight->ulPropTag); /* If the properties are not the same, sort by property type */ @@ -508,7 +508,7 @@ return memcmp(lpPropLeft->Value.lpguid, lpPropRight->Value.lpguid, sizeof(GUID)); } - FIXME("Unhandled property type %ld", PROP_TYPE(lpPropLeft->ulPropTag)); + FIXME("Unhandled property type %d\n", PROP_TYPE(lpPropLeft->ulPropTag)); return 0; } @@ -532,7 +532,7 @@ ULONG ulCount; HRESULT hRet; - TRACE("(%p,%ld,%p)\n", lpIProp, ulPropTag, lppProp); + TRACE("(%p,%d,%p)\n", lpIProp, ulPropTag, lppProp); pta.cValues = 1u; pta.aulPropTag[0] = ulPropTag; @@ -587,7 +587,7 @@ { BOOL bRet = FALSE; - TRACE("(%p,%ld)\n", lpIProp, ulPropTag); + TRACE("(%p,%d)\n", lpIProp, ulPropTag); if (lpIProp) { @@ -632,7 +632,7 @@ */ LPSPropValue WINAPI PpropFindProp(LPSPropValue lpProps, ULONG cValues, ULONG ulPropTag) { - TRACE("(%p,%ld,%ld)\n", lpProps, cValues, ulPropTag); + TRACE("(%p,%d,%d)\n", lpProps, cValues, ulPropTag); if (lpProps && cValues) { @@ -1068,7 +1068,7 @@ */ LPSPropValue WINAPI LpValFindProp(ULONG ulPropTag, ULONG cValues, LPSPropValue lpProps) { - TRACE("(%ld,%ld,%p)\n", ulPropTag, cValues, lpProps); + TRACE("(%d,%d,%p)\n", ulPropTag, cValues, lpProps); if (lpProps && cValues) { @@ -1132,7 +1132,7 @@ { ULONG i; - TRACE("(%p,%ld)\n", lppszStrs, ulCount); + TRACE("(%p,%d)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1157,7 +1157,7 @@ { ULONG i; - TRACE("(%p,%ld)\n", lppszStrs, ulCount); + TRACE("(%p,%d)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1213,7 +1213,7 @@ */ ULONG WINAPI FBadPropTag(ULONG ulPropTag) { - TRACE("(0x%08lx)\n", ulPropTag); + TRACE("(0x%08x)\n", ulPropTag); switch (ulPropTag & (~MV_FLAG & PROP_TYPE_MASK)) { @@ -1437,7 +1437,7 @@ lpNew = lpMem; lpNew->ulAccess = IPROP_READWRITE; - /* Allocate the value seperately so we can update it easily */ + /* Allocate the value separately so we can update it easily */ lpMem = NULL; hRet = This->lpAlloc(sizeof(SPropValue), &lpMem); if (SUCCEEDED(hRet)) @@ -1521,7 +1521,7 @@ { IPropDataImpl *This = (IPropDataImpl*)iface; - TRACE("(%p)->(count before=%lu)\n", This, This->lRef); + TRACE("(%p)->(count before=%u)\n", This, This->lRef); return InterlockedIncrement(&This->lRef); } @@ -1537,7 +1537,7 @@ IPropDataImpl *This = (IPropDataImpl*)iface; LONG lRef; - TRACE("(%p)->(count before=%lu)\n", This, This->lRef); + TRACE("(%p)->(count before=%u)\n", This, This->lRef); lRef = InterlockedDecrement(&This->lRef); if (!lRef) @@ -1562,7 +1562,7 @@ /************************************************************************** * IMAPIProp_GetLastError {MAPI32} * - * Get information about the last error that ocurred in an IMAPIProp object. + * Get information about the last error that occurred in an IMAPIProp object. * * PARAMS * iface [I] IMAPIProp object that experienced the error @@ -1585,7 +1585,7 @@ IMAPIProp_fnGetLastError(LPMAPIPROP iface, HRESULT hRes, ULONG ulFlags, LPMAPIERROR *lppError) { - TRACE("(%p,0x%08lX,0x%08lX,%p)\n", iface, hRes, ulFlags, lppError); + TRACE("(%p,0x%08X,0x%08X,%p)\n", iface, hRes, ulFlags, lppError); if (!lppError || SUCCEEDED(hRes) || (ulFlags & ~MAPI_UNICODE)) return MAPI_E_INVALID_PARAMETER; @@ -1610,7 +1610,7 @@ static inline HRESULT WINAPI IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags) { - TRACE("(%p,0x%08lX)\n", iface, ulFlags); + TRACE("(%p,0x%08X)\n", iface, ulFlags); /* Since this object is not transacted we do not need to implement this */ /* FIXME: Should we set the access levels to clean? */ @@ -1649,7 +1649,7 @@ HRESULT hRet = S_OK; IPropDataImpl *This = (IPropDataImpl*)iface; - TRACE("(%p,%p,0x%08lx,%p,%p) stub\n", iface, lpTags, ulFlags, + TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags, lpCount, lppProps); if (!iface || ulFlags & ~MAPI_UNICODE || !lpTags || *lpCount || !lppProps) @@ -1716,7 +1716,7 @@ ULONG i; HRESULT hRet; - TRACE("(%p,0x%08lx,%p) stub\n", iface, ulFlags, lppTags); + TRACE("(%p,0x%08x,%p) stub\n", iface, ulFlags, lppTags); if (!iface || ulFlags & ~MAPI_UNICODE || !lppTags) return MAPI_E_INVALID_PARAMETER; @@ -1759,7 +1759,7 @@ IMAPIProp_fnOpenProperty(LPMAPIPROP iface, ULONG ulPropTag, LPCIID iid, ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) { - FIXME("(%p,%lu,%s,%lu,0x%08lx,%p) stub\n", iface, ulPropTag, + FIXME("(%p,%u,%s,%u,0x%08x,%p) stub\n", iface, ulPropTag, debugstr_guid(iid), ulOpts, ulFlags, lpUnk); return MAPI_E_NO_SUPPORT; } @@ -1789,7 +1789,7 @@ HRESULT hRet = S_OK; ULONG i; - TRACE("(%p,%lu,%p,%p)\n", iface, ulValues, lpProps, lppProbs); + TRACE("(%p,%u,%p,%p)\n", iface, ulValues, lpProps, lppProbs); if (!iface || !lpProps) return MAPI_E_INVALID_PARAMETER; @@ -1958,7 +1958,7 @@ LPMAPIPROGRESS lpIProgress, LPCIID lpIfaceIid, LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%lu,%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, niids, + FIXME("(%p,%u,%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, niids, lpiidExcl, lpPropsExcl, ulParam, lpIProgress, debugstr_guid(lpIfaceIid), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -1978,7 +1978,7 @@ LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, lpInclProps, + FIXME("(%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, lpInclProps, ulParam, lpIProgress, debugstr_guid(lpIface), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -2012,7 +2012,7 @@ LPGUID iid, ULONG ulFlags, ULONG *lpCount, LPMAPINAMEID **lpppNames) { - FIXME("(%p,%p,%s,0x%08lX,%p,%p) stub\n", iface, lppPropTags, + FIXME("(%p,%p,%s,0x%08X,%p,%p) stub\n", iface, lppPropTags, debugstr_guid(iid), ulFlags, lpCount, lpppNames); return MAPI_E_NO_SUPPORT; } @@ -2043,7 +2043,7 @@ LPMAPINAMEID *lppNames, ULONG ulFlags, LPSPropTagArray *lppPropTags) { - FIXME("(%p,%ld,%p,0x%08lX,%p) stub\n", + FIXME("(%p,%d,%p,0x%08X,%p) stub\n", iface, ulNames, lppNames, ulFlags, lppPropTags); return MAPI_E_NO_SUPPORT; } @@ -2275,7 +2275,7 @@ { IPropDataImpl *This = (IPropDataImpl*)iface; - TRACE("(%p,%lx)\n", iface, ulAccess); + TRACE("(%p,%x)\n", iface, ulAccess); if (!iface || ulAccess < IPROP_READONLY || ulAccess > IPROP_READWRITE) return MAPI_E_INVALID_PARAMETER; Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c Mon Nov 27 00:19:02 2006 @@ -71,7 +71,7 @@ HRESULT res; DWORD size; - TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08lx)\n", session, uiparam, + TRACE( "(0x%08lx 0x%08lx %p 0x%08lx 0x%08x)\n", session, uiparam, message, flags, reserved ); if (!message) return MAPI_E_FAILURE; @@ -90,22 +90,22 @@ switch (message->lpRecips[i].ulRecipClass) { case MAPI_ORIG: - TRACE( "From: %s", debugstr_a(address) ); + TRACE( "From: %s\n", debugstr_a(address) ); break; case MAPI_TO: - TRACE( "To: %s", debugstr_a(address) ); + TRACE( "To: %s\n", debugstr_a(address) ); to_size += lstrlenA( address ) + 1; break; case MAPI_CC: - TRACE( "Cc: %s", debugstr_a(address) ); + TRACE( "Cc: %s\n", debugstr_a(address) ); cc_size += lstrlenA( address ) + 1; break; case MAPI_BCC: - TRACE( "Bcc: %s", debugstr_a(address) ); + TRACE( "Bcc: %s\n", debugstr_a(address) ); bcc_size += lstrlenA( address ) + 1; break; default: - TRACE( "Unknown recipient class: %ld\n", + TRACE( "Unknown recipient class: %d\n", message->lpRecips[i].ulRecipClass ); } } Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c (original) +++ trunk/reactos/dll/win32/mapi32/util.c Mon Nov 27 00:19:02 2006 @@ -64,7 +64,7 @@ */ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) { - FIXME("(0x%08lx)stub!\n", ulReserved); + FIXME("(0x%08x)stub!\n", ulReserved); if (ulReserved) return MAPI_E_INVALID_PARAMETER; return S_OK; @@ -118,7 +118,7 @@ { LPMAPIALLOCBUFFER lpBuff; - TRACE("(%ld,%p)\n", cbSize, lppBuffer); + TRACE("(%d,%p)\n", cbSize, lppBuffer); if (!lppBuffer) return E_INVALIDARG; @@ -158,7 +158,7 @@ { LPMAPIALLOCBUFFER lpBuff = lpOrig; - TRACE("(%ld,%p,%p)\n", cbSize, lpOrig, lppBuffer); + TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer); if (!lppBuffer || !lpBuff || !--lpBuff) return E_INVALIDARG; @@ -436,7 +436,7 @@ { INT ret; - TRACE("0x%08lx,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); + TRACE("0x%08x,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); ret = MNLS_lstrcmpW(lpszLeft, lpszRight); return ret < 0 ? CSTR_LESS_THAN : ret ? CSTR_GREATER_THAN : CSTR_EQUAL; } @@ -688,7 +688,7 @@ DWORD dwMode = STGM_READWRITE, dwAttributes = 0; HRESULT hRet; - TRACE("(%p,%p,0x%08lx,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, + TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream); if (lppStream) @@ -732,7 +732,7 @@ */ ULONG WINAPI UlFromSzHex(LPCWSTR lpszHex) { - LPSTR lpStr = (LPSTR)lpszHex; + LPCSTR lpStr = (LPCSTR)lpszHex; ULONG ulRet = 0; TRACE("(%s)\n", debugstr_a(lpStr)); @@ -820,7 +820,7 @@ CMC_buffer reference, CMC_extension *config_extensions) { - FIXME("stub"); + FIXME("stub\n"); return CMC_E_NOT_SUPPORTED; } @@ -851,7 +851,7 @@ BOOL ret = FALSE; HMODULE hmsi; - TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install); + TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install); dll_path[0] = 0;

1 0

[winesync] 24843: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: winesync Date: Mon Nov 27 00:05:00 2006 New Revision: 24843 URL: http://svn.reactos.org/svn/reactos?rev=24843&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/imm32/imm.c 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 Mon Nov 27 00:05:00 2006 @@ -133,7 +133,7 @@ { HMODULE x11drv; - TRACE("%p, %lx, %p\n",hInstDLL,fdwReason,lpReserved); + TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -259,7 +259,7 @@ */ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) { - FIXME("(%p, %p, %ld): stub\n", hWnd, hIMC, dwFlags); + FIXME("(%p, %p, %d): stub\n", hWnd, hIMC, dwFlags); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -270,7 +270,7 @@ BOOL WINAPI ImmConfigureIMEA( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME("(%p, %p, %ld, %p): stub\n", + FIXME("(%p, %p, %d, %p): stub\n", hKL, hWnd, dwMode, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -283,7 +283,7 @@ BOOL WINAPI ImmConfigureIMEW( HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { - FIXME("(%p, %p, %ld, %p): stub\n", + FIXME("(%p, %p, %d, %p): stub\n", hKL, hWnd, dwMode, lpData ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -339,7 +339,7 @@ */ BOOL WINAPI ImmDisableIME(DWORD idThread) { - FIXME("(%ld): stub\n", idThread); + FIXME("(%d): stub\n", idThread); return TRUE; } @@ -351,7 +351,7 @@ LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister, LPVOID lpData) { - FIXME("(%p, %p, %s, %ld, %s, %p): stub\n", + FIXME("(%p, %p, %s, %d, %s, %p): stub\n", hKL, lpfnEnumProc, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister), lpData @@ -368,7 +368,7 @@ LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister, LPVOID lpData) { - FIXME("(%p, %p, %s, %ld, %s, %p): stub\n", + FIXME("(%p, %p, %s, %d, %s, %p): stub\n", hKL, lpfnEnumProc, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister), lpData @@ -412,7 +412,7 @@ HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME("(%p, %ld, %p, %ld): stub\n", + FIXME("(%p, %d, %p, %d): stub\n", hIMC, deIndex, lpCandList, dwBufLen ); @@ -449,7 +449,7 @@ HIMC hIMC, DWORD deIndex, LPCANDIDATELIST lpCandList, DWORD dwBufLen) { - FIXME("(%p, %ld, %p, %ld): stub\n", + FIXME("(%p, %d, %p, %d): stub\n", hIMC, deIndex, lpCandList, dwBufLen ); @@ -463,7 +463,7 @@ BOOL WINAPI ImmGetCandidateWindow( HIMC hIMC, DWORD dwBufLen, LPCANDIDATEFORM lpCandidate) { - FIXME("(%p, %ld, %p): stub\n", hIMC, dwBufLen, lpCandidate); + FIXME("(%p, %d, %p): stub\n", hIMC, dwBufLen, lpCandidate); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -498,14 +498,14 @@ LONG rc = 0; InputContextData *data = (InputContextData*)hIMC; - TRACE("(%p, 0x%lx, %p, %ld)\n", hIMC, dwIndex, lpBuf, dwBufLen); + TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen); if (!data) return FALSE; if (dwIndex == GCS_RESULTSTR) { - TRACE("GSC_RESULTSTR %p %li\n",data->ResultString, + TRACE("GSC_RESULTSTR %p %i\n",data->ResultString, data->dwResultStringSize); buf = HeapAlloc( GetProcessHeap(), 0, data->dwResultStringSize * 3 ); @@ -520,8 +520,7 @@ } else if (dwIndex == GCS_COMPSTR) { - TRACE("GSC_COMPSTR %p %li\n",data->CompositionString, - data->dwCompStringLength/ sizeof(WCHAR)); + TRACE("GSC_COMPSTR %p %i\n", data->CompositionString, data->dwCompStringLength); buf = HeapAlloc( GetProcessHeap(), 0, data->dwCompStringLength * 3 ); rc = WideCharToMultiByte(CP_ACP, 0,(LPWSTR)data->CompositionString, @@ -533,8 +532,7 @@ } else if (dwIndex == GCS_COMPATTR) { - TRACE("GSC_COMPATTR %p %li\n",data->CompositionString, - data->dwCompStringLength/ sizeof(WCHAR)); + TRACE("GSC_COMPATTR %p %i\n", data->CompositionString, data->dwCompStringLength); rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString, data->dwCompStringLength/ sizeof(WCHAR), NULL, @@ -549,8 +547,7 @@ } else if (dwIndex == GCS_COMPCLAUSE) { - TRACE("GSC_COMPCLAUSE %p %li\n",data->CompositionString, - data->dwCompStringLength/ sizeof(WCHAR)); + TRACE("GSC_COMPCLAUSE %p %i\n", data->CompositionString, data->dwCompStringLength); rc = WideCharToMultiByte(CP_ACP, 0, (LPWSTR)data->CompositionString, data->dwCompStringLength/ sizeof(WCHAR), NULL, @@ -565,7 +562,7 @@ } else { - FIXME("Unhandled index 0x%lx\n",dwIndex); + FIXME("Unhandled index 0x%x\n",dwIndex); } return rc; @@ -581,7 +578,7 @@ LONG rc = 0; InputContextData *data = (InputContextData*)hIMC; - TRACE("(%p, 0x%lx, %p, %ld)\n", hIMC, dwIndex, lpBuf, dwBufLen); + TRACE("(%p, 0x%x, %p, %d)\n", hIMC, dwIndex, lpBuf, dwBufLen); if (!data) return FALSE; @@ -642,7 +639,7 @@ } else { - FIXME("Unhandled index 0x%lx\n",dwIndex); + FIXME("Unhandled index 0x%x\n",dwIndex); } return rc; @@ -687,7 +684,7 @@ LPCSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME("(%p, %p, %s, %p, %ld, %d): stub\n", + FIXME("(%p, %p, %s, %p, %d, %d): stub\n", hKL, hIMC, debugstr_a(pSrc), lpDst, dwBufLen, uFlag ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -702,7 +699,7 @@ LPCWSTR pSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag) { - FIXME("(%p, %p, %s, %p, %ld, %d): stub\n", + FIXME("(%p, %p, %s, %p, %d, %d): stub\n", hKL, hIMC, debugstr_w(pSrc), lpDst, dwBufLen, uFlag ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -796,7 +793,7 @@ DWORD WINAPI ImmGetGuideLineA( HIMC hIMC, DWORD dwIndex, LPSTR lpBuf, DWORD dwBufLen) { - FIXME("(%p, %ld, %s, %ld): stub\n", + FIXME("(%p, %d, %s, %d): stub\n", hIMC, dwIndex, debugstr_a(lpBuf), dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -808,7 +805,7 @@ */ DWORD WINAPI ImmGetGuideLineW(HIMC hIMC, DWORD dwIndex, LPWSTR lpBuf, DWORD dwBufLen) { - FIXME("(%p, %ld, %s, %ld): stub\n", + FIXME("(%p, %d, %s, %d): stub\n", hIMC, dwIndex, debugstr_w(lpBuf), dwBufLen ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -857,7 +854,7 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) { DWORD rc = 0; - TRACE("(%p, %ld)\n", hKL, fdwIndex); + TRACE("(%p, %d)\n", hKL, fdwIndex); switch (fdwIndex) { @@ -942,7 +939,7 @@ case VER_PLATFORM_WIN32_NT: return 0; default: - FIXME("%ld not supported\n",version.dwPlatformId); + FIXME("%d not supported\n",version.dwPlatformId); return VK_PROCESSKEY; } } @@ -1046,7 +1043,7 @@ { BOOL rc = FALSE; - TRACE("(%p, %ld, %ld, %ld)\n", + TRACE("(%p, %d, %d, %d)\n", hIMC, dwAction, dwIndex, dwValue); if (!root_context) @@ -1124,7 +1121,7 @@ FIXME("%s - %s\n","NI_COMPOSITIONSTR","CPS_REVERT"); break; default: - ERR("%s - %s (%li)\n","NI_COMPOSITIONSTR","UNKNOWN",dwIndex); + ERR("%s - %s (%i)\n","NI_COMPOSITIONSTR","UNKNOWN",dwIndex); break; } break; @@ -1156,7 +1153,7 @@ BOOL WINAPI ImmRegisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister) { - FIXME("(%p, %s, %ld, %s): stub\n", + FIXME("(%p, %s, %d, %s): stub\n", hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszRegister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1169,7 +1166,7 @@ BOOL WINAPI ImmRegisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegister) { - FIXME("(%p, %s, %ld, %s): stub\n", + FIXME("(%p, %s, %d, %s): stub\n", hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszRegister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1261,7 +1258,7 @@ WCHAR *ReadBuffer = NULL; BOOL rc; - TRACE("(%p, %ld, %p, %ld, %p, %ld): stub\n", + TRACE("(%p, %d, %p, %d, %p, %d): stub\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0); @@ -1298,7 +1295,7 @@ DWORD flags = 0; WCHAR wParam = 0; - TRACE("(%p, %ld, %p, %ld, %p, %ld): stub\n", + TRACE("(%p, %d, %p, %d, %p, %d): stub\n", hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); @@ -1361,7 +1358,7 @@ InputContextData *data = (InputContextData*)hIMC; TRACE("(%p, %p)\n", hIMC, lpCompForm); - TRACE("\t%lx, (%li,%li), (%li,%li - %li,%li)\n",lpCompForm->dwStyle, + TRACE("\t%x, (%i,%i), (%i,%i - %i,%i)\n",lpCompForm->dwStyle, lpCompForm->ptCurrentPos.x, lpCompForm->ptCurrentPos.y, lpCompForm->rcArea.top, lpCompForm->rcArea.left, lpCompForm->rcArea.bottom, lpCompForm->rcArea.right); @@ -1391,7 +1388,7 @@ BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { - FIXME("(%p, %ld, %ld): stub\n", + FIXME("(%p, %d, %d): stub\n", hIMC, fdwConversion, fdwSentence ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1461,7 +1458,7 @@ */ BOOL WINAPI ImmSimulateHotKey(HWND hWnd, DWORD dwHotKeyID) { - FIXME("(%p, %ld): stub\n", hWnd, dwHotKeyID); + FIXME("(%p, %d): stub\n", hWnd, dwHotKeyID); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1472,7 +1469,7 @@ BOOL WINAPI ImmUnregisterWordA( HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregister) { - FIXME("(%p, %s, %ld, %s): stub\n", + FIXME("(%p, %s, %d, %s): stub\n", hKL, debugstr_a(lpszReading), dwStyle, debugstr_a(lpszUnregister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -1485,7 +1482,7 @@ BOOL WINAPI ImmUnregisterWordW( HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnregister) { - FIXME("(%p, %s, %ld, %s): stub\n", + FIXME("(%p, %s, %d, %s): stub\n", hKL, debugstr_w(lpszReading), dwStyle, debugstr_w(lpszUnregister) ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

1 0

[winesync] 24842: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: winesync Date: Mon Nov 27 00:04:10 2006 New Revision: 24842 URL: http://svn.reactos.org/svn/reactos?rev=24842&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 Mon Nov 27 00:04:10 2006 @@ -29,7 +29,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_WINE_PREATTACH:

1 0

[janderwald] 24841: -only include files where if Property == value || If not Property != value - example win32k.rbuild: <ifnot property="ARCH" value="i386"> <file>dib24bppc.c</file> <file>dib32bppc.c</file> </ifnot>
by janderwald＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: janderwald Date: Sun Nov 26 23:05:42 2006 New Revision: 24841 URL: http://svn.reactos.org/svn/reactos?rev=24841&view=rev Log: -only include files where if Property == value || If not Property != value - example win32k.rbuild: <ifnot property="ARCH" value="i386"> <file>dib24bppc.c</file> <file>dib32bppc.c</file> </ifnot> Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sun Nov 26 23:05:42 2006 @@ -70,7 +70,7 @@ { size_t i; - string vcproj_file = VcprojFileName(module); + string vcproj_file = VcprojFileName(module); string username = getenv ( "USERNAME" ); string computername = getenv ( "COMPUTERNAME" ); @@ -133,7 +133,8 @@ const Property* property = _lookup_property( module, data.ifs[i]->property ); if ( property != NULL ) { - if ( data.ifs[i]->value == property->value || data.ifs[i]->negated ) + if ( data.ifs[i]->value == property->value && data.ifs[i]->negated == false || + data.ifs[i]->value != property->value && data.ifs[i]->negated) ifs_list.push_back ( &data.ifs[i]->data ); } }

1 0

[cwittich] 24840: compile asm files
by cwittich＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: cwittich Date: Sun Nov 26 21:27:21 2006 New Revision: 24840 URL: http://svn.reactos.org/svn/reactos?rev=24840&view=rev Log: compile asm files Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Sun Nov 26 21:27:21 2006 @@ -659,6 +659,13 @@ string source_file = DosSeparator(source_files[isrcfile]); fprintf ( OUT, "\t\t<Unit filename=\"%s\">\r\n", source_file.c_str() ); fprintf ( OUT, "\t\t\t<Option compilerVar=\"%s\" />\r\n", CompilerVar.c_str() ); + + string extension = GetExtension ( source_file ); + if ( extension == ".s" || extension == ".S" ) + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"gcc -x assembler-with-cpp -c $file -o $link_objects $includes -D__ASM__ $options\" />\r\n" ); + if ( extension == ".asm" || extension == ".ASM" ) + fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\" buildCommand=\"nasm -f win32 $file -o $link_objects\" />\r\n" ); + for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ ) { const CBConfiguration& cfg = *m_configurations[icfg];

1 0

[cwittich] 24839: use correct path for import libs
by cwittich＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: cwittich Date: Sun Nov 26 19:57:25 2006 New Revision: 24839 URL: http://svn.reactos.org/svn/reactos?rev=24839&view=rev Log: use correct path for import libs Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Sun Nov 26 19:57:25 2006 @@ -407,7 +407,7 @@ const vector<Library*>& libs = data.libraries; for ( i = 0; i < libs.size(); i++ ) { - string libpath = outdir + "\\" + libs[i]->importedModule->GetBasePath() + "\\" + libs[i]->name; + string libpath = outdir + "\\" + libs[i]->importedModule->GetBasePath(); libraries.push_back ( libs[i]->name ); libpaths.push_back ( libpath ); }

1 0

[cwittich] 24838: -properly handle dependencies -compile startup libs with -Wno-main
by cwittich＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: cwittich Date: Sun Nov 26 17:20:55 2006 New Revision: 24838 URL: http://svn.reactos.org/svn/reactos?rev=24838&view=rev Log: -properly handle dependencies -compile startup libs with -Wno-main Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Sun Nov 26 17:20:55 2006 @@ -304,8 +304,22 @@ Module& module = *ProjectNode.modules[i]; std::string Cbp_file = CbpFileName ( module ); - fprintf ( OUT, "\t\t<Project filename=\"%s\" />\r\n", Cbp_file.c_str()); + fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); + /* dependencies */ + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + const vector<Library*>& libs = data.libraries; + for ( size_t j = 0; j < libs.size(); j++ ) + fprintf ( OUT, "\t\t\t<Depends filename=\"%s\\%s_auto.cbp\" />\r\n", libs[j]->importedModule->GetBasePath().c_str(), libs[j]->name.c_str() ); + } + fprintf ( OUT, "\t\t</Project>\r\n" ); + } fprintf ( OUT, "\t</Workspace>\r\n" ); fprintf ( OUT, "</CodeBlocks_workspace_file>\r\n" ); @@ -432,21 +446,9 @@ if ( !module.allowWarnings ) compiler_flags.push_back ( "-Werror" ); - ///* implicit libraries */ - //libraries.push_back ( "mingw_common" ); - //libpaths.push_back ( module.project.LocateModule("mingw_common") ); - - //if ( !Module.IsDll ) - //{ - // libraries.push_back ( "%s", module.isUnicode ? "mingw_wmain" : "mingw_main" ); - // libpaths.push_back ( module.project.LocateModule("%s"), module.isUnicode ? "mingw_wmain" : "mingw_main" ); - //} - - //if ( module.name != "msvcrt" ) - //{ - // libraries.push_back ( "msvcrt" ); - // libpaths.push_back ( module.project.LocateModule("msvcrt") ); - //} + if ( module.type == StaticLibrary && module.isStartupLib ) + compiler_flags.push_back ( "-Wno-main" ); + FILE* OUT = fopen ( cbproj_file.c_str(), "wb" ); @@ -603,7 +605,7 @@ if ( dll ) { fprintf ( OUT, "\t\t\t\t<ExtraCommands>\r\n" ); - fprintf ( OUT, "<Add before=\"dlltool --dllname %s%s --def %s.def --output-exp %s.temp.exp --kill-at\" />\r\n", module.name.c_str(), module_type.c_str(), module.name.c_str(), module.name.c_str() ); + fprintf ( OUT, "\t\t\t\t\t<Add before=\"dlltool --dllname %s%s --def %s --output-exp %s.temp.exp --kill-at\" />\r\n", module.name.c_str(), module_type.c_str(), module.importLibrary->definition.c_str(), module.name.c_str() ); #ifdef WIN32 fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del %s.temp.exp 2>NUL\" />\r\n", module.name.c_str() ); #else

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
33
Older →

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 November 2006