Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[dreimer] 31881: Bug 2944: Last fixes for Polish Translation. Translates the new Strings which came with my sync to the English RC Files, which are more up to date. Thx to Caemyr
by dreimer＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: dreimer Date: Sat Jan 19 02:41:53 2008 New Revision: 31881 URL: http://svn.reactos.org/svn/reactos?rev=31881&view=rev Log: Bug 2944: Last fixes for Polish Translation. Translates the new Strings which came with my sync to the English RC Files, which are more up to date. Thx to Caemyr Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/pl-PL.rc Sat Jan 19 02:41:53 2008 @@ -119,8 +119,8 @@ STRINGTABLE BEGIN - IDS_ASSIGNED_DHCP "Assigned by DHCP" - IDS_ASSIGNED_MANUAL "Manually configured" + IDS_ASSIGNED_DHCP "Przydzielony przez DHCP" + IDS_ASSIGNED_MANUAL "Ustawiony rêcznie" END STRINGTABLE Modified: trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/pl-P… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/timedate/lang/pl-PL.rc Sat Jan 19 02:41:53 2008 @@ -3,6 +3,8 @@ * update by xrogers (13.04.2007) * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl +* +* update by Caemyr - Olaf Siejka (Jan, 2008) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -68,6 +70,6 @@ IDS_TIMEZONEUNKNOWN "Nieznana" IDS_INETTIMESUCSYNC "Zegar zosta³ pomylnie zsynchronizowany z %s w dniu %s o %s" IDS_INETTIMENEXTSYNC "Nastêpna synchronizacja w dniu %s o %s" - IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" - IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" + IDS_INETTIMESYNCING "Proszê czekaæ, gdy ReactOS zsynchronizuje czas z %s" + IDS_INETTIMEERROR "Wyst¹pi³ b³¹d podczas gdy ReactOS synchronizowa³ czas z %s" END Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc Sat Jan 19 02:41:53 2008 @@ -3,6 +3,8 @@ * update by xrogers (13.04.2007) * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl +* +* updates by Caemyr - Olaf Siejka (Jan, 2008) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -29,9 +31,9 @@ IDS_PROPERTIES "W³aciwoc&i" IDS_UPDATEDRV "&Aktualizuj sterownik..." IDS_REBOOT "&Uruchom komputer ponownie..." - IDS_NOTAVAILABLE "Not available" - IDS_NOTDIGITALLYSIGNED "Not digitally signed" - IDS_NODRIVERS "No driver files are required or have been loaded for this device." + IDS_NOTAVAILABLE "Niedostêpne" + IDS_NOTDIGITALLYSIGNED "Niepodpisany cyfrowo" + IDS_NODRIVERS "¯adne pliki sterownika nie s¹ potrzebne albo nie zosta³y za³adowane dla tego urz¹dzenia." END /* error messages, source: http://www.z123.org/techsupport/medm.htm */ @@ -146,10 +148,11 @@ EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Wersja sterownika:", -1, 37, 67, 60, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX + LTEXT "Podpis cyfrowy:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 - LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Szczegó³y sterownika...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + LTEXT "Wywietla informacje szczegó³owe.", -1, 91, 110, 154, 17, SS_NOPREFIX END +

1 0

[jimtabor] 31880: Enable
by jimtabor＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: jimtabor Date: Sat Jan 19 02:07:14 2008 New Revision: 31880 URL: http://svn.reactos.org/svn/reactos?rev=31880&view=rev Log: Enable Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Jan 19 02:07:14 2008 @@ -1,3 +1,4 @@ + /* * ReactOS W32 Subsystem * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team @@ -927,7 +928,6 @@ FASTCALL IntGdiDeleteDC(HDC hDC, BOOL Force) { - BOOL Ret = FALSE; PDC DCToDelete = DC_LockDc(hDC); if (DCToDelete == NULL) @@ -942,8 +942,7 @@ { DPRINT1("No! You Naughty Application!\n"); DC_UnlockDc( DCToDelete ); -// if(!UserReleaseDC(NULL, hDC, FALSE)) Ret = FALSE; - return Ret; + return UserReleaseDC(NULL, hDC, FALSE); } }

1 0

[cfinck] 31879: Download AbiWord 2.4.6 instead of 2.5.2 (2.5.2 is a development version, 2.4.6 the latest stable one)
by cfinck＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cfinck Date: Sat Jan 19 01:46:29 2008 New Revision: 31879 URL: http://svn.reactos.org/svn/reactos?rev=31879&view=rev Log: Download AbiWord 2.4.6 instead of 2.5.2 (2.5.2 is a development version, 2.4.6 the latest stable one) Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Sat Jan 19 01:46:29 2008 @@ -72,10 +72,10 @@ </category> <category name="Office" icon="2"> <application name="Abiword"> - <regname>"AbiWord 2.5.2 (remove only)"</regname> - <version>2.5.2</version> + <regname>"AbiWord 2.4.6 (remove only)"</regname> + <version>2.4.6</version> <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.5.2/Windows/abiword-setup-2.5.2.…</location> + <location>http://www.abiword.org/downloads/abiword/2.4.6/Windows/abiword-setup-2.4.6.…</location> </application> <application name="OpenOffice"> <regname>OpenOffice.org 2.3</regname>

1 0

[cwittich] 31878: add <Depends> and <PostInstallAction> to be able to install Diablo 2 Shareware with Download! TODO: write the req. fix which creates a new shortcut with -w -glide see <PostInstallAction> in the xml file
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Sat Jan 19 01:23:52 2008 New Revision: 31878 URL: http://svn.reactos.org/svn/reactos?rev=31878&view=rev Log: add <Depends> and <PostInstallAction> to be able to install Diablo 2 Shareware with Download! TODO: write the req. fix which creates a new shortcut with -w -glide see <PostInstallAction> in the xml file Modified: trunk/rosapps/downloader/downloader.xml trunk/rosapps/downloader/main.c trunk/rosapps/downloader/structures.h trunk/rosapps/downloader/xml.c Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Sat Jan 19 01:23:52 2008 @@ -102,6 +102,12 @@ <description>An Open Source bitmap graphics editor geared towards young children.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.18-win32-in…</location> </application> + <application name="zeckensack's glide wrapper"> + <regname>GlidewrapZbag</regname> + <version>0.84c</version> + <description>glidewrapper needed to run Diablo 2 on ReactOS.</description> + <location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location> + </application> </category> <category name="Multimedia" icon="4"> </category> @@ -132,6 +138,14 @@ <description>SamNMax, Day of Tentacle, etc on ReactOS</description> <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.10.0-win32.exe</location> </application> + <application name="Diablo 2 Shareware"> + <regname>Diablo 2 Shareware</regname> + <version>1.4</version> + <description>Diablo 2 Shareware. zeckensack's glide wrapper is req. to run it.</description> + <location>http://ftp.freenet.de./pub/filepilot/windows/spiele/diabloiidemo.exe</location> + <depends>GlidewrapZbag</depends> + <postinstallaction>http://svn.reactos.org/fixes/diablo2fix.exe</postinstallaction> + </application> <application name="Tile World"> <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> Modified: trunk/rosapps/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=3187… ============================================================================== --- trunk/rosapps/downloader/main.c (original) +++ trunk/rosapps/downloader/main.c Sat Jan 19 01:23:52 2008 @@ -635,10 +635,39 @@ return FALSE; } +BOOL IsApplicationInstalled(struct Application* App) +{ + WCHAR Uninstaller[200]; + if(StrCmpW(App->RegName, L"")) { + if(getUninstaller(App->RegName, Uninstaller)) { + return TRUE; + } + } + return FALSE; +} + +struct Application* GetDependency(const WCHAR* Dependency) +{ + struct Category* Category = Root.Children; + + while (Category->Next) + { + while (Category->Apps) + { + if(StrCmpW(Category->Apps->Name, Dependency) == 0) + return Category->Apps; + Category->Apps = Category->Apps->Next; + } + Category = Category->Next; + } + return NULL; +} + LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static RECT DescriptionRect; + struct Application* AppToInstall; switch (Message) { @@ -683,7 +712,31 @@ if (lParam == (LPARAM)hDownloadButton) { if(SelectedApplication) + { + /* install dependencies */ + if(StrCmpW(SelectedApplication->Depends, L"")) + { + AppToInstall = SelectedApplication; + SelectedApplication = GetDependency(SelectedApplication->Depends); + if (!IsApplicationInstalled(SelectedApplication)) + { + DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc); + } + SelectedApplication = AppToInstall; + } + + /* download and install the app */ DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc); + + /* install req. hacks to get it working */ + if(StrCmpW(SelectedApplication->PostInstallAction, L"")) + { + AppToInstall = SelectedApplication; + CopyMemory(SelectedApplication->Location, SelectedApplication->PostInstallAction, sizeof(SelectedApplication->Location)); + DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0, DownloadProc); + SelectedApplication = AppToInstall; + } + } else ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); } Modified: trunk/rosapps/downloader/structures.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/structures.h?re… ============================================================================== --- trunk/rosapps/downloader/structures.h (original) +++ trunk/rosapps/downloader/structures.h Sat Jan 19 01:23:52 2008 @@ -8,6 +8,8 @@ WCHAR Licence[0x100]; WCHAR Description[0x400]; WCHAR Location[0x100]; + WCHAR Depends[0x100]; + WCHAR PostInstallAction[0x100]; struct Application* Next; }; Modified: trunk/rosapps/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/xml.c?rev=31878… ============================================================================== --- trunk/rosapps/downloader/xml.c (original) +++ trunk/rosapps/downloader/xml.c Sat Jan 19 01:23:52 2008 @@ -134,6 +134,16 @@ int currentlengt = lstrlenW(CurrentApplication->Licence); MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); } + else if(!strcmp(CurrentTag, "depends")) + { + int currentlengt = lstrlenW(CurrentApplication->Depends); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->Depends[currentlengt], 0x100-currentlengt); + } + else if(!strcmp(CurrentTag, "postinstallaction")) + { + int currentlengt = lstrlenW(CurrentApplication->PostInstallAction); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->PostInstallAction[currentlengt], 0x100-currentlengt); + } } void tag_closed (void* tree, const char* tag)

1 0

[cwittich] 31877: constify parse_options parameter like it is done in wine
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 22:14:30 2008 New Revision: 31877 URL: http://svn.reactos.org/svn/reactos?rev=31877&view=rev Log: constify parse_options parameter like it is done in wine Modified: trunk/reactos/lib/3rdparty/libwine/debug.c Modified: trunk/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/debug.c (original) +++ trunk/reactos/lib/3rdparty/libwine/debug.c Fri Jan 18 22:14:30 2008 @@ -134,11 +134,12 @@ } /* parse a set of debugging option specifications and add them to the option list */ -static void parse_options( char *options ) -{ - char *opt, *next; +static void parse_options( const char *str ) +{ + char *opt, *next, *options; unsigned int i; + if (!(options = _strdup(str))) return; for (opt = options; opt; opt = next) { const char *p; @@ -178,6 +179,7 @@ else add_option( p, set, clear ); } + free( options ); } /* initialize all options at startup */

1 0

[jimtabor] 31876: Fix logic in IntGdiDeleteDC with permanent set.
by jimtabor＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: jimtabor Date: Fri Jan 18 21:10:42 2008 New Revision: 31876 URL: http://svn.reactos.org/svn/reactos?rev=31876&view=rev Log: Fix logic in IntGdiDeleteDC with permanent set. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Fri Jan 18 21:10:42 2008 @@ -941,8 +941,8 @@ if (DCToDelete->DC_Flags & DC_FLAG_PERMANENT) { DPRINT1("No! You Naughty Application!\n"); + DC_UnlockDc( DCToDelete ); // if(!UserReleaseDC(NULL, hDC, FALSE)) Ret = FALSE; - DC_UnlockDc( DCToDelete ); return Ret; } }

1 0

[cwittich] 31875: don't crash when GetUserNameW is called with NULL - fixes launching of Office 2003 setup
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 20:54:09 2008 New Revision: 31875 URL: http://svn.reactos.org/svn/reactos?rev=31875&view=rev Log: don't crash when GetUserNameW is called with NULL - fixes launching of Office 2003 setup Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Fri Jan 18 20:54:09 2008 @@ -938,8 +938,11 @@ else { *pdwAccountName = dwSrcLen; - RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length ); - pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; + if (pAccountName) + { + RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length ); + pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; + } } if ( peUse ) *peUse = TranslatedName->Use;

1 0

[fireball] 31874: - Winesync to Wine-20080118.
by fireball＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: fireball Date: Fri Jan 18 20:39:35 2008 New Revision: 31874 URL: http://svn.reactos.org/svn/reactos?rev=31874&view=rev Log: - Winesync to Wine-20080118. Added: trunk/reactos/dll/win32/rpcrt4/rpc_async.c (with props) Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/git.c trunk/reactos/dll/win32/ole32/ole16.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c Fri Jan 18 20:39:35 2008 @@ -1273,7 +1273,7 @@ * Return the clipboard data in the storage medium structure */ pmedium->tymed = (hData == 0) ? TYMED_NULL : TYMED_HGLOBAL; - pmedium->u.hGlobal = (HGLOBAL)hData; + pmedium->u.hGlobal = hData; pmedium->pUnkForRelease = NULL; hr = S_OK; Modified: trunk/reactos/dll/win32/ole32/git.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/git.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/git.c (original) +++ trunk/reactos/dll/win32/ole32/git.c Fri Jan 18 20:39:35 2008 @@ -104,7 +104,7 @@ StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; StdGITEntry* e; - TRACE("iface=%p, cookie=0x%x\n", iface, (UINT)cookie); + TRACE("iface=%p, cookie=0x%x\n", iface, cookie); LIST_FOR_EACH_ENTRY(e, &self->list, StdGITEntry, entry) { if (e->cookie == cookie) @@ -227,7 +227,7 @@ StdGITEntry* entry; HRESULT hr; - TRACE("iface=%p, dwCookie=0x%x\n", iface, (UINT)dwCookie); + TRACE("iface=%p, dwCookie=0x%x\n", iface, dwCookie); EnterCriticalSection(&git_section); Modified: trunk/reactos/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole16.c?re… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole16.c (original) +++ trunk/reactos/dll/win32/ole32/ole16.c Fri Jan 18 20:39:35 2008 @@ -154,7 +154,7 @@ * IMalloc16_DidAlloc [COMPOBJ.507] */ INT16 CDECL IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { - IMalloc16 *This = (IMalloc16 *)iface; + IMalloc16 *This = iface; TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; } Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2.c (original) +++ trunk/reactos/dll/win32/ole32/ole2.c Fri Jan 18 20:39:35 2008 @@ -1400,7 +1400,7 @@ * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = (HOLEMENU)GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); if ( !hOleMenu ) goto NEXTHOOK; @@ -1505,7 +1505,7 @@ * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = (HOLEMENU)GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); if ( !hOleMenu ) goto NEXTHOOK; Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/rpc.c (original) +++ trunk/reactos/dll/win32/ole32/rpc.c Fri Jan 18 20:39:35 2008 @@ -1026,8 +1026,13 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) { - FIXME("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); - return E_FAIL; + WARN("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); + + /* FIXME: implement this by storing the dwDestContext and pvDestContext + * values passed into IMarshal_MarshalInterface and returning them here */ + *pdwDestContext = MSHCTX_DIFFERENTMACHINE; + *ppvDestContext = NULL; + return S_OK; } static HRESULT WINAPI RpcChannelBuffer_IsConnected(LPRPCCHANNELBUFFER iface) Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/stg_prop.c (original) +++ trunk/reactos/dll/win32/ole32/stg_prop.c Fri Jan 18 20:39:35 2008 @@ -200,7 +200,7 @@ IsEqualGUID(&IID_IPropertyStorage, riid)) { IPropertyStorage_AddRef(iface); - *ppvObject = (IPropertyStorage*)iface; + *ppvObject = iface; return S_OK; } @@ -263,7 +263,7 @@ if (This->codePage == CP_UNICODE) { if (dictionary_find(This->name_to_propid, name, (void **)&propid)) - ret = PropertyStorage_FindProperty(This, (PROPID)propid); + ret = PropertyStorage_FindProperty(This, propid); } else { @@ -275,7 +275,7 @@ { if (dictionary_find(This->name_to_propid, ansiName, (void **)&propid)) - ret = PropertyStorage_FindProperty(This, (PROPID)propid); + ret = PropertyStorage_FindProperty(This, propid); CoTaskMemFree(ansiName); } } @@ -528,7 +528,7 @@ assert(srcName); - hr = PropertyStorage_StringCopy((LPCSTR)srcName, cp, &name, This->codePage); + hr = PropertyStorage_StringCopy(srcName, cp, &name, This->codePage); if (SUCCEEDED(hr)) { if (This->codePage == CP_UNICODE) @@ -1059,7 +1059,7 @@ TRACE("Read char 0x%x ('%c')\n", prop->u.cVal, prop->u.cVal); break; case VT_UI1: - prop->u.bVal = *(const UCHAR *)data; + prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); break; case VT_I2: Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.c (original) +++ trunk/reactos/dll/win32/ole32/storage32.c Fri Jan 18 20:39:35 2008 @@ -1300,14 +1300,7 @@ /* * Open it to get a pointer to return. */ - hr = IStorage_OpenStorage( - iface, - (const OLECHAR*)pwcsName, - 0, - grfMode, - 0, - 0, - ppstg); + hr = IStorage_OpenStorage(iface, pwcsName, 0, grfMode, 0, 0, ppstg); if( (hr != S_OK) || (*ppstg == NULL)) { @@ -2004,9 +1997,7 @@ hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL); if (hr==S_OK) { - destroyHr = StorageImpl_DestroyElement( - (IStorage*)childStorage, - (OLECHAR*)currentElement.pwcsName); + destroyHr = StorageImpl_DestroyElement(childStorage, currentElement.pwcsName); CoTaskMemFree(currentElement.pwcsName); } @@ -4053,8 +4044,7 @@ currentProperty); if ( propertyNameCmp( - (const OLECHAR*)currentProperty->name, - (const OLECHAR*)lpszPropName) == 0) + (const OLECHAR*)currentProperty->name, lpszPropName) == 0) return currentSearchNode; /* Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cproxy.c (original) +++ trunk/reactos/dll/win32/rpcrt4/cproxy.c Fri Jan 18 20:39:35 2008 @@ -410,6 +410,7 @@ PMIDL_STUB_MESSAGE pStubMsg) { TRACE("(%p,%p)\n", This, pStubMsg); + if (pStubMsg->fBufferValid) { IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, Modified: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_clien… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c Fri Jan 18 20:39:35 2008 @@ -51,7 +51,7 @@ pRpcMessage, pStubMsg, pStubDesc, ProcNum); pRpcMessage->Handle = NULL; - pRpcMessage->ProcNum = ProcNum; + pRpcMessage->ProcNum = ProcNum | RPC_FLAGS_VALID_BIT; pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; pRpcMessage->RpcFlags = 0; pRpcMessage->ReservedForRuntime = NULL; @@ -216,10 +216,29 @@ ULONG *pFaultStatus, RPC_STATUS Status ) { - FIXME("(%p, %p, %p, %ld): stub\n", pStubMsg, pCommStatus, pFaultStatus, Status); - - *pCommStatus = 0; - *pFaultStatus = 0; + TRACE("(%p, %p, %p, %ld)\n", pStubMsg, pCommStatus, pFaultStatus, Status); + + switch (Status) + { + case ERROR_INVALID_HANDLE: + case RPC_S_INVALID_BINDING: + case RPC_S_UNKNOWN_IF: + case RPC_S_SERVER_UNAVAILABLE: + case RPC_S_SERVER_TOO_BUSY: + case RPC_S_CALL_FAILED_DNE: + case RPC_S_PROTOCOL_ERROR: + case RPC_S_UNSUPPORTED_TRANS_SYN: + case RPC_S_UNSUPPORTED_TYPE: + case RPC_S_PROCNUM_OUT_OF_RANGE: + case EPT_S_NOT_REGISTERED: + case RPC_S_COMM_FAILURE: + *pCommStatus = Status; + *pFaultStatus = 0; + break; + default: + *pCommStatus = 0; + *pFaultStatus = Status; + } return RPC_S_OK; } Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c Fri Jan 18 20:39:35 2008 @@ -218,7 +218,8 @@ NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p)\n", SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, + userRunDownIn, NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -230,7 +231,8 @@ NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p %p)\n", hBinding, SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -251,6 +253,9 @@ if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); if (SContext->userContext) { @@ -287,7 +292,9 @@ ULONG DataRepresentation) { TRACE("(%p %08x)\n", pBuff, DataRepresentation); - return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, + DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -298,7 +305,8 @@ ULONG DataRepresentation) { TRACE("(%p %p %08x)\n", hBinding, pBuff, DataRepresentation); - return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -319,6 +327,9 @@ if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); if (!pBuff || (!context_ndr->attributes && UuidIsNil((UUID *)&context_ndr->uuid, &status))) Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Fri Jan 18 20:39:35 2008 @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - Non-conformant strings * - String structs * - Byte count pointers * - transmit_as/represent as @@ -1528,8 +1527,7 @@ * BufferStart and BufferEnd won't be reset when allocating memory for * sending the response. we don't have to check for the new buffer here as * it won't be used a type memory, only for buffer memory */ - if (Pointer >= (unsigned char *)pStubMsg->BufferStart && - Pointer < (unsigned char *)pStubMsg->BufferEnd) + if (Pointer >= pStubMsg->BufferStart && Pointer < pStubMsg->BufferEnd) goto notfree; if (attr & RPC_FC_P_ONSTACK) { @@ -3538,6 +3536,7 @@ SavedMemorySize = pStubMsg->MemorySize; esize = ComplexStructSize(pStubMsg, pFormat); + MemorySize = safe_multiply(pStubMsg->MaxCount, esize); count = pStubMsg->ActualCount; @@ -4980,7 +4979,7 @@ case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return *(const UCHAR *)pMemory; + return *pMemory; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: @@ -5800,12 +5799,12 @@ case RPC_FC_CHAR: case RPC_FC_SMALL: RANGE_UNMARSHALL(UCHAR, "%d"); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_BYTE: case RPC_FC_USMALL: RANGE_UNMARSHALL(CHAR, "%u"); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: /* FIXME: valid? */ case RPC_FC_USHORT: @@ -5913,7 +5912,7 @@ case RPC_FC_SMALL: case RPC_FC_USMALL: safe_copy_to_buffer(pStubMsg, pMemory, sizeof(UCHAR)); - TRACE("value: 0x%02x\n", *(UCHAR *)pMemory); + TRACE("value: 0x%02x\n", *pMemory); break; case RPC_FC_WCHAR: case RPC_FC_SHORT: @@ -5998,7 +5997,7 @@ case RPC_FC_SMALL: case RPC_FC_USMALL: BASE_TYPE_UNMARSHALL(UCHAR); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: case RPC_FC_SHORT: @@ -6208,6 +6207,7 @@ ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } + TRACE("flags: 0x%02x\n", pFormat[1]); if (pFormat[1] & 0x80) NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); @@ -6226,16 +6226,22 @@ PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + TRACE("pStubMsg %p, ppMemory %p, pFormat %p, fMustAlloc %s\n", pStubMsg, + ppMemory, pFormat, fMustAlloc ? "TRUE": "FALSE"); + if (*pFormat != RPC_FC_BIND_CONTEXT) { ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } - - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); - - return NULL; + TRACE("flags: 0x%02x\n", pFormat[1]); + + /* [out]-only or [ret] param */ + if ((pFormat[1] & 0x60) == 0x20) + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + + return NULL; } /*********************************************************************** @@ -6301,7 +6307,8 @@ } NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; } @@ -6323,7 +6330,7 @@ ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; return ContextHandle; @@ -6339,9 +6346,24 @@ NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; + TRACE("(%p, %p)\n", pStubMsg, pFormat); + + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + return NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, NULL, - pStubMsg->RpcMsg->DataRepresentation, NULL, 0); + pStubMsg->RpcMsg->DataRepresentation, if_id, + flags); } void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -6349,6 +6371,9 @@ NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; + TRACE("(%p, %p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); ALIGN_POINTER(pStubMsg->Buffer, 4); @@ -6360,9 +6385,18 @@ RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, if_id, flags); pStubMsg->Buffer += cbNDRContext; } @@ -6370,6 +6404,8 @@ PFORMAT_STRING pFormat) { NDR_SCONTEXT ContextHandle; + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p)\n", pStubMsg, pFormat); @@ -6382,12 +6418,74 @@ RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + if_id, flags); pStubMsg->Buffer += cbNDRContext; return ContextHandle; } + +/*********************************************************************** + * NdrCorrelationInitialize [RPCRT4.@] + * + * Initializes correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * pMemory [I] Pointer to memory to use as a cache. + * CacheSize [I] Size of the memory pointed to by pMemory. + * Flags [I] Reserved. Set to zero. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) +{ + FIXME("(%p, %p, %d, 0x%x): stub\n", pStubMsg, pMemory, CacheSize, Flags); + pStubMsg->fHasNewCorrDesc = TRUE; +} + +/*********************************************************************** + * NdrCorrelationPass [RPCRT4.@] + * + * Performs correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} + +/*********************************************************************** + * NdrCorrelationFree [RPCRT4.@] + * + * Frees any resources used while unmarshalling parameters that need + * correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_ole.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_ole.c Fri Jan 18 20:39:35 2008 @@ -112,7 +112,7 @@ RpcStreamImpl *This = (RpcStreamImpl *)iface; if (!--(This->RefCount)) { TRACE("size=%d\n", *This->size); - This->pMsg->Buffer = (unsigned char*)This->data + *This->size; + This->pMsg->Buffer = This->data + *This->size; HeapFree(GetProcessHeap(),0,This); return 0; } Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c Fri Jan 18 20:39:35 2008 @@ -37,8 +37,8 @@ #include "objbase.h" #include "rpc.h" #include "rpcproxy.h" -#include "ndrtypes.h" - + +#include "wine/exception.h" #include "wine/debug.h" #include "wine/rpcfc.h" @@ -115,11 +115,12 @@ } #define STUBLESS_UNMARSHAL 1 -#define STUBLESS_CALLSERVER 2 -#define STUBLESS_CALCSIZE 3 -#define STUBLESS_GETBUFFER 4 -#define STUBLESS_MARSHAL 5 -#define STUBLESS_FREE 6 +#define STUBLESS_INITOUT 2 +#define STUBLESS_CALLSERVER 3 +#define STUBLESS_CALCSIZE 4 +#define STUBLESS_GETBUFFER 5 +#define STUBLESS_MARSHAL 6 +#define STUBLESS_FREE 7 void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { @@ -563,6 +564,8 @@ /* the pointer to the object when in OLE mode */ void * This = NULL; PFORMAT_STRING pHandleFormat; + /* correlation cache */ + unsigned long NdrCorrCache[256]; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -664,8 +667,7 @@ if (ext_flags.HasNewCorrDesc) { /* initialize extra correlation package */ - FIXME("new correlation description not implemented\n"); - stubMsg.fHasNewCorrDesc = TRUE; + NdrCorrelationInitialize(&stubMsg, NdrCorrCache, sizeof(NdrCorrCache), 0); } /* order of phases: @@ -675,77 +677,130 @@ * 4. PROXY_SENDRECEIVE - send/receive buffer * 5. PROXY_UNMARHSAL - unmarshal [out] params from buffer */ - for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) - { - TRACE("phase = %d\n", phase); - switch (phase) + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + __TRY { - case PROXY_GETBUFFER: - /* allocate the buffer */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - NdrProxyGetBuffer(This, &stubMsg); - else if (Oif_flags.HasPipes) - /* NdrGetPipeBuffer(...) */ - FIXME("pipes not supported yet\n"); - else - { - if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) + for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) + { + TRACE("phase = %d\n", phase); + switch (phase) + { + case PROXY_GETBUFFER: + /* allocate the buffer */ + NdrProxyGetBuffer(This, &stubMsg); + break; + case PROXY_SENDRECEIVE: + /* send the [in] params and receive the [out] and [retval] + * params */ + NdrProxySendReceive(This, &stubMsg); + + /* convert strings, floating point values and endianess into our + * preferred format */ + if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&stubMsg, pFormat); + + break; + case PROXY_CALCSIZE: + case PROXY_MARSHAL: + case PROXY_UNMARSHAL: + if (bV2Format) + client_do_args(&stubMsg, pFormat, phase, number_of_params, + (unsigned char *)&RetVal); + else + client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, + (unsigned char *)&RetVal, + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + break; + default: + ERR("shouldn't reach here. phase %d\n", phase); + break; + } + } + } + __EXCEPT(NULL) + { + RetVal = NdrProxyErrorHandler(GetExceptionCode()); + } + __ENDTRY + } + else + { + /* order of phases: + * 1. PROXY_CALCSIZE - calculate the buffer size + * 2. PROXY_GETBUFFER - allocate the buffer + * 3. PROXY_MARHSAL - marshal [in] params into the buffer + * 4. PROXY_SENDRECEIVE - send/receive buffer + * 5. PROXY_UNMARHSAL - unmarshal [out] params from buffer + */ + for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) + { + TRACE("phase = %d\n", phase); + switch (phase) + { + case PROXY_GETBUFFER: + /* allocate the buffer */ + if (Oif_flags.HasPipes) + /* NdrGetPipeBuffer(...) */ + FIXME("pipes not supported yet\n"); + else + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) #if 0 - NdrNsGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); + NdrNsGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); #else - FIXME("using auto handle - call NdrNsGetBuffer when it gets implemented\n"); + FIXME("using auto handle - call NdrNsGetBuffer when it gets implemented\n"); #endif + else + NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); + } + break; + case PROXY_SENDRECEIVE: + /* send the [in] params and receive the [out] and [retval] + * params */ + if (Oif_flags.HasPipes) + /* NdrPipesSendReceive(...) */ + FIXME("pipes not supported yet\n"); else - NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); - } - break; - case PROXY_SENDRECEIVE: - /* send the [in] params and receive the [out] and [retval] - * params */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - NdrProxySendReceive(This, &stubMsg); - else if (Oif_flags.HasPipes) - /* NdrPipesSendReceive(...) */ - FIXME("pipes not supported yet\n"); - else - { - if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) #if 0 - NdrNsSendReceive(&stubMsg, stubMsg.Buffer, pStubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle); + NdrNsSendReceive(&stubMsg, stubMsg.Buffer, pStubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle); #else - FIXME("using auto handle - call NdrNsSendReceive when it gets implemented\n"); + FIXME("using auto handle - call NdrNsSendReceive when it gets implemented\n"); #endif + else + NdrSendReceive(&stubMsg, stubMsg.Buffer); + } + + /* convert strings, floating point values and endianess into our + * preferred format */ + if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&stubMsg, pFormat); + + break; + case PROXY_CALCSIZE: + case PROXY_MARSHAL: + case PROXY_UNMARSHAL: + if (bV2Format) + client_do_args(&stubMsg, pFormat, phase, number_of_params, + (unsigned char *)&RetVal); else - NdrSendReceive(&stubMsg, stubMsg.Buffer); - } - - /* convert strings, floating point values and endianess into our - * preferred format */ - if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) - NdrConvert(&stubMsg, pFormat); - - break; - case PROXY_CALCSIZE: - case PROXY_MARSHAL: - case PROXY_UNMARSHAL: - if (bV2Format) - client_do_args(&stubMsg, pFormat, phase, number_of_params, - (unsigned char *)&RetVal); - else - client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, - (unsigned char *)&RetVal, - (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); - break; - default: - ERR("shouldn't reach here. phase %d\n", phase); - break; + client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, + (unsigned char *)&RetVal, + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + break; + default: + ERR("shouldn't reach here. phase %d\n", phase); + break; + } } } if (ext_flags.HasNewCorrDesc) { /* free extra correlation package */ - /* NdrCorrelationFree(&stubMsg); */ + NdrCorrelationFree(&stubMsg); } if (Oif_flags.HasPipes) @@ -855,6 +910,7 @@ pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; + break; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */ @@ -886,7 +942,7 @@ unsigned char *pArg; current_stack_offset = pParam->stack_offset; - pArg = (unsigned char *)(args+current_stack_offset); + pArg = args + current_stack_offset; TRACE("param[%d]: new format\n", i); TRACE("\tparam_attributes:"); dump_RPC_FC_PROC_PF(pParam->param_attributes); TRACE("\n"); @@ -899,6 +955,10 @@ &pParam->type_format_char; TRACE("\tbase type: 0x%02x\n", *pTypeFormat); + + /* make a note of the address of the return value parameter for later */ + if (pParam->param_attributes.IsReturn) + retval_ptr = (LONG_PTR *)pArg; switch (phase) { @@ -915,6 +975,8 @@ if (pParam->param_attributes.ServerAllocSize) HeapFree(GetProcessHeap(), 0, *(void **)pArg); break; + case STUBLESS_INITOUT: + break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) *(void **)pArg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -927,11 +989,6 @@ else call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); } - - /* make a note of the address of the return value parameter for later */ - if (pParam->param_attributes.IsReturn) - retval_ptr = (LONG_PTR *)pArg; - break; case STUBLESS_CALCSIZE: if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) @@ -988,7 +1045,21 @@ if (pParam->param_attributes.ServerAllocSize) HeapFree(GetProcessHeap(), 0, *(void **)pArg); - /* FIXME: call call_freer here for IN types with MustFree set */ + break; + case STUBLESS_INITOUT: + if (!pParam->param_attributes.IsIn && + pParam->param_attributes.IsOut && + !pParam->param_attributes.ServerAllocSize && + !pParam->param_attributes.IsByValue) + { + DWORD size = calc_arg_size(pStubMsg, pTypeFormat); + + if(size) + { + *(void **)pArg = NdrAllocate(pStubMsg, size); + memset(*(void **)pArg, 0, size); + } + } break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) @@ -1001,18 +1072,6 @@ call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); else call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); - } - else if (pParam->param_attributes.IsOut && - !pParam->param_attributes.ServerAllocSize && - !pParam->param_attributes.IsByValue) - { - DWORD size = calc_arg_size(pStubMsg, pTypeFormat); - - if(size) - { - *(void **)pArg = NdrAllocate(pStubMsg, size); - memset(*(void **)pArg, 0, size); - } } break; case STUBLESS_CALCSIZE: @@ -1058,7 +1117,7 @@ * if present, so adjust this */ unsigned short current_stack_offset_adjusted = current_stack_offset + (object ? sizeof(void *) : 0); - unsigned char *pArg = (unsigned char *)(args+current_stack_offset_adjusted); + unsigned char *pArg = args + current_stack_offset_adjusted; /* no more parameters; exit loop */ if (current_stack_offset_adjusted >= stack_size) @@ -1076,6 +1135,9 @@ TRACE("\tbase type 0x%02x\n", *pTypeFormat); + if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) + retval_ptr = (LONG_PTR *)pArg; + switch (phase) { case STUBLESS_MARSHAL: @@ -1089,9 +1151,7 @@ case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); - else if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) - retval_ptr = (LONG_PTR *)pArg; - break; + break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) call_buffer_sizer(pStubMsg, pArg, pTypeFormat); @@ -1113,6 +1173,9 @@ TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); + if (pParam->param_direction == RPC_FC_RETURN_PARAM) + retval_ptr = (LONG_PTR *)pArg; + switch (phase) { case STUBLESS_MARSHAL: @@ -1127,14 +1190,9 @@ call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); else if (pParam->param_direction == RPC_FC_OUT_PARAM) pStubMsg->pfnFree(*(void **)pArg); - break; - case STUBLESS_UNMARSHAL: - if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || - pParam->param_direction == RPC_FC_IN_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); - else if (pParam->param_direction == RPC_FC_RETURN_PARAM) - retval_ptr = (LONG_PTR *)pArg; - else if (pParam->param_direction == RPC_FC_OUT_PARAM) + break; + case STUBLESS_INITOUT: + if (pParam->param_direction == RPC_FC_OUT_PARAM) { DWORD size = calc_arg_size(pStubMsg, pTypeFormat); @@ -1144,6 +1202,11 @@ memset(*(void **)pArg, 0, size); } } + break; + case STUBLESS_UNMARSHAL: + if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || + pParam->param_direction == RPC_FC_IN_PARAM) + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM || @@ -1406,9 +1469,10 @@ stubMsg.Buffer = stubMsg.BufferStart; } break; + case STUBLESS_UNMARSHAL: + case STUBLESS_INITOUT: + case STUBLESS_CALCSIZE: case STUBLESS_MARSHAL: - case STUBLESS_UNMARSHAL: - case STUBLESS_CALCSIZE: case STUBLESS_FREE: if (bV2Format) retval_ptr = stub_do_args(&stubMsg, &pFormat[parameter_start_offset], Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h Fri Jan 18 20:39:35 2008 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "ndrtypes.h" /* there can't be any alignment with the structures in this file */ #include "pshpack1.h" Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c Fri Jan 18 20:39:35 2008 @@ -332,7 +332,7 @@ break; } - I_RpcFreeBuffer(&msg); + I_RpcFree(msg.Buffer); RPCRT4_FreeHeader(response_hdr); return status; } Added: trunk/reactos/dll/win32/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_async… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_async.c (added) +++ trunk/reactos/dll/win32/rpcrt4/rpc_async.c Fri Jan 18 20:39:35 2008 @@ -1,0 +1,148 @@ +/* + * Asynchronous Call Support Functions + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * + * 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 + * + */ + +#include <stdarg.h> + +#include "rpc.h" +#include "rpcndr.h" +#include "rpcasync.h" + +#include "wine/debug.h" + +#include "rpc_binding.h" +#include "rpc_message.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +#define RPC_ASYNC_SIGNATURE 0x43595341 + +/*********************************************************************** + * RpcAsyncInitializeHandle [RPCRT4.@] + * + * Initialises an asynchronous state so it can be used in other asynchronous + * functions and for use in asynchronous calls. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * Size [I] Size of the memory pointed to by pAsync. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncInitializeHandle(PRPC_ASYNC_STATE pAsync, unsigned int Size) +{ + TRACE("(%p, %d)\n", pAsync, Size); + + if (Size != sizeof(*pAsync)) + { + ERR("invalid Size %d\n", Size); + return ERROR_INVALID_PARAMETER; + } + + pAsync->Size = sizeof(*pAsync); + pAsync->Signature = RPC_ASYNC_SIGNATURE; + pAsync->Lock = 0; + pAsync->Flags = 0; + pAsync->StubInfo = NULL; + pAsync->RuntimeInfo = NULL; + memset(&pAsync->Reserved, 0, sizeof(*pAsync) - FIELD_OFFSET(RPC_ASYNC_STATE, Reserved)); + + return RPC_S_OK; +} + +/*********************************************************************** + * RpcAsyncGetCallStatus [RPCRT4.@] + * + * Retrieves the current status of the asynchronous call taking place. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * + * RETURNS + * RPC_S_OK - The call was successfully completed. + * RPC_S_INVALID_ASYNC_HANDLE - The asynchronous structure is not valid. + * RPC_S_ASYNC_CALL_PENDING - The call is still in progress and has not been completed. + * Any other error code - The call failed. + */ +RPC_STATUS WINAPI RpcAsyncGetCallStatus(PRPC_ASYNC_STATE pAsync) +{ + FIXME("(%p): stub\n", pAsync); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncCompleteCall [RPCRT4.@] + * + * Completes a client or server asynchronous call. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * Reply [I] The return value of the asynchronous function. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) +{ + FIXME("(%p, %p): stub\n", pAsync, Reply); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncAbortCall [RPCRT4.@] + * + * Aborts the asynchronous server call taking place. + * + * PARAMS + * pAsync [I] Asynchronous server state to abort. + * ExceptionCode [I] Exception code to return to the client in a fault packet. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncAbortCall(PRPC_ASYNC_STATE pAsync, ULONG ExceptionCode) +{ + FIXME("(%p, %d/0x%x): stub\n", pAsync, ExceptionCode, ExceptionCode); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncCancelCall [RPCRT4.@] + * + * Cancels the asynchronous client call taking place. + * + * PARAMS + * pAsync [I] Asynchronous client state to abort. + * fAbortCall [I] If TRUE, then send a cancel to the server, otherwise + * just wait for the call to complete. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncCancelCall(PRPC_ASYNC_STATE pAsync, BOOL fAbortCall) +{ + FIXME("(%p, %s): stub\n", pAsync, fAbortCall ? "TRUE" : "FALSE"); + return RPC_S_INVALID_ASYNC_HANDLE; +} Propchange: trunk/reactos/dll/win32/rpcrt4/rpc_async.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_message.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.c Fri Jan 18 20:39:35 2008 @@ -754,8 +754,12 @@ TRACE("buffer length = %u\n", pMsg->BufferLength); - status = I_RpcGetBuffer(pMsg); - if (status != RPC_S_OK) goto fail; + pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); + if (!pMsg->Buffer) + { + status = ERROR_OUTOFMEMORY; + goto fail; + } first_flag = RPC_FLG_FIRST; auth_length = common_hdr.auth_len; @@ -842,7 +846,7 @@ *Header, hdr_length, (unsigned char *)pMsg->Buffer + buffer_length, data_length, (RpcAuthVerifier *)auth_data, - (unsigned char *)auth_data + sizeof(RpcAuthVerifier), + auth_data + sizeof(RpcAuthVerifier), header_auth_len - sizeof(RpcAuthVerifier)); if (status != RPC_S_OK) goto fail; } @@ -891,6 +895,54 @@ } /*********************************************************************** + * I_RpcNegotiateTransferSyntax [RPCRT4.@] + * + * Negotiates the transfer syntax used by a client connection by connecting + * to the server. + * + * PARAMS + * pMsg [I] RPC Message structure. + * pAsync [I] Asynchronous state to set. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) +{ + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + RpcConnection* conn; + RPC_STATUS status = RPC_S_OK; + + TRACE("(%p)\n", pMsg); + + if (!bind || bind->server) + return RPC_S_INVALID_BINDING; + + /* if we already have a connection, we don't need to negotiate again */ + if (!pMsg->ReservedForRuntime) + { + RPC_CLIENT_INTERFACE *cif = pMsg->RpcInterfaceInformation; + if (!cif) return RPC_S_INTERFACE_NOT_FOUND; + + if (!bind->Endpoint || !bind->Endpoint[0]) + { + TRACE("automatically resolving partially bound binding\n"); + status = RpcEpResolveBinding(bind, cif); + if (status != RPC_S_OK) return status; + } + + status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, + &cif->InterfaceId); + + if (status == RPC_S_OK) + pMsg->ReservedForRuntime = conn; + } + + return status; +} + +/*********************************************************************** * I_RpcGetBuffer [RPCRT4.@] * * Allocates a buffer for use by I_RpcSend or I_RpcSendReceive and binds to the @@ -916,26 +968,45 @@ */ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) { + RPC_STATUS status; + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); - pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); + + if (!bind) + return RPC_S_INVALID_BINDING; + + pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); + TRACE("Buffer=%p\n", pMsg->Buffer); + + if (!pMsg->Buffer) + return ERROR_OUTOFMEMORY; + + if (!bind->server) + { + status = I_RpcNegotiateTransferSyntax(pMsg); + if (status != RPC_S_OK) + I_RpcFree(pMsg->Buffer); + } + else + status = RPC_S_OK; + + return status; +} + +/*********************************************************************** + * I_RpcReAllocateBuffer (internal) + */ +static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) +{ + TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); + pMsg->Buffer = HeapReAlloc(GetProcessHeap(), 0, pMsg->Buffer, pMsg->BufferLength); TRACE("Buffer=%p\n", pMsg->Buffer); return pMsg->Buffer ? RPC_S_OK : ERROR_OUTOFMEMORY; } /*********************************************************************** - * I_RpcReAllocateBuffer (internal) - */ -static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) -{ - TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); - pMsg->Buffer = HeapReAlloc(GetProcessHeap(), 0, pMsg->Buffer, pMsg->BufferLength); - - TRACE("Buffer=%p\n", pMsg->Buffer); - return pMsg->Buffer ? RPC_S_OK : ERROR_OUTOFMEMORY; -} - -/*********************************************************************** * I_RpcFreeBuffer [RPCRT4.@] * * Frees a buffer allocated by I_RpcGetBuffer or I_RpcReceive and unbinds from @@ -952,8 +1023,19 @@ */ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); + + if (!bind) return RPC_S_INVALID_BINDING; + + if (pMsg->ReservedForRuntime) + { + RpcConnection *conn = pMsg->ReservedForRuntime; + RPCRT4_CloseBinding(bind, conn); + pMsg->ReservedForRuntime = NULL; + } + I_RpcFree(pMsg->Buffer); return RPC_S_OK; } @@ -978,43 +1060,26 @@ { RpcBinding* bind = (RpcBinding*)pMsg->Handle; RpcConnection* conn; - RPC_CLIENT_INTERFACE* cif = NULL; RPC_STATUS status; RpcPktHdr *hdr; TRACE("(%p)\n", pMsg); - if (!bind || bind->server) return RPC_S_INVALID_BINDING; - - cif = pMsg->RpcInterfaceInformation; - if (!cif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - - if (!bind->Endpoint || !bind->Endpoint[0]) - { - TRACE("automatically resolving partially bound binding\n"); - status = RpcEpResolveBinding(bind, cif); - if (status != RPC_S_OK) return status; - } - - status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); - if (status != RPC_S_OK) return status; + if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; + + conn = pMsg->ReservedForRuntime; hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, - pMsg->BufferLength, pMsg->ProcNum, + pMsg->BufferLength, + pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, &bind->ObjectUuid); if (!hdr) - { - RPCRT4_CloseBinding(bind, conn); return ERROR_OUTOFMEMORY; - } hdr->common.call_id = conn->NextCallId++; status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); RPCRT4_FreeHeader(hdr); - /* save the connection, so the response can be read from it */ - pMsg->ReservedForRuntime = conn; return status; } @@ -1042,41 +1107,14 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; - RpcConnection* conn; - RPC_CLIENT_INTERFACE* cif = NULL; - RPC_SERVER_INTERFACE* sif = NULL; RPC_STATUS status; RpcPktHdr *hdr = NULL; + RpcConnection *conn; TRACE("(%p)\n", pMsg); - if (!bind) return RPC_S_INVALID_BINDING; - - if (pMsg->ReservedForRuntime) { - conn = pMsg->ReservedForRuntime; - pMsg->ReservedForRuntime = NULL; - } else { - if (bind->server) { - sif = pMsg->RpcInterfaceInformation; - if (!sif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - status = RPCRT4_OpenBinding(bind, &conn, &sif->TransferSyntax, - &sif->InterfaceId); - } else { - cif = pMsg->RpcInterfaceInformation; - if (!cif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - - if (!bind->Endpoint || !bind->Endpoint[0]) - { - TRACE("automatically resolving partially bound binding\n"); - status = RpcEpResolveBinding(bind, cif); - if (status != RPC_S_OK) return status; - } - - status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); - } - if (status != RPC_S_OK) return status; - } - + if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; + + conn = pMsg->ReservedForRuntime; status = RPCRT4_Receive(conn, &hdr, pMsg); if (status != RPC_S_OK) { WARN("receive failed with error %lx\n", status); @@ -1085,16 +1123,6 @@ switch (hdr->common.ptype) { case PKT_RESPONSE: - if (bind->server) { - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } - break; - case PKT_REQUEST: - if (!bind->server) { - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } break; case PKT_FAULT: ERR ("we got fault packet with status 0x%lx\n", hdr->fault.status); @@ -1109,13 +1137,13 @@ } /* success */ - RPCRT4_CloseBinding(bind, conn); RPCRT4_FreeHeader(hdr); return status; fail: RPCRT4_FreeHeader(hdr); RPCRT4_DestroyConnection(conn); + pMsg->ReservedForRuntime = NULL; return status; } @@ -1140,16 +1168,55 @@ RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) { RPC_STATUS status; - RPC_MESSAGE original_message; + void *original_buffer; TRACE("(%p)\n", pMsg); - original_message = *pMsg; + original_buffer = pMsg->Buffer; status = I_RpcSend(pMsg); if (status == RPC_S_OK) status = I_RpcReceive(pMsg); /* free the buffer replaced by a new buffer in I_RpcReceive */ if (status == RPC_S_OK) - I_RpcFreeBuffer(&original_message); + I_RpcFree(original_buffer); return status; } + +/*********************************************************************** + * I_RpcAsyncSetHandle [RPCRT4.@] + * + * Sets the asynchronous state of the handle contained in the RPC message + * structure. + * + * PARAMS + * pMsg [I] RPC Message structure. + * pAsync [I] Asynchronous state to set. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI I_RpcAsyncSetHandle(PRPC_MESSAGE pMsg, PRPC_ASYNC_STATE pAsync) +{ + FIXME("(%p, %p): stub\n", pMsg, pAsync); + return RPC_S_INVALID_BINDING; +} + +/*********************************************************************** + * I_RpcAsyncAbortCall [RPCRT4.@] + * + * Aborts an asynchronous call. + * + * PARAMS + * pAsync [I] Asynchronous state. + * ExceptionCode [I] Exception code. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI I_RpcAsyncAbortCall(PRPC_ASYNC_STATE pAsync, ULONG ExceptionCode) +{ + FIXME("(%p, %d): stub\n", pAsync, ExceptionCode); + return RPC_S_INVALID_ASYNC_HANDLE; +} Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c Fri Jan 18 20:39:35 2008 @@ -3,6 +3,7 @@ * * Copyright 2001 Ove Kåven, TransGaming Technologies * Copyright 2004 Filip Navara + * Copyright 2006-2008 Robert Shearman (for CodeWeavers) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,9 +18,6 @@ * 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 - * - * TODO: - * - a whole lot */ #include "config.h" @@ -163,16 +161,179 @@ return EXCEPTION_EXECUTE_HANDLER; } -static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSAGE* msg) -{ +static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, RPC_MESSAGE *msg) +{ + RPC_STATUS status; + RpcServerInterface* sif; + RpcPktHdr *response = NULL; + + /* FIXME: do more checks! */ + if (hdr->max_tsize < RPC_MIN_PACKET_SIZE || + !UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status) || + conn->server_binding) { + TRACE("packet size less than min size, or active interface syntax guid non-null\n"); + sif = NULL; + } else { + /* create temporary binding */ + if (RPCRT4_MakeBinding(&conn->server_binding, conn) == RPC_S_OK && + RpcServerAssoc_GetAssociation(rpcrt4_conn_get_name(conn), + conn->NetworkAddr, conn->Endpoint, + conn->NetworkOptions, + hdr->assoc_gid, + &conn->server_binding->Assoc) == RPC_S_OK) + sif = RPCRT4_find_interface(NULL, &hdr->abstract, FALSE); + else + sif = NULL; + } + if (sif == NULL) { + TRACE("rejecting bind request on connection %p\n", conn); + /* Report failure to client. */ + response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, + RPC_VER_MAJOR, RPC_VER_MINOR); + } else { + TRACE("accepting bind request on connection %p for %s\n", conn, + debugstr_guid(&hdr->abstract.SyntaxGUID)); + + /* accept. */ + response = RPCRT4_BuildBindAckHeader(NDR_LOCAL_DATA_REPRESENTATION, + RPC_MAX_PACKET_SIZE, + RPC_MAX_PACKET_SIZE, + conn->server_binding->Assoc->assoc_group_id, + conn->Endpoint, + RESULT_ACCEPT, REASON_NONE, + &sif->If->TransferSyntax); + + /* save the interface for later use */ + conn->ActiveInterface = hdr->abstract; + conn->MaxTransmissionSize = hdr->max_tsize; + + RPCRT4_release_server_interface(sif); + } + + if (response) + status = RPCRT4_Send(conn, response, NULL, 0); + else + status = ERROR_OUTOFMEMORY; + RPCRT4_FreeHeader(response); + + return status; +} + +static RPC_STATUS process_request_packet(RpcConnection *conn, RpcPktRequestHdr *hdr, RPC_MESSAGE *msg) +{ + RPC_STATUS status; + RpcPktHdr *response = NULL; RpcServerInterface* sif; RPC_DISPATCH_FUNCTION func; + BOOL exception; UUID *object_uuid; - RpcPktHdr *response = NULL; + NDR_SCONTEXT context_handle; void *buf = msg->Buffer; + + /* fail if the connection isn't bound with an interface */ + if (UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status)) { + /* FIXME: should send BindNack instead */ + response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, + status); + + RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); + return RPC_S_OK; + } + + if (hdr->common.flags & RPC_FLG_OBJECT_UUID) { + object_uuid = (UUID*)(hdr + 1); + } else { + object_uuid = NULL; + } + + sif = RPCRT4_find_interface(object_uuid, &conn->ActiveInterface, TRUE); + if (!sif) { + WARN("interface %s no longer registered, returning fault packet\n", debugstr_guid(&conn->ActiveInterface.SyntaxGUID)); + response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, + NCA_S_UNK_IF); + + RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); + return RPC_S_OK; + } + msg->RpcInterfaceInformation = sif->If; + /* copy the endpoint vector from sif to msg so that midl-generated code will use it */ + msg->ManagerEpv = sif->MgrEpv; + if (object_uuid != NULL) { + RPCRT4_SetBindingObject(msg->Handle, object_uuid); + } + + /* find dispatch function */ + msg->ProcNum = hdr->opnum; + if (sif->Flags & RPC_IF_OLE) { + /* native ole32 always gives us a dispatch table with a single entry + * (I assume that's a wrapper for IRpcStubBuffer::Invoke) */ + func = *sif->If->DispatchTable->DispatchTable; + } else { + if (msg->ProcNum >= sif->If->DispatchTable->DispatchTableCount) { + WARN("invalid procnum (%d/%d)\n", msg->ProcNum, sif->If->DispatchTable->DispatchTableCount); + response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, + NCA_S_OP_RNG_ERROR); + + RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); + } + func = sif->If->DispatchTable->DispatchTable[msg->ProcNum]; + } + + /* put in the drep. FIXME: is this more universally applicable? + perhaps we should move this outward... */ + msg->DataRepresentation = + MAKELONG( MAKEWORD(hdr->common.drep[0], hdr->common.drep[1]), + MAKEWORD(hdr->common.drep[2], hdr->common.drep[3])); + + exception = FALSE; + + /* dispatch */ + RPCRT4_SetThreadCurrentCallHandle(msg->Handle); + __TRY { + if (func) func(msg); + } __EXCEPT(rpc_filter) { + exception = TRUE; + if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) + status = ERROR_NOACCESS; + else + status = GetExceptionCode(); + response = RPCRT4_BuildFaultHeader(msg->DataRepresentation, + RPC2NCA_STATUS(status)); + } __ENDTRY + RPCRT4_SetThreadCurrentCallHandle(NULL); + + /* release any unmarshalled context handles */ + while ((context_handle = RPCRT4_PopThreadContextHandle()) != NULL) + RpcServerAssoc_ReleaseContextHandle(conn->server_binding->Assoc, context_handle, TRUE); + + if (!exception) + response = RPCRT4_BuildResponseHeader(msg->DataRepresentation, + msg->BufferLength); + + /* send response packet */ + if (response) { + status = RPCRT4_Send(conn, response, exception ? NULL : msg->Buffer, + exception ? 0 : msg->BufferLength); + RPCRT4_FreeHeader(response); + } else + ERR("out of memory\n"); + + msg->RpcInterfaceInformation = NULL; + RPCRT4_release_server_interface(sif); + + if (msg->Buffer == buf) buf = NULL; + TRACE("freeing Buffer=%p\n", buf); + I_RpcFree(buf); + + return status; +} + +static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSAGE* msg) +{ RPC_STATUS status; - BOOL exception; - NDR_SCONTEXT context_handle; msg->Handle = (RPC_BINDING_HANDLE)conn->server_binding; @@ -180,153 +341,13 @@ case PKT_BIND: TRACE("got bind packet\n"); - /* FIXME: do more checks! */ - if (hdr->bind.max_tsize < RPC_MIN_PACKET_SIZE || - !UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status) || - conn->server_binding) { - TRACE("packet size less than min size, or active interface syntax guid non-null\n"); - sif = NULL; - } else { - /* create temporary binding */ - if (RPCRT4_MakeBinding(&conn->server_binding, conn) == RPC_S_OK && - RpcServerAssoc_GetAssociation(rpcrt4_conn_get_name(conn), - conn->NetworkAddr, conn->Endpoint, - conn->NetworkOptions, - hdr->bind.assoc_gid, - &conn->server_binding->Assoc) == RPC_S_OK) - sif = RPCRT4_find_interface(NULL, &hdr->bind.abstract, FALSE); - else - sif = NULL; - } - if (sif == NULL) { - TRACE("rejecting bind request on connection %p\n", conn); - /* Report failure to client. */ - response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, - RPC_VER_MAJOR, RPC_VER_MINOR); - } else { - TRACE("accepting bind request on connection %p for %s\n", conn, - debugstr_guid(&hdr->bind.abstract.SyntaxGUID)); - - /* accept. */ - response = RPCRT4_BuildBindAckHeader(NDR_LOCAL_DATA_REPRESENTATION, - RPC_MAX_PACKET_SIZE, - RPC_MAX_PACKET_SIZE, - conn->server_binding->Assoc->assoc_group_id, - conn->Endpoint, - RESULT_ACCEPT, REASON_NONE, - &sif->If->TransferSyntax); - - /* save the interface for later use */ - conn->ActiveInterface = hdr->bind.abstract; - conn->MaxTransmissionSize = hdr->bind.max_tsize; - - RPCRT4_release_server_interface(sif); - } - - status = RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - if (status != RPC_S_OK) - goto fail; - + status = process_bind_packet(conn, &hdr->bind, msg); break; case PKT_REQUEST: TRACE("got request packet\n"); - /* fail if the connection isn't bound with an interface */ - if (UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status)) { - /* FIXME: should send BindNack instead */ - response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, - status); - - RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - break; - } - - if (hdr->common.flags & RPC_FLG_OBJECT_UUID) { - object_uuid = (UUID*)(&hdr->request + 1); - } else { - object_uuid = NULL; - } - - sif = RPCRT4_find_interface(object_uuid, &conn->ActiveInterface, TRUE); - if (!sif) { - WARN("interface %s no longer registered, returning fault packet\n", debugstr_guid(&conn->ActiveInterface.SyntaxGUID)); - response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, - NCA_S_UNK_IF); - - RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - break; - } - msg->RpcInterfaceInformation = sif->If; - /* copy the endpoint vector from sif to msg so that midl-generated code will use it */ - msg->ManagerEpv = sif->MgrEpv; - if (object_uuid != NULL) { - RPCRT4_SetBindingObject(msg->Handle, object_uuid); - } - - /* find dispatch function */ - msg->ProcNum = hdr->request.opnum; - if (sif->Flags & RPC_IF_OLE) { - /* native ole32 always gives us a dispatch table with a single entry - * (I assume that's a wrapper for IRpcStubBuffer::Invoke) */ - func = *sif->If->DispatchTable->DispatchTable; - } else { - if (msg->ProcNum >= sif->If->DispatchTable->DispatchTableCount) { - WARN("invalid procnum (%d/%d)\n", msg->ProcNum, sif->If->DispatchTable->DispatchTableCount); - response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, - NCA_S_OP_RNG_ERROR); - - RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - } - func = sif->If->DispatchTable->DispatchTable[msg->ProcNum]; - } - - /* put in the drep. FIXME: is this more universally applicable? - perhaps we should move this outward... */ - msg->DataRepresentation = - MAKELONG( MAKEWORD(hdr->common.drep[0], hdr->common.drep[1]), - MAKEWORD(hdr->common.drep[2], hdr->common.drep[3])); - - exception = FALSE; - - /* dispatch */ - RPCRT4_SetThreadCurrentCallHandle(msg->Handle); - __TRY { - if (func) func(msg); - } __EXCEPT(rpc_filter) { - exception = TRUE; - if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) - status = ERROR_NOACCESS; - else - status = GetExceptionCode(); - response = RPCRT4_BuildFaultHeader(msg->DataRepresentation, - RPC2NCA_STATUS(status)); - } __ENDTRY - RPCRT4_SetThreadCurrentCallHandle(NULL); - - /* release any unmarshalled context handles */ - while ((context_handle = RPCRT4_PopThreadContextHandle()) != NULL) - RpcServerAssoc_ReleaseContextHandle(conn->server_binding->Assoc, context_handle, TRUE); - - if (!exception) - response = RPCRT4_BuildResponseHeader(msg->DataRepresentation, - msg->BufferLength); - - /* send response packet */ - if (response) { - status = RPCRT4_Send(conn, response, exception ? NULL : msg->Buffer, - exception ? 0 : msg->BufferLength); - RPCRT4_FreeHeader(response); - } else - ERR("out of memory\n"); - - msg->RpcInterfaceInformation = NULL; - RPCRT4_release_server_interface(sif); - + status = process_request_packet(conn, &hdr->request, msg); break; default: @@ -334,14 +355,8 @@ break; } -fail: /* clean up */ - if (msg->Buffer == buf) msg->Buffer = NULL; - TRACE("freeing Buffer=%p\n", buf); - HeapFree(GetProcessHeap(), 0, buf); - msg->Handle = 0; I_RpcFreeBuffer(msg); - msg->Buffer = NULL; RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); } @@ -388,6 +403,7 @@ HeapFree(GetProcessHeap(), 0, packet); break; } + msg = NULL; } RPCRT4_DestroyConnection(conn); @@ -1032,10 +1048,10 @@ LeaveCriticalSection(&listen_cs); return RPC_S_NOT_LISTENING; } - + do { - LeaveCriticalSection(&listen_cs); + LeaveCriticalSection(&listen_cs); LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) WaitForSingleObject(cps->server_ready_event, INFINITE); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c Fri Jan 18 20:39:35 2008 @@ -446,8 +446,8 @@ TRACE("(%p, %s, %s)\n", tower_data, networkaddr, endpoint); - networkaddr_size = strlen(networkaddr) + 1; - endpoint_size = strlen(endpoint) + 1; + networkaddr_size = networkaddr ? strlen(networkaddr) + 1 : 1; + endpoint_size = endpoint ? strlen(endpoint) + 1 : 1; size = sizeof(*smb_floor) + endpoint_size + sizeof(*nb_floor) + networkaddr_size; if (!tower_data) @@ -461,7 +461,10 @@ smb_floor->protid = EPM_PROTOCOL_SMB; smb_floor->count_rhs = endpoint_size; - memcpy(tower_data, endpoint, endpoint_size); + if (endpoint) + memcpy(tower_data, endpoint, endpoint_size); + else + tower_data[0] = 0; tower_data += endpoint_size; nb_floor = (twr_empty_floor_t *)tower_data; @@ -472,7 +475,10 @@ nb_floor->protid = EPM_PROTOCOL_NETBIOS; nb_floor->count_rhs = networkaddr_size; - memcpy(tower_data, networkaddr, networkaddr_size); + if (networkaddr) + memcpy(tower_data, networkaddr, networkaddr_size); + else + tower_data[0] = 0; tower_data += networkaddr_size; return size; @@ -1025,7 +1031,7 @@ int bytes_written = 0; do { - int r = write(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written); + int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); if (r >= 0) bytes_written += r; else if (errno != EAGAIN) Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Fri Jan 18 20:39:35 2008 @@ -30,6 +30,7 @@ <file>ndr_ole.c</file> <file>ndr_stubless.c</file> <file>rpc_assoc.c</file> + <file>rpc_async.c</file> <file>rpc_binding.c</file> <file>rpc_epmap.c</file> <file>rpc_message.c</file> Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Fri Jan 18 20:39:35 2008 @@ -18,11 +18,11 @@ @ stdcall IUnknown_AddRef_Proxy(ptr) @ stdcall IUnknown_QueryInterface_Proxy(ptr ptr ptr) @ stdcall IUnknown_Release_Proxy(ptr) -@ stub I_RpcAbortAsyncCall +@ stdcall I_RpcAbortAsyncCall(ptr long) I_RpcAsyncAbortCall @ stdcall I_RpcAllocate(long) -@ stub I_RpcAsyncAbortCall +@ stdcall I_RpcAsyncAbortCall(ptr long) @ stub I_RpcAsyncSendReceive # NT4 -@ stub I_RpcAsyncSetHandle +@ stdcall I_RpcAsyncSetHandle(ptr ptr) @ stub I_RpcBCacheAllocate @ stub I_RpcBCacheFree @ stub I_RpcBindingCopy @@ -201,9 +201,9 @@ @ stdcall NdrContextHandleSize(ptr ptr ptr) @ stdcall NdrConvert2(ptr ptr long) @ stdcall NdrConvert(ptr ptr) -@ stub NdrCorrelationFree -@ stub NdrCorrelationInitialize -@ stub NdrCorrelationPass +@ stdcall NdrCorrelationFree(ptr) +@ stdcall NdrCorrelationInitialize(ptr ptr long long) +@ stdcall NdrCorrelationPass(ptr) @ stub NdrDcomAsyncClientCall @ stub NdrDcomAsyncStubCall @ stdcall NdrDllCanUnloadNow(ptr) @@ -362,12 +362,12 @@ @ stub NdrpSetRpcSsDefaults @ stub NdrpVarVtOfTypeDesc # wxp @ stub PerformRpcInitialization -@ stub RpcAbortAsyncCall -@ stub RpcAsyncAbortCall -@ stub RpcAsyncCancelCall -@ stub RpcAsyncCompleteCall -@ stub RpcAsyncGetCallStatus -@ stub RpcAsyncInitializeHandle +@ stdcall RpcAbortAsyncCall(ptr long) RpcAsyncAbortCall +@ stdcall RpcAsyncAbortCall(ptr long) +@ stdcall RpcAsyncCancelCall(ptr long) +@ stdcall RpcAsyncCompleteCall(ptr ptr) +@ stdcall RpcAsyncGetCallStatus(ptr) +@ stdcall RpcAsyncInitializeHandle(ptr long) @ stub RpcAsyncRegisterInfo @ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) @@ -394,12 +394,12 @@ @ stdcall RpcBindingToStringBindingA(ptr ptr) @ stdcall RpcBindingToStringBindingW(ptr ptr) @ stdcall RpcBindingVectorFree(ptr) -@ stub RpcCancelAsyncCall +@ stdcall RpcCancelAsyncCall(ptr long) RpcAsyncCancelCall @ stdcall RpcCancelThread(ptr) @ stub RpcCancelThreadEx @ stub RpcCertGeneratePrincipalNameA @ stub RpcCertGeneratePrincipalNameW -@ stub RpcCompleteAsyncCall +@ stdcall RpcCompleteAsyncCall(ptr ptr) RpcAsyncCompleteCall @ stdcall RpcEpRegisterA(ptr ptr ptr str) @ stub RpcEpRegisterNoReplaceA @ stub RpcEpRegisterNoReplaceW @@ -416,11 +416,11 @@ @ stub RpcErrorSaveErrorInfo # wxp @ stdcall RpcErrorStartEnumeration(ptr) @ stub RpcFreeAuthorizationContext # wxp -@ stub RpcGetAsyncCallStatus +@ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) -@ stub RpcInitializeAsyncHandle +@ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle @ stub RpcMgmtBindingInqParameter # win9x @ stub RpcMgmtBindingSetParameter # win9x @ stdcall RpcMgmtEnableIdleCleanup() Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c Fri Jan 18 20:39:35 2008 @@ -19,74 +19,13 @@ * * WINE RPC TODO's (and a few TODONT's) * - * - Ove's decreasingly incomplete widl is an IDL compiler for wine. For widl - * to be wine's only IDL compiler, a fair bit of work remains to be done. - * until then we have used some midl-generated stuff. (What?) - * widl currently doesn't generate stub/proxy files required by wine's (O)RPC - * capabilities -- nor does it make those lovely format strings :( - * The MS MIDL compiler does some really esoteric stuff. Of course Ove has - * started with the less esoteric stuff. There are also lots of nice - * comments in there if you want to flex your bison and help build this monster. - * - * - RPC has a quite featureful error handling mechanism; basically none of this is - * implemented right now. We also have deficiencies on the compiler side, where - * wine's __TRY / __EXCEPT / __FINALLY macros are not even used for RpcTryExcept & co, - * due to syntactic differences! (we can fix it with widl by using __TRY) - * - * - There are several different memory allocation schemes for MSRPC. - * I don't even understand what they all are yet, much less have them - * properly implemented. Surely we are supposed to be doing something with - * the user-provided allocation/deallocation functions, but so far, - * I don't think we are doing this... - * - * - MSRPC provides impersonation capabilities which currently are not possible - * to implement in wine. At the very least we should implement the authorization - * API's & gracefully ignore the irrelevant stuff (to an extent we already do). - * - * - Some transports are not yet implemented. The existing transport implementations - * are incomplete and may be bug-infested. - * - * - The various transports that we do support ought to be supported in a more - * object-oriented manner, as in DCE's RPC implementation, instead of cluttering - * up the code with conditionals like we do now. - * - * - Data marshalling: So far, only the beginnings of a full implementation - * exist in wine. NDR protocol itself is documented, but the MS API's to - * convert data-types in memory into NDR are not. This is challenging work, - * and has supposedly been "at the top of Greg's queue" for several months now. - * - * - ORPC is RPC for OLE; once we have a working RPC framework, we can - * use it to implement out-of-process OLE client/server communications. - * ATM there is maybe a disconnect between the marshalling in the OLE DLLs - * and the marshalling going on here [TODO: well, is there or not?] - * - * - In-source API Documentation, at least for those functions which we have - * implemented, but preferably for everything we can document, would be nice, - * since some of this stuff is quite obscure. - * - * - Name services... [TODO: what about them] - * - * - Protocol Towers: Totally unimplemented.... I think. - * - * - Context Handle Rundown: whatever that is. - * - * - Nested RPC's: Totally unimplemented. - * * - Statistics: we are supposed to be keeping various counters. we aren't. * * - Async RPC: Unimplemented. - * - * - XML/http RPC: Somewhere there's an XML fiend that wants to do this! Betcha - * we could use these as a transport for RPC's across computers without a - * permissions and/or licensing crisis. * * - The NT "ports" API, aka LPC. Greg claims this is on his radar. Might (or * might not) enable users to get some kind of meaningful result out of * NT-based native rpcrt4's. Commonly-used transport for self-to-self RPC's. - * - * - ...? More stuff I haven't thought of. If you think of more RPC todo's - * drop me an e-mail <gmturner007(a)ameritech.net> or send a patch to the - * wine-patches mailing list. */ #include "config.h" @@ -96,6 +35,8 @@ #include <stdlib.h> #include <string.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winerror.h" #include "winbase.h" @@ -871,11 +812,128 @@ /****************************************************************************** * I_RpcMapWin32Status (rpcrt4.@) + * + * Maps Win32 RPC error codes to NT statuses. + * + * PARAMS + * status [I] Win32 RPC error code. + * + * RETURNS + * Appropriate translation into an NT status code. */ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) { - FIXME("(%ld): stub\n", status); - return 0; + TRACE("(%ld)\n", status); + switch (status) + { + case ERROR_ACCESS_DENIED: return STATUS_ACCESS_DENIED; + case ERROR_INVALID_HANDLE: return RPC_NT_SS_CONTEXT_MISMATCH; + case ERROR_OUTOFMEMORY: return STATUS_NO_MEMORY; + case ERROR_INVALID_PARAMETER: return STATUS_INVALID_PARAMETER; + case ERROR_INSUFFICIENT_BUFFER: return STATUS_BUFFER_TOO_SMALL; + case ERROR_MAX_THRDS_REACHED: return STATUS_NO_MEMORY; + case ERROR_NOACCESS: return STATUS_ACCESS_VIOLATION; + case ERROR_NOT_ENOUGH_SERVER_MEMORY: return STATUS_INSUFF_SERVER_RESOURCES; + case ERROR_WRONG_PASSWORD: return STATUS_WRONG_PASSWORD; + case ERROR_INVALID_LOGON_HOURS: return STATUS_INVALID_LOGON_HOURS; + case ERROR_PASSWORD_EXPIRED: return STATUS_PASSWORD_EXPIRED; + case ERROR_ACCOUNT_DISABLED: return STATUS_ACCOUNT_DISABLED; + case ERROR_INVALID_SECURITY_DESCR: return STATUS_INVALID_SECURITY_DESCR; + case RPC_S_INVALID_STRING_BINDING: return RPC_NT_INVALID_STRING_BINDING; + case RPC_S_WRONG_KIND_OF_BINDING: return RPC_NT_WRONG_KIND_OF_BINDING; + case RPC_S_INVALID_BINDING: return RPC_NT_INVALID_BINDING; + case RPC_S_PROTSEQ_NOT_SUPPORTED: return RPC_NT_PROTSEQ_NOT_SUPPORTED; + case RPC_S_INVALID_RPC_PROTSEQ: return RPC_NT_INVALID_RPC_PROTSEQ; + case RPC_S_INVALID_STRING_UUID: return RPC_NT_INVALID_STRING_UUID; + case RPC_S_INVALID_ENDPOINT_FORMAT: return RPC_NT_INVALID_ENDPOINT_FORMAT; + case RPC_S_INVALID_NET_ADDR: return RPC_NT_INVALID_NET_ADDR; + case RPC_S_NO_ENDPOINT_FOUND: return RPC_NT_NO_ENDPOINT_FOUND; + case RPC_S_INVALID_TIMEOUT: return RPC_NT_INVALID_TIMEOUT; + case RPC_S_OBJECT_NOT_FOUND: return RPC_NT_OBJECT_NOT_FOUND; + case RPC_S_ALREADY_REGISTERED: return RPC_NT_ALREADY_REGISTERED; + case RPC_S_TYPE_ALREADY_REGISTERED: return RPC_NT_TYPE_ALREADY_REGISTERED; + case RPC_S_ALREADY_LISTENING: return RPC_NT_ALREADY_LISTENING; + case RPC_S_NO_PROTSEQS_REGISTERED: return RPC_NT_NO_PROTSEQS_REGISTERED; + case RPC_S_NOT_LISTENING: return RPC_NT_NOT_LISTENING; + case RPC_S_UNKNOWN_MGR_TYPE: return RPC_NT_UNKNOWN_MGR_TYPE; + case RPC_S_UNKNOWN_IF: return RPC_NT_UNKNOWN_IF; + case RPC_S_NO_BINDINGS: return RPC_NT_NO_BINDINGS; + case RPC_S_NO_PROTSEQS: return RPC_NT_NO_PROTSEQS; + case RPC_S_CANT_CREATE_ENDPOINT: return RPC_NT_CANT_CREATE_ENDPOINT; + case RPC_S_OUT_OF_RESOURCES: return RPC_NT_OUT_OF_RESOURCES; + case RPC_S_SERVER_UNAVAILABLE: return RPC_NT_SERVER_UNAVAILABLE; + case RPC_S_SERVER_TOO_BUSY: return RPC_NT_SERVER_TOO_BUSY; + case RPC_S_INVALID_NETWORK_OPTIONS: return RPC_NT_INVALID_NETWORK_OPTIONS; + case RPC_S_NO_CALL_ACTIVE: return RPC_NT_NO_CALL_ACTIVE; + case RPC_S_CALL_FAILED: return RPC_NT_CALL_FAILED; + case RPC_S_CALL_FAILED_DNE: return RPC_NT_CALL_FAILED_DNE; + case RPC_S_PROTOCOL_ERROR: return RPC_NT_PROTOCOL_ERROR; + case RPC_S_UNSUPPORTED_TRANS_SYN: return RPC_NT_UNSUPPORTED_TRANS_SYN; + case RPC_S_UNSUPPORTED_TYPE: return RPC_NT_UNSUPPORTED_TYPE; + case RPC_S_INVALID_TAG: return RPC_NT_INVALID_TAG; + case RPC_S_INVALID_BOUND: return RPC_NT_INVALID_BOUND; + case RPC_S_NO_ENTRY_NAME: return RPC_NT_NO_ENTRY_NAME; + case RPC_S_INVALID_NAME_SYNTAX: return RPC_NT_INVALID_NAME_SYNTAX; + case RPC_S_UNSUPPORTED_NAME_SYNTAX: return RPC_NT_UNSUPPORTED_NAME_SYNTAX; + case RPC_S_UUID_NO_ADDRESS: return RPC_NT_UUID_NO_ADDRESS; + case RPC_S_DUPLICATE_ENDPOINT: return RPC_NT_DUPLICATE_ENDPOINT; + case RPC_S_UNKNOWN_AUTHN_TYPE: return RPC_NT_UNKNOWN_AUTHN_TYPE; + case RPC_S_MAX_CALLS_TOO_SMALL: return RPC_NT_MAX_CALLS_TOO_SMALL; + case RPC_S_STRING_TOO_LONG: return RPC_NT_STRING_TOO_LONG; + case RPC_S_PROTSEQ_NOT_FOUND: return RPC_NT_PROTSEQ_NOT_FOUND; + case RPC_S_PROCNUM_OUT_OF_RANGE: return RPC_NT_PROCNUM_OUT_OF_RANGE; + case RPC_S_BINDING_HAS_NO_AUTH: return RPC_NT_BINDING_HAS_NO_AUTH; + case RPC_S_UNKNOWN_AUTHN_SERVICE: return RPC_NT_UNKNOWN_AUTHN_SERVICE; + case RPC_S_UNKNOWN_AUTHN_LEVEL: return RPC_NT_UNKNOWN_AUTHN_LEVEL; + case RPC_S_INVALID_AUTH_IDENTITY: return RPC_NT_INVALID_AUTH_IDENTITY; + case RPC_S_UNKNOWN_AUTHZ_SERVICE: return RPC_NT_UNKNOWN_AUTHZ_SERVICE; + case EPT_S_INVALID_ENTRY: return EPT_NT_INVALID_ENTRY; + case EPT_S_CANT_PERFORM_OP: return EPT_NT_CANT_PERFORM_OP; + case EPT_S_NOT_REGISTERED: return EPT_NT_NOT_REGISTERED; + case EPT_S_CANT_CREATE: return EPT_NT_CANT_CREATE; + case RPC_S_NOTHING_TO_EXPORT: return RPC_NT_NOTHING_TO_EXPORT; + case RPC_S_INCOMPLETE_NAME: return RPC_NT_INCOMPLETE_NAME; + case RPC_S_INVALID_VERS_OPTION: return RPC_NT_INVALID_VERS_OPTION; + case RPC_S_NO_MORE_MEMBERS: return RPC_NT_NO_MORE_MEMBERS; + case RPC_S_NOT_ALL_OBJS_UNEXPORTED: return RPC_NT_NOT_ALL_OBJS_UNEXPORTED; + case RPC_S_INTERFACE_NOT_FOUND: return RPC_NT_INTERFACE_NOT_FOUND; + case RPC_S_ENTRY_ALREADY_EXISTS: return RPC_NT_ENTRY_ALREADY_EXISTS; + case RPC_S_ENTRY_NOT_FOUND: return RPC_NT_ENTRY_NOT_FOUND; + case RPC_S_NAME_SERVICE_UNAVAILABLE: return RPC_NT_NAME_SERVICE_UNAVAILABLE; + case RPC_S_INVALID_NAF_ID: return RPC_NT_INVALID_NAF_ID; + case RPC_S_CANNOT_SUPPORT: return RPC_NT_CANNOT_SUPPORT; + case RPC_S_NO_CONTEXT_AVAILABLE: return RPC_NT_NO_CONTEXT_AVAILABLE; + case RPC_S_INTERNAL_ERROR: return RPC_NT_INTERNAL_ERROR; + case RPC_S_ZERO_DIVIDE: return RPC_NT_ZERO_DIVIDE; + case RPC_S_ADDRESS_ERROR: return RPC_NT_ADDRESS_ERROR; + case RPC_S_FP_DIV_ZERO: return RPC_NT_FP_DIV_ZERO; + case RPC_S_FP_UNDERFLOW: return RPC_NT_FP_UNDERFLOW; + case RPC_S_FP_OVERFLOW: return RPC_NT_FP_OVERFLOW; + case RPC_S_CALL_IN_PROGRESS: return RPC_NT_CALL_IN_PROGRESS; + case RPC_S_NO_MORE_BINDINGS: return RPC_NT_NO_MORE_BINDINGS; + case RPC_S_CALL_CANCELLED: return RPC_NT_CALL_CANCELLED; + case RPC_S_INVALID_OBJECT: return RPC_NT_INVALID_OBJECT; + case RPC_S_INVALID_ASYNC_HANDLE: return RPC_NT_INVALID_ASYNC_HANDLE; + case RPC_S_INVALID_ASYNC_CALL: return RPC_NT_INVALID_ASYNC_CALL; + case RPC_S_GROUP_MEMBER_NOT_FOUND: return RPC_NT_GROUP_MEMBER_NOT_FOUND; + case RPC_X_NO_MORE_ENTRIES: return RPC_NT_NO_MORE_ENTRIES; + case RPC_X_SS_CHAR_TRANS_OPEN_FAIL: return RPC_NT_SS_CHAR_TRANS_OPEN_FAIL; + case RPC_X_SS_CHAR_TRANS_SHORT_FILE: return RPC_NT_SS_CHAR_TRANS_SHORT_FILE; + case RPC_X_SS_IN_NULL_CONTEXT: return RPC_NT_SS_IN_NULL_CONTEXT; + case RPC_X_SS_CONTEXT_DAMAGED: return RPC_NT_SS_CONTEXT_DAMAGED; + case RPC_X_SS_HANDLES_MISMATCH: return RPC_NT_SS_HANDLES_MISMATCH; + case RPC_X_SS_CANNOT_GET_CALL_HANDLE: return RPC_NT_SS_CANNOT_GET_CALL_HANDLE; + case RPC_X_NULL_REF_POINTER: return RPC_NT_NULL_REF_POINTER; + case RPC_X_ENUM_VALUE_OUT_OF_RANGE: return RPC_NT_ENUM_VALUE_OUT_OF_RANGE; + case RPC_X_BYTE_COUNT_TOO_SMALL: return RPC_NT_BYTE_COUNT_TOO_SMALL; + case RPC_X_BAD_STUB_DATA: return RPC_NT_BAD_STUB_DATA; + case RPC_X_PIPE_CLOSED: return RPC_NT_PIPE_CLOSED; + case RPC_X_PIPE_DISCIPLINE_ERROR: return RPC_NT_PIPE_DISCIPLINE_ERROR; + case RPC_X_PIPE_EMPTY: return RPC_NT_PIPE_EMPTY; + case ERROR_PASSWORD_MUST_CHANGE: return STATUS_PASSWORD_MUST_CHANGE; + case ERROR_ACCOUNT_LOCKED_OUT: return STATUS_ACCOUNT_LOCKED_OUT; + default: return status; + } } /****************************************************************************** Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Fri Jan 18 20:39:35 2008 @@ -1,5 +1,7 @@ ---- rpc_server.c Tue Jan 01 13:09:34 2008 -+++ rpc_server.c Fri Jan 11 15:58:57 2008 +Index: rpc_server.c +=================================================================== +--- rpc_server.c (working copy) ++++ rpc_server.c (working copy) @@ -1017,22 +1017,30 @@ /*********************************************************************** * RpcMgmtServerWaitListen (RPCRT4.@) @@ -33,8 +35,10 @@ } /*********************************************************************** ---- rpc_transport.c Sun Jan 06 19:27:38 2008 -+++ rpc_transport.c Fri Jan 11 15:59:32 2008 +Index: rpc_transport.c +=================================================================== +--- rpc_transport.c (working copy) ++++ rpc_transport.c (working copy) @@ -54,10 +54,13 @@ #endif #ifdef HAVE_SYS_POLL_H

1 0

[dreimer] 31873: Begin of adding DS_SHELLFONT to all RC files. Changed the Font Size of Calc. 9 -> 8
by dreimer＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: dreimer Date: Fri Jan 18 20:28:28 2008 New Revision: 31873 URL: http://svn.reactos.org/svn/reactos?rev=31873&view=rev Log: Begin of adding DS_SHELLFONT to all RC files. Changed the Font Size of Calc. 9 -> 8 Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/ca-ES.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fi-FI.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/hu-HU.rc trunk/reactos/base/applications/calc/lang/id-ID.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/nb-NO.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pt-BR.rc trunk/reactos/base/applications/calc/lang/pt-PT.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/charmap/lang/bg-BG.rc trunk/reactos/base/applications/charmap/lang/ca-ES.rc trunk/reactos/base/applications/charmap/lang/de-DE.rc trunk/reactos/base/applications/charmap/lang/el-GR.rc trunk/reactos/base/applications/charmap/lang/en-US.rc trunk/reactos/base/applications/charmap/lang/es-ES.rc trunk/reactos/base/applications/charmap/lang/fr-FR.rc trunk/reactos/base/applications/charmap/lang/id-ID.rc trunk/reactos/base/applications/charmap/lang/it-IT.rc trunk/reactos/base/applications/charmap/lang/lt-LT.rc trunk/reactos/base/applications/charmap/lang/pl-PL.rc trunk/reactos/base/applications/charmap/lang/pt-BR.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/sk-SK.rc trunk/reactos/base/applications/charmap/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc Fri Jan 18 20:28:28 2008 @@ -123,10 +123,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Çà GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "Äîáðå", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -139,10 +139,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Ñòàòèñòèêà" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/calc/lang/ca-ES.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "En quant a GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "Acceptar", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -160,10 +160,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Cuadre Estadístic" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc Fri Jan 18 20:28:28 2008 @@ -147,10 +147,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "O GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -162,10 +162,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Info über GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -160,10 +160,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistik Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc Fri Jan 18 20:28:28 2008 @@ -144,10 +144,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Ðåñß ôïõ GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -160,10 +160,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "About GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Acerca de GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "Aceptar", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Cuadro de estadísticas" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fi-FI.rc (original) +++ trunk/reactos/base/applications/calc/lang/fi-FI.rc Fri Jan 18 20:28:28 2008 @@ -121,10 +121,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "About GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -139,8 +139,8 @@ DLG_STATS DIALOG 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc Fri Jan 18 20:28:28 2008 @@ -150,8 +150,8 @@ DLG_ABOUT DIALOG 12,0,175,90 CAPTION "À propos de GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -166,8 +166,8 @@ DLG_STATS DIALOG 12,0,145,85 CAPTION "Outils Statistiques Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/calc/lang/hu-HU.rc Fri Jan 18 20:28:28 2008 @@ -146,10 +146,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "GNU winecalc (számológép) névjegye" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -162,10 +162,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statisztika" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/calc/lang/id-ID.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Tentang GNU WineCalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -163,8 +163,8 @@ DLG_STATS DIALOG 12,0,145,85 CAPTION "Kotak Statistik" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Informazioni su GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistiche" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc Fri Jan 18 20:28:28 2008 @@ -124,18 +124,18 @@ END -DLG_ABOUT DIALOG 12, 0, 175, 90 -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_ABOUT DIALOGEX 12, 0, 175, 90 +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "GNU winecalc ÉÂ¢Ä" BEGIN DEFPUSHBUTTON "OK",IDOK,73,70,30,14 END -DLG_STATS DIALOG 12, 0, 145, 85 -STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +DLG_STATS DIALOGEX 12, 0, 145, 85 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "vBEGINbNX" -FONT 9, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "ßé(&R)",ID_STATS_RET,4,52,30,13,WS_GROUP PUSHBUTTON "[h(&L)",ID_STATS_LOAD,39,52,30,13,WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/calc/lang/nb-NO.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Om GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc Fri Jan 18 20:28:28 2008 @@ -153,18 +153,18 @@ END END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Over GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc Fri Jan 18 20:28:28 2008 @@ -125,10 +125,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Informacje GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -141,10 +141,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-BR.rc (original) +++ trunk/reactos/base/applications/calc/lang/pt-BR.rc Fri Jan 18 20:28:28 2008 @@ -153,17 +153,18 @@ END END -DLG_ABOUT DIALOG 12,0,120,82 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Sobre a Calculadora" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -DLG_STATS DIALOG 12,0,125,78 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/calc/lang/pt-PT.rc Fri Jan 18 20:28:28 2008 @@ -153,18 +153,18 @@ END END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "About GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc Fri Jan 18 20:28:28 2008 @@ -121,10 +121,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Î ïðîãðàììå GNU WineCalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -137,10 +137,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Ñòàòèñòèêà" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc Fri Jan 18 20:28:28 2008 @@ -132,10 +132,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Èo je Kalkulaèka" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -148,10 +148,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "tatistika" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc Fri Jan 18 20:28:28 2008 @@ -146,10 +146,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Om GNU Kalkylatorn (winecalc)" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -162,10 +162,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistikruta" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "à¡ÕèÂÇ¡Ñº GNU WineCalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "µ¡Å§", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "¡ÅèÍ§Ê¶Ò¹Ð" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Ïðî GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc Fri Jan 18 20:28:28 2008 @@ -147,10 +147,9 @@ DLG_ABOUT DIALOGEX 12, 0, 140, 95 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¹ØÓÚ GNU winecalc" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN //LTEXT "ÖÐÎÄ·Òë:ÕÅ±ù (e_zb(a)21cn.com, ezb(a)mail.gywb.cn)",IDC_STATIC, 5, 57, 111, 25 DEFPUSHBUTTON "È·¶¨",IDOK, 55, 75, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -164,10 +163,10 @@ END END -DLG_STATS DIALOG 12,0,125,78 +DLG_STATS DIALOGEX 12,0,125,78 CAPTION "Í³¼Æ¿ò" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -FONT 9, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "·µ»Ø(&R)", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "¼ÓÔØ(&L)", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/charmap/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/charmap/lang/bg-BG.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Çíàêîâ èçáîðíèê" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Çà çíàêîâèÿ èçáîðíèê" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Çíàêîâ èçáîðíèê, â0,1\nÂúçïðîèçâîäñòâåíî ïðàâî (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Çàòâàðÿíå", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ca-ES.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa de caràcters" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "En quanta al Mapa de caràcters" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Tancar", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/charmap/lang/de-DE.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Zeichentabelle" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Schrift:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Über Zeichentabelle" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Zeichentabelle v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/charmap/lang/el-GR.rc Fri Jan 18 20:28:28 2008 @@ -1,7 +1,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT IDD_CHARMAP DIALOGEX 6, 6, 293, 205 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ðßíáêáò ÷áñáêôÞñùí" FONT 8, "MS Shell Dlg" BEGIN @@ -18,7 +18,7 @@ END IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ðëçñïöïñßåò" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN Modified: trunk/reactos/base/applications/charmap/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/en-US.rc (original) +++ trunk/reactos/base/applications/charmap/lang/en-US.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "About Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/charmap/lang/es-ES.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa de Caracteres" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Fuente :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Acerca de Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/charmap/lang/fr-FR.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Table des Caractères" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Police :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "À propos de la Table des Caractères" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Table des Caractères v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/charmap/lang/id-ID.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Peta Karakter" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Tentang Peta Karakter" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nHak Cipta (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/charmap/lang/it-IT.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Informazioni su Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/lt-LT.rc (original) +++ trunk/reactos/base/applications/charmap/lang/lt-LT.rc Fri Jan 18 20:28:28 2008 @@ -12,7 +12,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Simboliø lentelë" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Ðriftas:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -29,7 +29,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Apie simboliø lentelæ" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Uþverti", IDOK, 83, 161, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/charmap/lang/pl-PL.rc Fri Jan 18 20:28:28 2008 @@ -8,7 +8,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Tablica znaków" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Czci&onka:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -25,7 +25,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Informacje o tablicy znaków" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Tablica znaków v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/pt-BR.rc (original) +++ trunk/reactos/base/applications/charmap/lang/pt-BR.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa de caracteres" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Fonte :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Sobre o Mapa de caracteres" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Mapa de caracteres v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Fechar", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc Fri Jan 18 20:28:28 2008 @@ -5,7 +5,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Òàáëèöà ñèìâîëîâ" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Øðèôò:", IDC_STATIC, 6, 7, 27, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -22,7 +22,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Î Òàáëèöå ñèìâîëîâ" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Òàáëèöà ñèìâîëîâ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/charmap/lang/sk-SK.rc Fri Jan 18 20:28:28 2008 @@ -11,7 +11,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa znakov" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Pís&mo:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -28,7 +28,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Èo je Mapa znakov" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Mapa znakov v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "&Zavrie", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc Fri Jan 18 20:28:28 2008 @@ -11,7 +11,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Òàáëèöÿ ñèìâîë³â" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -28,7 +28,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Ïðî Òàáëèöþ ñèìâîë³â" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Òàáëèöÿ ñèìâîë³â v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Çàêðèòè", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Fri Jan 18 20:28:28 2008 @@ -13,7 +13,7 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT

1 0

[cfinck] 31872: Hopefully the last fix to get this to compile under Windows and Unix hosts...
by cfinck＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cfinck Date: Fri Jan 18 20:14:31 2008 New Revision: 31872 URL: http://svn.reactos.org/svn/reactos?rev=31872&view=rev Log: Hopefully the last fix to get this to compile under Windows and Unix hosts... Modified: trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Fri Jan 18 20:14:31 2008 @@ -106,19 +106,18 @@ #include <stdarg.h> #include "guiddef.h" #include "wine/rpcfc.h" -@@ -31,8 +38,10 @@ - typedef GUID UUID; - #endif +@@ -34,6 +41,11 @@ + #define TRUE 1 + #define FALSE 0 --#define TRUE 1 --#define FALSE 0 +// All hosts, which don't define O_BINARY, don't need it :-) +#ifndef O_BINARY +#define O_BINARY 0 +#endif - ++ typedef struct _attr_t attr_t; typedef struct _expr_t expr_t; + typedef struct _type_t type_t; Index: write_msft.c =================================================================== --- write_msft.c (revision 31863) Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Fri Jan 18 20:14:31 2008 @@ -37,6 +37,9 @@ #define UUID_DEFINED typedef GUID UUID; #endif + +#define TRUE 1 +#define FALSE 0 // All hosts, which don't define O_BINARY, don't need it :-) #ifndef O_BINARY

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008