Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 30437: I thought these changes were in the last commit..
by gedmurphy＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: gedmurphy Date: Wed Nov 14 14:43:10 2007 New Revision: 30437 URL: http://svn.reactos.org/svn/reactos?rev=30437&view=rev Log: I thought these changes were in the last commit.. Modified: trunk/reactos/base/applications/mstsc/connectdialog.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Wed Nov 14 14:43:10 2007 @@ -1093,7 +1093,7 @@ HDC hdcMem = CreateCompatibleDC(hdc); if (hdcMem) { - WCHAR lpBuffer[32]; + WCHAR szBuffer[32]; RECT bmpRc, txtRc; LOGFONTW lf; HFONT hFont; @@ -1120,7 +1120,10 @@ ZeroMemory(&lf, sizeof(LOGFONT)); - if (LoadStringW(hInst, IDS_HEADERTEXT1, lpBuffer, 32)) + if (LoadStringW(hInst, + IDS_HEADERTEXT1, + szBuffer, + sizeof(szBuffer) / sizeof(WCHAR))) { lf.lfHeight = 24; lf.lfCharSet = OEM_CHARSET; @@ -1136,7 +1139,11 @@ DPtoLP(hdc, (PPOINT)&txtRc, 2); SetTextColor(hdc, RGB(255,255,255)); SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, lpBuffer, -1, &txtRc, DT_BOTTOM | DT_SINGLELINE); + DrawTextW(hdc, + szBuffer, + -1, + &txtRc, + DT_BOTTOM | DT_SINGLELINE); DeleteObject(hFont); } } @@ -1146,7 +1153,10 @@ txtRc.right = bmpRc.right * 0.75; txtRc.bottom = pInfo->headerbitmap.bmHeight * 0.9; - if (LoadStringW(hInst, IDS_HEADERTEXT2, lpBuffer, 32)) + if (LoadStringW(hInst, + IDS_HEADERTEXT2, + szBuffer, + sizeof(szBuffer) / sizeof(WCHAR))) { lf.lfHeight = 30; lf.lfCharSet = OEM_CHARSET; @@ -1162,7 +1172,11 @@ DPtoLP(hdc, (PPOINT)&txtRc, 2); SetTextColor(hdc, RGB(255,255,255)); SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, lpBuffer, -1, &txtRc, DT_TOP | DT_SINGLELINE); + DrawTextW(hdc, + szBuffer, + -1, + &txtRc, + DT_TOP | DT_SINGLELINE); } }

1 0

[cwittich] 30436: add stub for Wow64EnableWow64FsRedirection
by cwittich＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: cwittich Date: Wed Nov 14 14:39:32 2007 New Revision: 30436 URL: http://svn.reactos.org/svn/reactos?rev=30436&view=rev Log: add stub for Wow64EnableWow64FsRedirection Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Wed Nov 14 14:39:32 2007 @@ -972,6 +972,7 @@ WaitNamedPipeW@8 WideCharToMultiByte@32 WinExec@8 +Wow64EnableWow64FsRedirection@4 Wow64DisableWow64FsRedirection@4 Wow64RevertWow64FsRedirection@4 WriteConsoleA@20 Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Nov 14 14:39:32 2007 @@ -1344,6 +1344,14 @@ BOOL STDCALL +Wow64EnableWow64FsRedirection (BOOL Wow64EnableWow64FsRedirection) +{ + STUB; + return FALSE; +} + +BOOL +STDCALL Wow64DisableWow64FsRedirection (VOID ** pv) { STUB;

1 0

[gedmurphy] 30435: load the header text from the resources
by gedmurphy＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: gedmurphy Date: Wed Nov 14 14:34:10 2007 New Revision: 30435 URL: http://svn.reactos.org/svn/reactos?rev=30435&view=rev Log: load the header text from the resources Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/res/header.bmp trunk/reactos/base/applications/mstsc/res/header.pdn trunk/reactos/base/applications/mstsc/resource.h trunk/reactos/base/applications/mstsc/rsrc.rc Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Wed Nov 14 14:34:10 2007 @@ -52,6 +52,7 @@ ReLoadDisplayPage(pInfo); } } + static VOID DoSaveAs(PINFO pInfo) @@ -932,6 +933,8 @@ GWLP_USERDATA, (LONG_PTR)pInfo); + pInfo->hSelf = hwnd; + /* add main settings pointer */ pInfo->pRdpSettings = pRdpSettings; @@ -1090,16 +1093,79 @@ HDC hdcMem = CreateCompatibleDC(hdc); if (hdcMem) { + WCHAR lpBuffer[32]; + RECT bmpRc, txtRc; + LOGFONTW lf; + HFONT hFont; + + GetClientRect(pInfo->hSelf, &bmpRc); + SelectObject(hdcMem, pInfo->hHeader); - BitBlt(hdc, - 0, - 0, - pInfo->headerbitmap.bmWidth, - pInfo->headerbitmap.bmHeight, - hdcMem, - 0, - 0, - SRCCOPY); + StretchBlt(hdc, + 0, + 0, + bmpRc.right, + pInfo->headerbitmap.bmHeight, + hdcMem, + 0, + 0, + pInfo->headerbitmap.bmWidth, + pInfo->headerbitmap.bmHeight, + SRCCOPY); + + txtRc.left = bmpRc.right * 0.25; + txtRc.top = 10; + txtRc.right = bmpRc.right * 0.75; + txtRc.bottom = pInfo->headerbitmap.bmHeight * 0.5; + + ZeroMemory(&lf, sizeof(LOGFONT)); + + if (LoadStringW(hInst, IDS_HEADERTEXT1, lpBuffer, 32)) + { + lf.lfHeight = 24; + lf.lfCharSet = OEM_CHARSET; + lf.lfQuality = DEFAULT_QUALITY; + lf.lfWeight = FW_MEDIUM; + wcscpy(lf.lfFaceName, L"Tahoma"); + + hFont = CreateFontIndirectW(&lf); + if (hFont) + { + SelectObject(hdc, hFont); + + DPtoLP(hdc, (PPOINT)&txtRc, 2); + SetTextColor(hdc, RGB(255,255,255)); + SetBkMode(hdc, TRANSPARENT); + DrawTextW(hdc, lpBuffer, -1, &txtRc, DT_BOTTOM | DT_SINGLELINE); + DeleteObject(hFont); + } + } + + txtRc.left = bmpRc.right * 0.25; + txtRc.top = txtRc.bottom - 5; + txtRc.right = bmpRc.right * 0.75; + txtRc.bottom = pInfo->headerbitmap.bmHeight * 0.9; + + if (LoadStringW(hInst, IDS_HEADERTEXT2, lpBuffer, 32)) + { + lf.lfHeight = 30; + lf.lfCharSet = OEM_CHARSET; + lf.lfQuality = DEFAULT_QUALITY; + lf.lfWeight = FW_EXTRABOLD; + wcscpy(lf.lfFaceName, L"Tahoma"); + + hFont = CreateFontIndirectW(&lf); + if (hFont) + { + SelectObject(hdc, hFont); + + DPtoLP(hdc, (PPOINT)&txtRc, 2); + SetTextColor(hdc, RGB(255,255,255)); + SetBkMode(hdc, TRANSPARENT); + DrawTextW(hdc, lpBuffer, -1, &txtRc, DT_TOP | DT_SINGLELINE); + } + } + DeleteDC(hdcMem); } Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc Wed Nov 14 14:34:10 2007 @@ -38,14 +38,14 @@ LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END -IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 267 +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Remote Desktop Connection" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Connect",IDOK,147,249,50,14 - PUSHBUTTON "Cancel",IDCANCEL,203,249,50,14 - CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,54,246,190 + DEFPUSHBUTTON "Connect",IDOK,147,245,50,14 + PUSHBUTTON "Cancel",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 END @@ -60,4 +60,6 @@ IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Full Screen" IDS_BROWSESERVER "<Browse for more...>" + IDS_HEADERTEXT1 "Remote Desktop" + IDS_HEADERTEXT2 "Connection" END Modified: trunk/reactos/base/applications/mstsc/res/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mstsc/res/header.pdn URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h (original) +++ trunk/reactos/base/applications/mstsc/resource.h Wed Nov 14 14:34:10 2007 @@ -26,14 +26,17 @@ #define IDB_HEADER 1100 #define IDB_SPECT 1101 -#define IDI_LOGON 2000 -#define IDI_CONN 2001 -#define IDI_REMOTE 2002 -#define IDI_COLORS 2003 -#define IDI_MSTSC 2004 +#define IDI_MSTSC 2000 +#define IDI_LOGON 2001 +#define IDI_CONN 2002 +#define IDI_REMOTE 2003 +#define IDI_COLORS 2004 + #define IDS_TAB_DISPLAY 3000 #define IDS_TAB_GENERAL 3001 #define IDS_PIXEL 3006 #define IDS_FULLSCREEN 3007 #define IDS_BROWSESERVER 3008 +#define IDS_HEADERTEXT1 3009 +#define IDS_HEADERTEXT2 3010 Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc Wed Nov 14 14:34:10 2007 @@ -14,7 +14,7 @@ IDB_HEADER BITMAP "res/header.bmp" IDB_SPECT BITMAP "res/spectrum.bmp" -#include "lang/de-DE.rc" +//#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/ru-RU.rc" +//#include "lang/fr-FR.rc" +//#include "lang/ru-RU.rc"

1 0

[hpoussin] 30434: Let Wine library use kernel32 functions
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 13:56:17 2007 New Revision: 30434 URL: http://svn.reactos.org/svn/reactos?rev=30434&view=rev Log: Let Wine library use kernel32 functions Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Wed Nov 14 13:56:17 2007 @@ -21,8 +21,8 @@ <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> <library>crt</library> + <library>wine</library> <library>kernel32</library> - <library>wine</library> <library>ntdll</library> <pch>precomp.h</pch> <file>dllmain.c</file>

1 0

[hpoussin] 30433: Add missing debug channel declarations
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 12:02:53 2007 New Revision: 30433 URL: http://svn.reactos.org/svn/reactos?rev=30433&view=rev Log: Add missing debug channel declarations Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/wlx.c trunk/reactos/dll/win32/iphlpapi/media.c trunk/reactos/dll/win32/kernel32/file/lock.c trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/msgina/stubs.c trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/newdev/stubs.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/draw.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/messagebox.c trunk/reactos/dll/win32/user32/windows/paint.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Wed Nov 14 12:02:53 2007 @@ -112,7 +112,7 @@ } else if (dwType != REG_SZ) { - TRACE("Wrong type for %S\\%S registry entry (got 0x%lx, expected 0x%lx)\n", + TRACE("Wrong type for %S\\%S registry entry (got 0x%lx, expected 0x%x)\n", SubKey, ValueName, dwType, REG_SZ); goto cleanup; } @@ -415,7 +415,7 @@ pACL, FALSE)) // not a default DACL { - ERR("SetSecurityDescriptorDacl Error %u\n", GetLastError()); + ERR("SetSecurityDescriptorDacl Error %lu\n", GetLastError()); HeapFree(GetProcessHeap(), 0, pMem); return STATUS_UNSUCCESSFUL; } @@ -466,7 +466,7 @@ Status = CreateLogoffSecurityAttributes(&psa); if (!NT_SUCCESS(Status)) { - ERR("Failed to create a required security descriptor. Status 0x%08x\n", Status); + ERR("Failed to create a required security descriptor. Status 0x%08lx\n", Status); HeapFree(GetProcessHeap(), 0, LSData); return Status; } Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Wed Nov 14 12:02:53 2007 @@ -667,7 +667,7 @@ } else { - TRACE("About to negociate with Gina %S. Winlogon uses version %lx\n", + TRACE("About to negociate with Gina %S. Winlogon uses version %x\n", GinaDll, WLX_CURRENT_VERSION); if (!Functions->WlxNegotiate(WLX_CURRENT_VERSION, DllVersion)) goto cleanup; Modified: trunk/reactos/dll/win32/iphlpapi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/media.c… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/media.c (original) +++ trunk/reactos/dll/win32/iphlpapi/media.c Wed Nov 14 12:02:53 2007 @@ -19,12 +19,14 @@ */ #include "iphlpapi_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); + /* * @unimplemented */ DWORD STDCALL DisableMediaSense(HANDLE *pHandle,OVERLAPPED *pOverLapped) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0L; } @@ -33,7 +35,7 @@ */ DWORD STDCALL RestoreMediaSense(OVERLAPPED* pOverlapped,LPDWORD lpdwEnableCount) { - UNIMPLEMENTED + UNIMPLEMENTED; return 0L; } Modified: trunk/reactos/dll/win32/kernel32/file/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/lo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/lock.c (original) +++ trunk/reactos/dll/win32/kernel32/file/lock.c Wed Nov 14 12:02:53 2007 @@ -17,6 +17,8 @@ //#define YDEBUG #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(kernel32); /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Wed Nov 14 12:02:53 2007 @@ -126,6 +126,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0500</define> <library>kernel32_base</library> + <library>wine</library> <library>pseh</library> <library>ntdll</library> <linkerflag>-lgcc</linkerflag> Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c (original) +++ trunk/reactos/dll/win32/msgina/stubs.c Wed Nov 14 12:02:53 2007 @@ -13,6 +13,8 @@ #include <winwlx.h> #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(msgina); /* * @unimplemented Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Wed Nov 14 12:02:53 2007 @@ -21,9 +21,9 @@ <define name="__MINGW_IMPORT">"extern __attribute__ ((dllexport))"</define> <library>crt</library> - <library>ntdll</library> <library>kernel32</library> <library>wine</library> + <library>ntdll</library> <pch>precomp.h</pch> <file>dllmain.c</file> <file>msvcrt.rc</file> Modified: trunk/reactos/dll/win32/newdev/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/stubs.c (original) +++ trunk/reactos/dll/win32/newdev/stubs.c Wed Nov 14 12:02:53 2007 @@ -19,6 +19,8 @@ */ #include "newdev_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(newdev); /* * @unimplemented Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c Wed Nov 14 12:02:53 2007 @@ -14,6 +14,8 @@ #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); + /* * @unimplemented */ Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursor.c (original) +++ trunk/reactos/dll/win32/user32/windows/cursor.c Wed Nov 14 12:02:53 2007 @@ -32,6 +32,8 @@ #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); + #undef CopyCursor HBITMAP Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Wed Nov 14 12:02:53 2007 @@ -31,6 +31,8 @@ #include <user32.h> #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(user32); /* GLOBALS *******************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c Wed Nov 14 12:02:53 2007 @@ -31,6 +31,8 @@ #include <user32.h> #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(user32); /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c Wed Nov 14 12:02:53 2007 @@ -34,6 +34,8 @@ #include <user32.h> #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(user32); /* DEFINES *******************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c Wed Nov 14 12:02:53 2007 @@ -31,6 +31,8 @@ #include <user32.h> #include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(user32); static HBRUSH FrameBrushes[13]; static HBITMAP hHatch;

1 0

[hpoussin] 30432: Don't mix ReactOS and Wine debug style
by hpoussin＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: hpoussin Date: Wed Nov 14 10:53:01 2007 New Revision: 30432 URL: http://svn.reactos.org/svn/reactos?rev=30432&view=rev Log: Don't mix ReactOS and Wine debug style Modified: trunk/reactos/dll/win32/advapi32/token/token.c Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c Wed Nov 14 10:53:01 2007 @@ -11,10 +11,7 @@ #include <advapi32.h> #define NDEBUG -#include <wine/debug.h> #include <debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(advapi32); /* * @implemented @@ -591,7 +588,7 @@ PHANDLE NewTokenHandle ) { - FIXME("unimplemented!\n", __FUNCTION__); + UNIMPLEMENTED; return FALSE; }

1 0

[janderwald] 30431: - implement _ILIsMyDocuments - halfplement MyDocuments shell folder based on desktop code - insert MyDocuments folder before MyComputer pidl - setup still needs to create the MyDocuments folder
by janderwald＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: janderwald Date: Wed Nov 14 03:45:08 2007 New Revision: 30431 URL: http://svn.reactos.org/svn/reactos?rev=30431&view=rev Log: - implement _ILIsMyDocuments - halfplement MyDocuments shell folder based on desktop code - insert MyDocuments folder before MyComputer pidl - setup still needs to create the MyDocuments folder Added: trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c (with props) Modified: trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shfldr_desktop.c Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c (original) +++ trunk/reactos/dll/win32/shell32/pidl.c Wed Nov 14 03:45:08 2007 @@ -1623,6 +1623,17 @@ return pidl && pidl->mkid.cb ? 0 : 1; } +BOOL _ILIsMyDocuments(LPCITEMIDLIST pidl) +{ + REFIID iid = _ILGetGUIDPointer(pidl); + + TRACE("(%p)\n",pidl); + + if (iid) + return IsEqualIID(iid, &CLSID_MyDocuments); + return FALSE; +} + BOOL _ILIsMyComputer(LPCITEMIDLIST pidl) { REFIID iid = _ILGetGUIDPointer(pidl); @@ -1633,6 +1644,7 @@ return IsEqualIID(iid, &CLSID_MyComputer); return FALSE; } + BOOL _ILIsBitBucket(LPCITEMIDLIST pidl) { REFIID iid = _ILGetGUIDPointer(pidl); Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h (original) +++ trunk/reactos/dll/win32/shell32/pidl.h Wed Nov 14 03:45:08 2007 @@ -204,6 +204,7 @@ BOOL _ILIsUnicode (LPCITEMIDLIST pidl); BOOL _ILIsDesktop (LPCITEMIDLIST pidl); BOOL _ILIsMyComputer (LPCITEMIDLIST pidl); +BOOL _ILIsMyDocuments (LPCITEMIDLIST pidl); BOOL _ILIsBitBucket (LPCITEMIDLIST pidl); BOOL _ILIsDrive (LPCITEMIDLIST pidl); BOOL _ILIsFolder (LPCITEMIDLIST pidl); Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c Wed Nov 14 03:45:08 2007 @@ -714,12 +714,12 @@ wszDesktop, wszSlash }, +#endif { &CLSID_MyDocuments, wszDesktop, wszMyDocuments }, -#endif { &CLSID_RecycleBin, wszDesktop, Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Wed Nov 14 03:45:08 2007 @@ -52,6 +52,7 @@ <file>shfldr_desktop.c</file> <file>shfldr_fs.c</file> <file>shfldr_mycomp.c</file> + <file> shlfldr_mydocuments.c</file> <file>shfldr_printers.c</file> <file>shlexec.c</file> <file>shlfileop.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h Wed Nov 14 03:45:08 2007 @@ -93,6 +93,7 @@ HRESULT WINAPI ISF_Desktop_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_MyComputer_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT WINAPI ISF_MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c (original) +++ trunk/reactos/dll/win32/shell32/shellole.c Wed Nov 14 03:45:08 2007 @@ -73,8 +73,8 @@ {&CLSID_UnixFolder, &UnixFolder_Constructor}, {&CLSID_UnixDosFolder, &UnixDosFolder_Constructor}, {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, - {&CLSID_MyDocuments, &MyDocuments_Constructor}, #endif + {&CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_RecycleBin, &RecycleBin_Constructor}, {&CLSID_OpenWith, &SHEOW_Constructor}, Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.c Wed Nov 14 03:45:08 2007 @@ -262,6 +262,7 @@ UINT i; /* create the pidl for This item */ + ret = AddToEnumList(list, _ILCreateMyDocuments()); ret = AddToEnumList(list, _ILCreateMyComputer()); for (i=0; i<2; i++) { @@ -269,6 +270,7 @@ Desktop_NameSpaceW, 0, KEY_READ, &hkey)) { WCHAR iid[50]; + LPITEMIDLIST pidl; int i=0; while (ret) @@ -280,7 +282,15 @@ r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); if (ERROR_SUCCESS == r) { - ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); + pidl = _ILCreateGuidFromStrW(iid); + if (_ILIsMyDocuments(pidl)) + { + SHFree(pidl); + } + else + { + ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); + } i++; } else if (ERROR_NO_MORE_ITEMS == r) Added: trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfldr_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c (added) +++ trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c Wed Nov 14 03:45:08 2007 @@ -1,0 +1,930 @@ + +/* + * Virtual MyDocuments Folder + * + * Copyright 2007 Johannes Anderwald + * + * 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 "config.h" +#include "wine/port.h" + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "wingdi.h" +#include "winuser.h" + +#include "ole2.h" +#include "shlguid.h" + +#include "enumidlist.h" +#include "pidl.h" +#include "undocshell.h" +#include "shell32_main.h" +#include "shresdef.h" +#include "shlwapi.h" +#include "shellfolder.h" +#include "wine/debug.h" +#include "debughlp.h" +#include "shfldr.h" + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +/*********************************************************************** +* MyDocumentsfolder implementation +*/ + +typedef struct { + const IShellFolder2Vtbl *lpVtbl; + const IPersistFolder2Vtbl *lpPF2; + LONG ref; + + /* both paths are parsible from the MyDocuments */ + LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ + LPITEMIDLIST pidlRoot; /* absolute pidl */ + + UINT cfShellIDList; /* clipboardformat for IDropTarget */ + BOOL fAcceptFmt; /* flag for pending Drop */ +} IGenericSFImpl; + +#define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) +#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) + +static const shvheader MyDocumentsSFHeader[] = { + {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN2, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN3, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10}, + {IDS_SHV_COLUMN4, SHCOLSTATE_TYPE_DATE | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 12}, + {IDS_SHV_COLUMN5, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 5} +}; + +#define MYDOCUMENTSSHELLVIEWCOLUMNS 5 + +/************************************************************************** + * ISF_MyDocuments_fnQueryInterface + * + * NOTES supports not IPersist/IPersistFolder + */ +static HRESULT WINAPI ISF_MyDocuments_fnQueryInterface( + IShellFolder2 * iface, REFIID riid, LPVOID * ppvObj) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IShellFolder) || + IsEqualIID (riid, &IID_IShellFolder2)) + { + *ppvObj = This; + } + else if (IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = &This->lpPF2; + } + if (*ppvObj) + { + IUnknown_AddRef ((IUnknown *) (*ppvObj)); + TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); + return S_OK; + } + TRACE ("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ISF_MyDocuments_fnAddRef (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI ISF_MyDocuments_fnRelease (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + + if (!refCount) + { + TRACE ("-- destroying IShellFolder(%p)\n", This); + SHFree (This->pidlRoot); + HeapFree(GetProcessHeap(), 0, This->sPathTarget); + HeapFree(GetProcessHeap(), 0, This); + } + return refCount; +} + +static +HRESULT +WINAPI ISF_MyDocuments_fnParseDisplayName (IShellFolder2 * iface, + HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, + DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + WCHAR szElement[MAX_PATH]; + LPCWSTR szNext = NULL; + LPITEMIDLIST pidlTemp = NULL; + HRESULT hr = S_OK; + CLSID clsid; + + TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", + This, hwndOwner, pbc, lpszDisplayName, debugstr_w(lpszDisplayName), + pchEaten, ppidl, pdwAttributes); + + if (!lpszDisplayName || !ppidl) + return E_INVALIDARG; + + *ppidl = 0; + + if (pchEaten) + *pchEaten = 0; /* strange but like the original */ + + if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') + { + szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); + TRACE ("-- element: %s\n", debugstr_w (szElement)); + SHCLSIDFromStringW (szElement + 2, &clsid); + pidlTemp = _ILCreateGuid (PT_GUID, &clsid); + } + else if( (pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName)) ) + { + *ppidl = pidlTemp; + return S_OK; + } + else + { + /* it's a filesystem path on the desktop. Let a FSFolder parse it */ + + if (*lpszDisplayName) + { + WCHAR szPath[MAX_PATH]; + LPWSTR pathPtr; + + /* build a complete path to create a simple pidl */ + lstrcpynW(szPath, This->sPathTarget, MAX_PATH); + pathPtr = PathAddBackslashW(szPath); + if (pathPtr) + { + lstrcpynW(pathPtr, lpszDisplayName, MAX_PATH - (pathPtr - szPath)); + hr = _ILCreateFromPathW(szPath, &pidlTemp); + } + else + { + /* should never reach here, but for completeness */ + hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + } + } + else + pidlTemp = _ILCreateMyComputer(); + + szNext = NULL; + } + + if (SUCCEEDED(hr) && pidlTemp) + { + if (szNext && *szNext) + { + hr = SHELL32_ParseNextElement(iface, hwndOwner, pbc, + &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); + } + else + { + if (pdwAttributes && *pdwAttributes) + hr = SHELL32_GetItemAttributes(_IShellFolder_ (This), + pidlTemp, pdwAttributes); + } + } + + *ppidl = pidlTemp; + + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); + + return hr; +} + +/************************************************************************** + * CreateDesktopEnumList() + */ +static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags) +{ + BOOL ret = TRUE; + WCHAR szPath[MAX_PATH]; + + TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); + + /* enumerate the elements in %windir%\desktop */ + SHGetSpecialFolderPathW(0, szPath, CSIDL_MYDOCUMENTS, FALSE); + ret = ret && CreateFolderEnumList(list, szPath, dwFlags); + + return ret; +} + +/************************************************************************** + * ISF_MyDocuments_fnEnumObjects + */ +static HRESULT WINAPI ISF_MyDocuments_fnEnumObjects (IShellFolder2 * iface, + HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", + This, hwndOwner, dwFlags, ppEnumIDList); + + *ppEnumIDList = IEnumIDList_Constructor(); + if (*ppEnumIDList) + CreateDesktopEnumList(*ppEnumIDList, dwFlags); + + TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); + + return *ppEnumIDList ? S_OK : E_OUTOFMEMORY; +} + +/************************************************************************** + * ISF_MyDocuments_fnBindToObject + */ +static HRESULT WINAPI ISF_MyDocuments_fnBindToObject (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", + This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + return SHELL32_BindToChild( This->pidlRoot, This->sPathTarget, pidl, riid, ppvOut ); +} + +/************************************************************************** + * ISF_MyDocuments_fnBindToStorage + */ +static +HRESULT +WINAPI +ISF_MyDocuments_fnBindToStorage (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", + This, pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + *ppvOut = NULL; + return E_NOTIMPL; +} + +/************************************************************************** + * ISF_MyDocuments_fnCompareIDs + */ +static HRESULT WINAPI ISF_MyDocuments_fnCompareIDs (IShellFolder2 * iface, + LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + int nReturn; + + TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs (_IShellFolder_ (This), lParam, pidl1, pidl2); + TRACE ("-- %i\n", nReturn); + return nReturn; +} + +/************************************************************************** + * ISF_MyDocuments_fnCreateViewObject + */ +static HRESULT WINAPI ISF_MyDocuments_fnCreateViewObject (IShellFolder2 * iface, + HWND hwndOwner, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + LPSHELLVIEW pShellView; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(hwnd=%p,%s,%p)\n", + This, hwndOwner, shdebugstr_guid (riid), ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IDropTarget)) + { + WARN ("IDropTarget not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IContextMenu)) + { + WARN ("IContextMenu not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IShellView)) + { + pShellView = IShellView_Constructor ((IShellFolder *) iface); + if (pShellView) + { + hr = IShellView_QueryInterface (pShellView, riid, ppvOut); + IShellView_Release (pShellView); + } + } + TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); + return hr; +} + +/************************************************************************** + * ISF_MyDocuments_fnGetAttributesOf + */ +static HRESULT WINAPI ISF_MyDocuments_fnGetAttributesOf (IShellFolder2 * iface, + UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + HRESULT hr = S_OK; + static const DWORD dwDesktopAttributes = + SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | + SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; + static const DWORD dwMyComputerAttributes = + SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | + SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", + This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); + + if (!rgfInOut) + return E_INVALIDARG; + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + if(cidl == 0) { + *rgfInOut &= dwDesktopAttributes; + } else { + while (cidl > 0 && *apidl) { + pdump (*apidl); + if (_ILIsDesktop(*apidl)) { + *rgfInOut &= dwDesktopAttributes; + } else if (_ILIsMyComputer(*apidl)) { + *rgfInOut &= dwMyComputerAttributes; + } else { + SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); + } + apidl++; + cidl--; + } + } + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + TRACE ("-- result=0x%08x\n", *rgfInOut); + + return hr; +} + +/************************************************************************** + * ISF_MyDocuments_fnGetUIObjectOf + * + * PARAMETERS + * HWND hwndOwner, //[in ] Parent window for any output + * UINT cidl, //[in ] array size + * LPCITEMIDLIST* apidl, //[in ] simple pidl array + * REFIID riid, //[in ] Requested Interface + * UINT* prgfInOut, //[ ] reserved + * LPVOID* ppvObject) //[out] Resulting Interface + * + */ +static HRESULT WINAPI ISF_MyDocuments_fnGetUIObjectOf (IShellFolder2 * iface, + HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, + REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + LPITEMIDLIST pidl; + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", + This, hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IContextMenu)) + { + if (cidl > 0) + pObj = (LPUNKNOWN) ISvItemCm_Constructor( (IShellFolder *) iface, This->pidlRoot, apidl, cidl); + else + pObj = (LPUNKNOWN) ISvBgCm_Constructor( (IShellFolder *) iface, TRUE); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) + { + pObj = (LPUNKNOWN) IDataObject_Constructor( hwndOwner, + This->pidlRoot, apidl, cidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) + { + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) + { + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) + { + hr = IShellFolder_QueryInterface (iface, + &IID_IDropTarget, (LPVOID *) & pObj); + } + else if ((IsEqualIID(riid,&IID_IShellLinkW) || + IsEqualIID(riid,&IID_IShellLinkA)) && (cidl == 1)) + { + pidl = ILCombine (This->pidlRoot, apidl[0]); + hr = IShellLink_ConstructFromFile(NULL, riid, pidl, (LPVOID*)&pObj); + SHFree (pidl); + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppvOut = pObj; + TRACE ("(%p)->hr=0x%08x\n", This, hr); + return hr; +} + +static +HRESULT +WINAPI ISF_MyDocuments_fnGetDisplayNameOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + HRESULT hr = S_OK; + LPWSTR pszPath; + + TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + pdump (pidl); + + if (!strRet) + return E_INVALIDARG; + + pszPath = CoTaskMemAlloc((MAX_PATH +1) * sizeof(WCHAR)); + if (!pszPath) + return E_OUTOFMEMORY; + + if (_ILIsMyDocuments (pidl)) + { + if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && + (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING)) + strcpyW(pszPath, This->sPathTarget); + else + HCR_GetClassNameW(&CLSID_ShellDesktop, pszPath, MAX_PATH); + } + else if (_ILIsPidlSimple (pidl)) + { + GUID const *clsid; + + if ((clsid = _ILGetGUIDPointer (pidl))) + { + if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + { + int bWantsForParsing; + + /* + * We can only get a filesystem path from a shellfolder if the + * value WantsFORPARSING in CLSID\\{...}\\shellfolder exists. + * + * Exception: The MyComputer folder doesn't have this key, + * but any other filesystem backed folder it needs it. + */ + if (IsEqualIID (clsid, &CLSID_MyComputer)) + { + bWantsForParsing = TRUE; + } + else + { + /* get the "WantsFORPARSING" flag from the registry */ + static const WCHAR clsidW[] = + { 'C','L','S','I','D','\\',0 }; + static const WCHAR shellfolderW[] = + { '\\','s','h','e','l','l','f','o','l','d','e','r',0 }; + static const WCHAR wantsForParsingW[] = + { 'W','a','n','t','s','F','o','r','P','a','r','s','i','n', + 'g',0 }; + WCHAR szRegPath[100]; + LONG r; + + lstrcpyW (szRegPath, clsidW); + SHELL32_GUIDToStringW (clsid, &szRegPath[6]); + lstrcatW (szRegPath, shellfolderW); + r = SHGetValueW(HKEY_CLASSES_ROOT, szRegPath, + wantsForParsingW, NULL, NULL, NULL); + if (r == ERROR_SUCCESS) + bWantsForParsing = TRUE; + else + bWantsForParsing = FALSE; + } + + if ((GET_SHGDN_RELATION (dwFlags) == SHGDN_NORMAL) && + bWantsForParsing) + { + /* + * we need the filesystem path to the destination folder. + * Only the folder itself can know it + */ + hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, + pszPath, + MAX_PATH); + } + else + { + /* parsing name like ::{...} */ + pszPath[0] = ':'; + pszPath[1] = ':'; + SHELL32_GUIDToStringW (clsid, &pszPath[2]); + } + } + else + { + /* user friendly name */ + HCR_GetClassNameW (clsid, pszPath, MAX_PATH); + } + } + else + { + int cLen = 0; + + /* file system folder or file rooted at the desktop */ + if ((GET_SHGDN_FOR(dwFlags) == SHGDN_FORPARSING) && + (GET_SHGDN_RELATION(dwFlags) != SHGDN_INFOLDER)) + { + lstrcpynW(pszPath, This->sPathTarget, MAX_PATH - 1); + PathAddBackslashW(pszPath); + cLen = lstrlenW(pszPath); + } + + _ILSimpleGetTextW(pidl, pszPath + cLen, MAX_PATH - cLen); + + if (!_ILIsFolder(pidl)) + SHELL_FS_ProcessDisplayFilename(pszPath, dwFlags); + } + } + else + { + /* a complex pidl, let the subfolder do the work */ + hr = SHELL32_GetDisplayNameOfChild (iface, pidl, dwFlags, + pszPath, MAX_PATH); + } + + if (SUCCEEDED(hr)) + { + /* Win9x always returns ANSI strings, NT always returns Unicode strings */ + if (GetVersion() & 0x80000000) + { + strRet->uType = STRRET_CSTR; + if (!WideCharToMultiByte(CP_ACP, 0, pszPath, -1, strRet->u.cStr, MAX_PATH, + NULL, NULL)) + strRet->u.cStr[0] = '\0'; + CoTaskMemFree(pszPath); + } + else + { + strRet->uType = STRRET_WSTR; + strRet->u.pOleStr = pszPath; + } + } + else + CoTaskMemFree(pszPath); + + TRACE ("-- (%p)->(%s,0x%08x)\n", This, + strRet->uType == STRRET_CSTR ? strRet->u.cStr : + debugstr_w(strRet->u.pOleStr), hr); + return hr; +} + +static HRESULT WINAPI ISF_MyDocuments_fnSetNameOf (IShellFolder2 * iface, + HWND hwndOwner, LPCITEMIDLIST pidl, /* simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, + debugstr_w (lpName), dwFlags, pPidlOut); + + return E_FAIL; +} + +static HRESULT WINAPI ISF_MyDocuments_fnGetDefaultSearchGUID(IShellFolder2 *iface, + GUID * pguid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_MyDocuments_fnEnumSearches (IShellFolder2 *iface, + IEnumExtraSearch ** ppenum) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +ISF_MyDocuments_fnGetDefaultColumn (IShellFolder2 * iface, + DWORD dwRes, ULONG * pSort, ULONG * pDisplay) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)\n", This); + + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + + return S_OK; +} +static +HRESULT +WINAPI +ISF_MyDocuments_fnGetDefaultColumnState (IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)\n", This); + + if (!pcsFlags || iColumn >= MYDOCUMENTSSHELLVIEWCOLUMNS) + return E_INVALIDARG; + + *pcsFlags = MyDocumentsSFHeader[iColumn].pcsFlags; + + return S_OK; +} + +static +HRESULT +WINAPI +ISF_MyDocuments_fnGetDetailsEx (IShellFolder2 * iface, LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + + return E_NOTIMPL; +} + +static +HRESULT +WINAPI +ISF_MyDocuments_fnGetDetailsOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + HRESULT hr = S_OK; + + TRACE ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); + + if (!psd || iColumn >= MYDOCUMENTSSHELLVIEWCOLUMNS) + return E_INVALIDARG; + + if (!pidl) + { + psd->fmt = MyDocumentsSFHeader[iColumn].fmt; + psd->cxChar = MyDocumentsSFHeader[iColumn].cxChar; + psd->str.uType = STRRET_CSTR; + LoadStringA (shell32_hInstance, MyDocumentsSFHeader[iColumn].colnameid, + psd->str.u.cStr, MAX_PATH); + return S_OK; + } + + /* the data from the pidl */ + psd->str.uType = STRRET_CSTR; + switch (iColumn) + { + case 0: /* name */ + hr = IShellFolder_GetDisplayNameOf(iface, pidl, + SHGDN_NORMAL | SHGDN_INFOLDER, &psd->str); + break; + case 1: /* size */ + _ILGetFileSize (pidl, psd->str.u.cStr, MAX_PATH); + break; + case 2: /* type */ + _ILGetFileType (pidl, psd->str.u.cStr, MAX_PATH); + break; + case 3: /* date */ + _ILGetFileDate (pidl, psd->str.u.cStr, MAX_PATH); + break; + case 4: /* attributes */ + _ILGetFileAttributes (pidl, psd->str.u.cStr, MAX_PATH); + break; + } + + return hr; +} + +static +HRESULT +WINAPI +ISF_MyDocuments_fnMapColumnToSCID (IShellFolder2 * iface, UINT column, SHCOLUMNID * pscid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static const IShellFolder2Vtbl vt_MCFldr_ShellFolder2 = +{ + ISF_MyDocuments_fnQueryInterface, + ISF_MyDocuments_fnAddRef, + ISF_MyDocuments_fnRelease, + ISF_MyDocuments_fnParseDisplayName, + ISF_MyDocuments_fnEnumObjects, + ISF_MyDocuments_fnBindToObject, + ISF_MyDocuments_fnBindToStorage, + ISF_MyDocuments_fnCompareIDs, + ISF_MyDocuments_fnCreateViewObject, + ISF_MyDocuments_fnGetAttributesOf, + ISF_MyDocuments_fnGetUIObjectOf, + ISF_MyDocuments_fnGetDisplayNameOf, + ISF_MyDocuments_fnSetNameOf, + /* ShellFolder2 */ + ISF_MyDocuments_fnGetDefaultSearchGUID, + ISF_MyDocuments_fnEnumSearches, + ISF_MyDocuments_fnGetDefaultColumn, + ISF_MyDocuments_fnGetDefaultColumnState, + ISF_MyDocuments_fnGetDetailsEx, + ISF_MyDocuments_fnGetDetailsOf, + ISF_MyDocuments_fnMapColumnToSCID +}; + +static inline IGenericSFImpl *impl_from_IPersistFolder2( IPersistFolder2 *iface ) +{ + return (IGenericSFImpl *)((char*)iface - FIELD_OFFSET(IGenericSFImpl, lpPF2)); +} + +static HRESULT WINAPI +ISF_MyDocuments_PersistFolder2_fnQueryInterface (IPersistFolder2 * iface, REFIID iid, LPVOID * ppvObj) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)\n", This); + + return ISF_MyDocuments_fnQueryInterface ((IShellFolder2*)This, iid, ppvObj); +} + +static ULONG WINAPI +ISF_MyDocuments_PersistFolder2_fnAddRef (IPersistFolder2 * iface) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return ISF_MyDocuments_fnAddRef((IShellFolder2*)This); +} + +static ULONG WINAPI +ISF_MyDocuments_PersistFolder2_fnRelease (IPersistFolder2 * iface) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return ISF_MyDocuments_fnRelease ((IShellFolder2*)This); +} + +static HRESULT WINAPI +ISF_MyDocuments_PersistFolder2_fnGetClassID (IPersistFolder2 * iface, CLSID * lpClassId) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + static GUID const CLSID_MyDocuments = + { 0x450d8fba, 0xad25, 0x11d0, {0x98,0xa8,0x08,0x00,0x36,0x1b,0x11,0x03} }; + + TRACE ("(%p)\n", This); + + if (!lpClassId) + return E_POINTER; + + memcpy(lpClassId, &CLSID_MyDocuments, sizeof(GUID)); + + return S_OK; +} +static HRESULT WINAPI +ISF_MyDocuments_PersistFolder2_fnInitialize (IPersistFolder2 * iface, LPCITEMIDLIST pidl) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + return E_NOTIMPL; +} + +static HRESULT WINAPI +ISF_MyDocuments_PersistFolder2_fnGetCurFolder (IPersistFolder2 * iface, + LPITEMIDLIST * pidl) +{ + IGenericSFImpl *This = impl_from_IPersistFolder2(iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + if (!pidl) return E_POINTER; + *pidl = ILClone (This->pidlRoot); + return S_OK; +} + +static const IPersistFolder2Vtbl vt_FSFldr_PersistFolder2 = +{ + ISF_MyDocuments_PersistFolder2_fnQueryInterface, + ISF_MyDocuments_PersistFolder2_fnAddRef, + ISF_MyDocuments_PersistFolder2_fnRelease, + ISF_MyDocuments_PersistFolder2_fnGetClassID, + ISF_MyDocuments_PersistFolder2_fnInitialize, + ISF_MyDocuments_PersistFolder2_fnGetCurFolder, +}; + + +/************************************************************************** + * ISF_MyDocuments_Constructor + */ +HRESULT WINAPI ISF_MyDocuments_Constructor ( + IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + static IGenericSFImpl *cached_sf; + WCHAR szMyPath[MAX_PATH]; + + TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); + + if (!ppv) + return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + if (!cached_sf) + { + IGenericSFImpl *sf; + + if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, TRUE )) + return E_UNEXPECTED; + + sf = LocalAlloc( LMEM_ZEROINIT, sizeof (IGenericSFImpl) ); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 1; + sf->lpVtbl = &vt_MCFldr_ShellFolder2; + sf->lpPF2 = &vt_FSFldr_PersistFolder2; + sf->pidlRoot = _ILCreateMyDocuments(); /* my qualified pidl */ + sf->sPathTarget = SHAlloc( (lstrlenW(szMyPath) + 1)*sizeof(WCHAR) ); + lstrcpyW( sf->sPathTarget, szMyPath ); + + if (InterlockedCompareExchangePointer((void *)&cached_sf, sf, NULL) != NULL) + { + /* some other thread already been here */ + SHFree( sf->pidlRoot ); + SHFree( sf->sPathTarget ); + LocalFree( sf ); + } + } + + return IUnknown_QueryInterface( _IUnknown_(cached_sf), riid, ppv ); +} Propchange: trunk/reactos/dll/win32/shell32/shlfldr_mydocuments.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[weiden] 30430: Make initializing the ICD in ROSGL_ICDForHDC thread-safe
by weiden＠svn.reactos.org 14 Nov '07

14 Nov '07

Author: weiden Date: Wed Nov 14 03:01:36 2007 New Revision: 30430 URL: http://svn.reactos.org/svn/reactos?rev=30430&view=rev Log: Make initializing the ICD in ROSGL_ICDForHDC thread-safe Modified: trunk/reactos/dll/win32/opengl32/wgl.c Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r… ============================================================================== --- trunk/reactos/dll/win32/opengl32/wgl.c (original) +++ trunk/reactos/dll/win32/opengl32/wgl.c Wed Nov 14 03:01:36 2007 @@ -294,6 +294,7 @@ ROSGL_ICDForHDC( HDC hdc ) { GLDCDATA *dcdata; + GLDRIVERDATA *drvdata; dcdata = ROSGL_GetPrivateDCData( hdc ); if (dcdata == NULL) @@ -303,6 +304,9 @@ { LPCWSTR driverName; OPENGL_INFO info; + + /* NOTE: This might be done by multiple threads simultaneously, but only the fastest + actually gets to set the ICD! */ driverName = _wgetenv( L"OPENGL32_DRIVER" ); if (driverName == NULL) @@ -336,7 +340,7 @@ } /* open registry key */ - ret = RegOpenKeyExW( HKEY_LOCAL_MACHINE, OPENGL_DRIVERS_SUBKEY, 0, KEY_READ, &hKey ); + ret = RegOpenKeyExW( HKEY_LOCAL_MACHINE, OPENGL_DRIVERS_SUBKEY, 0, KEY_QUERY_VALUE, &hKey ); if (ret != ERROR_SUCCESS) { DBGPRINT( "Error: Couldn't open registry key '%ws'", OPENGL_DRIVERS_SUBKEY ); @@ -361,8 +365,8 @@ wcsncpy( info.DriverName, driverName, sizeof (info.DriverName) / sizeof (info.DriverName[0]) ); } /* load driver (or get a reference) */ - dcdata->icd = OPENGL32_LoadICD( info.DriverName ); - if (dcdata->icd == NULL) + drvdata = OPENGL32_LoadICD( info.DriverName ); + if (drvdata == NULL) { WCHAR Buffer[256]; snwprintf(Buffer, sizeof(Buffer)/sizeof(WCHAR), @@ -370,6 +374,17 @@ MessageBox(WindowFromDC( hdc ), Buffer, L"OPENGL32.dll: Warning", MB_OK | MB_ICONWARNING); + } + else + { + /* Atomically set the ICD!!! */ + if (InterlockedCompareExchangePointer((PVOID*)&dcdata->icd, + (PVOID)drvdata, + NULL) != NULL) + { + /* Too bad, somebody else was faster... */ + OPENGL32_UnloadICD(drvdata); + } } }

1 0

[weiden] 30429: Make opengl initialization thread-safe
by weiden＠svn.reactos.org 13 Nov '07

13 Nov '07

Author: weiden Date: Wed Nov 14 02:30:17 2007 New Revision: 30429 URL: http://svn.reactos.org/svn/reactos?rev=30429&view=rev Log: Make opengl initialization thread-safe Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/wingl… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/wingl.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/wingl.c Wed Nov 14 02:30:17 2007 @@ -46,46 +46,61 @@ */ HINSTANCE hOpenGL = NULL; +static BOOL OpenGLInitFunction(PCSTR name, + FARPROC *funcptr) +{ + PVOID func; + + func = (PVOID)GetProcAddress(hOpenGL, name); + if (func != NULL) + { + (void)InterlockedCompareExchangePointer((PVOID*)funcptr, + func, + NULL); + return TRUE; + } + + return FALSE; +} + static BOOL OpenGLEnable(void) { - if(hOpenGL == NULL) - { - hOpenGL = LoadLibraryA("OPENGL32.DLL"); - if(hOpenGL == NULL) - return(FALSE); - } - - if(glChoosePixelFormat == NULL) { - glChoosePixelFormat = (CHOOSEPIXELFMT)GetProcAddress(hOpenGL, "wglChoosePixelFormat"); - if(glChoosePixelFormat == NULL) - return(FALSE); - } - - if(glSetPixelFormat == NULL) { - glSetPixelFormat = (SETPIXELFMT)GetProcAddress(hOpenGL, "wglSetPixelFormat"); - if(glSetPixelFormat == NULL) - return(FALSE); - } - - if(glSwapBuffers == NULL) { - glSwapBuffers = (SWAPBUFFERS)GetProcAddress(hOpenGL, "wglSwapBuffers"); - if(glSwapBuffers == NULL) - return(FALSE); - } - - if(glDescribePixelFormat == NULL) { - glDescribePixelFormat = (DESCRIBEPIXELFMT)GetProcAddress(hOpenGL, "wglDescribePixelFormat"); - if(glDescribePixelFormat == NULL) - return(FALSE); - } - - if(glGetPixelFormat == NULL) { - glGetPixelFormat = (GETPIXELFMT)GetProcAddress(hOpenGL, "wglGetPixelFormat"); - if(glGetPixelFormat == NULL) - return(FALSE); - } - - return(TRUE); /* OpenGL is initialized and enabled*/ + HMODULE hModOpengl32; + BOOL Ret = TRUE; + + hModOpengl32 = LoadLibraryW(L"OPENGL32.DLL"); + if (hModOpengl32 == NULL) + return FALSE; + + if (InterlockedCompareExchangePointer((PVOID*)&hOpenGL, + (PVOID)hModOpengl32, + NULL) != NULL) + { + FreeLibrary(hModOpengl32); + + /* NOTE: Even though another thread was faster loading the + library we can't just bail out here. We really need + to *try* to locate every function. This is slow but + thread-safe */ + } + + + if (!OpenGLInitFunction("wglChoosePixelFormat", &glChoosePixelFormat)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglSetPixelFormat", &glSetPixelFormat)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglSwapBuffers", &glSwapBuffers)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglDescribePixelFormat", &glDescribePixelFormat)) + Ret = FALSE; + + if (!OpenGLInitFunction("wglGetPixelFormat", &glGetPixelFormat)) + Ret = FALSE; + + return Ret; }

1 0

[weiden] 30428: Fix freeing lists on process detach
by weiden＠svn.reactos.org 13 Nov '07

13 Nov '07

Author: weiden Date: Wed Nov 14 01:59:49 2007 New Revision: 30428 URL: http://svn.reactos.org/svn/reactos?rev=30428&view=rev Log: Fix freeing lists on process detach Modified: trunk/reactos/dll/win32/opengl32/opengl32.c Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… ============================================================================== --- trunk/reactos/dll/win32/opengl32/opengl32.c (original) +++ trunk/reactos/dll/win32/opengl32/opengl32.c Wed Nov 14 01:59:49 2007 @@ -155,27 +155,27 @@ { dcdata2 = dcdata; dcdata = dcdata->next; - if (!HeapFree( GetProcessHeap(), 0, dcdata )) + if (!HeapFree( GetProcessHeap(), 0, dcdata2 )) DBGPRINT( "Warning: HeapFree() on DCDATA 0x%08x failed (%d)", - dcdata, GetLastError() ); + dcdata2, GetLastError() ); } for (glrc = OPENGL32_processdata.glrc_list; glrc != NULL;) { glrc2 = glrc; glrc = glrc->next; - if (!HeapFree( GetProcessHeap(), 0, glrc )) + if (!HeapFree( GetProcessHeap(), 0, glrc2 )) DBGPRINT( "Warning: HeapFree() on GLRC 0x%08x failed (%d)", - glrc, GetLastError() ); + glrc2, GetLastError() ); } for (icd = OPENGL32_processdata.driver_list; icd != NULL;) { icd2 = icd; icd = icd->next; - if (!HeapFree( GetProcessHeap(), 0, icd )) + if (!HeapFree( GetProcessHeap(), 0, icd2 )) DBGPRINT( "Warning: HeapFree() on DRIVERDATA 0x%08x failed (%d)", - icd, GetLastError() ); + icd2, GetLastError() ); } /* free mutexes */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs