Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 26471: - Enable the "Apply" button when a change to the current cursor scheme has been made. - Support any cursor size.
by ekohl＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: ekohl Date: Mon Apr 23 13:21:13 2007 New Revision: 26471 URL: http://svn.reactos.org/svn/reactos?rev=26471&view=rev Log: - Enable the "Apply" button when a change to the current cursor scheme has been made. - Support any cursor size. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Mon Apr 23 13:21:13 2007 @@ -78,6 +78,8 @@ BOOL bDropShadow; BOOL bOrigDropShadow; + INT cxCursor; + INT cyCursor; } POINTER_DATA, *PPOINTER_DATA; @@ -881,7 +883,8 @@ static VOID OnDrawItem(UINT idCtl, - LPDRAWITEMSTRUCT lpdis) + LPDRAWITEMSTRUCT lpdis, + PPOINTER_DATA pPointerData) { RECT rc; @@ -919,7 +922,7 @@ if (g_CursorData[lpdis->itemData].hCursor != NULL) { DrawIcon(lpdis->hDC, - lpdis->rcItem.right - 32 - 4, + lpdis->rcItem.right - pPointerData->cxCursor - 4, lpdis->rcItem.top + 2, g_CursorData[lpdis->itemData].hCursor); } @@ -993,6 +996,9 @@ pPointerData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(POINTER_DATA)); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pPointerData); + pPointerData->cxCursor = GetSystemMetrics(SM_CXCURSOR); + pPointerData->cyCursor = GetSystemMetrics(SM_CYCURSOR); + EnumerateCursorSchemes(hwndDlg); LoadNewCursorScheme(hwndDlg, TRUE); @@ -1013,12 +1019,12 @@ return FALSE; case WM_MEASUREITEM: - ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 32 + 4; + ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = GetSystemMetrics(SM_CYCURSOR) + 4; break; case WM_DRAWITEM: if (wParam == IDC_LISTBOX_CURSOR) - OnDrawItem((UINT)wParam, (LPDRAWITEMSTRUCT)lParam); + OnDrawItem((UINT)wParam, (LPDRAWITEMSTRUCT)lParam, pPointerData); return TRUE; case WM_DESTROY: @@ -1048,7 +1054,11 @@ { case IDC_COMBO_CURSOR_SCHEME: if (HIWORD(wParam) == CBN_SELENDOK) + { LoadNewCursorScheme(hwndDlg, FALSE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; case IDC_LISTBOX_CURSOR: @@ -1071,16 +1081,15 @@ /* Enable the "Set Default" button */ EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), TRUE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; } break; case IDC_BUTTON_SAVEAS_SCHEME: - if (SaveCursorScheme(hwndDlg)) - { - - } + SaveCursorScheme(hwndDlg); break; case IDC_BUTTON_USE_DEFAULT_CURSOR: @@ -1096,6 +1105,8 @@ /* Disable the "Set Default" button */ EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), FALSE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; @@ -1108,6 +1119,8 @@ /* Enable the "Set Default" button */ EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), TRUE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break;

1 0

[dgorbachev] 26470: Do not wait so long for drive reset.
by dgorbachev＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: dgorbachev Date: Mon Apr 23 08:54:13 2007 New Revision: 26470 URL: http://svn.reactos.org/svn/reactos?rev=26470&view=rev Log: Do not wait so long for drive reset. Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.h Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.h (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.h Mon Apr 23 08:54:13 2007 @@ -418,10 +418,12 @@ #define AtapiSoftReset(BaseIoAddress,DeviceNumber) \ {\ UCHAR statusByte; \ + ULONG i = 1000*1000;\ ScsiPortWritePortUchar(&BaseIoAddress->DriveSelect,(UCHAR)(((DeviceNumber & 0x1) << 4) | 0xA0)); \ ScsiPortStallExecution(500);\ ScsiPortWritePortUchar(&BaseIoAddress->Command, IDE_COMMAND_ATAPI_RESET); \ - ScsiPortStallExecution(1000*1000);\ + while ((ScsiPortReadPortUchar(&BaseIoAddress->Command) & IDE_STATUS_BUSY) && i--)\ + ScsiPortStallExecution(30);\ ScsiPortWritePortUchar(&BaseIoAddress->DriveSelect,(UCHAR)((DeviceNumber << 4) | 0xA0)); \ WaitOnBusy( ((PIDE_REGISTERS_2)((PUCHAR)BaseIoAddress + 0x206)), statusByte); \ ScsiPortStallExecution(500);\

1 0

[ekohl] 26469: Use WS_EX_CLIENTEDGE to make the main windows look a little nicer.
by ekohl＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: ekohl Date: Mon Apr 23 03:09:45 2007 New Revision: 26469 URL: http://svn.reactos.org/svn/reactos?rev=26469&view=rev Log: Use WS_EX_CLIENTEDGE to make the main windows look a little nicer. Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/mainwnd.c Mon Apr 23 03:09:45 2007 @@ -154,7 +154,7 @@ static BOOL CreateTreeView(PMAIN_WND_INFO Info) { - Info->hTreeView = CreateWindowEx(0, + Info->hTreeView = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | TVS_HASLINES | Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Mon Apr 23 03:09:45 2007 @@ -310,7 +310,7 @@ LVCOLUMN lvc = { 0 }; TCHAR szTemp[256]; - Info->hListView = CreateWindowEx(0, + Info->hListView = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, NULL, WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER |

1 0

[greatlrd] 26468: Fixing a crash, fixed so Setcoparative pass the test, still some werid bugs after I delete all code in ddraw. anyone whant debuging this u are wellcome
by greatlrd＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: greatlrd Date: Sun Apr 22 23:59:44 2007 New Revision: 26468 URL: http://svn.reactos.org/svn/reactos?rev=26468&view=rev Log: Fixing a crash, fixed so Setcoparative pass the test, still some werid bugs after I delete all code in ddraw. anyone whant debuging this u are wellcome Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Apr 22 23:59:44 2007 @@ -34,10 +34,13 @@ else { *obj = NULL; + DX_STUB_str("E_NOINTERFACE"); return E_NOINTERFACE; } + Main_DirectDraw_AddRef(iface); + DX_STUB_str("DD_OK"); return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Apr 22 23:59:44 2007 @@ -41,7 +41,10 @@ This = memThis; if (This == NULL) { - if (memThis != NULL) DxHeapMemFree(memThis); + if (memThis != NULL) + DxHeapMemFree(memThis); + + DX_STUB_str("DDERR_OUTOFMEMORY"); return DDERR_OUTOFMEMORY; } } @@ -51,13 +54,18 @@ LPDDRAWI_DIRECTDRAW_INT newThis; newThis = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); if (newThis == NULL) + { + DX_STUB_str("DDERR_OUTOFMEMORY"); return DDERR_OUTOFMEMORY; + } + /* we need check the GUID lpGUID what type it is */ if (pGUID != (LPGUID)DDCREATE_HARDWAREONLY) { if (pGUID !=NULL) { This = newThis; + DX_STUB_str("DDERR_INVALIDDIRECTDRAWGUID"); return DDERR_INVALIDDIRECTDRAWGUID; } } @@ -68,15 +76,24 @@ /* Fixme release memory alloc if we fail */ This->lpLcl = DxHeapMemAlloc(sizeof(DDRAWI_DIRECTDRAW_INT)); if (This->lpLcl == NULL) + { + DX_STUB_str("DDERR_OUTOFMEMORY"); return DDERR_OUTOFMEMORY; + } + This->lpLcl->lpGbl = &ddgbl; *pIface = (LPDIRECTDRAW)This; /* Get right interface we whant */ - if (Main_DirectDraw_QueryInterface((LPDIRECTDRAW7)This, id, (void**)&pIface)) - { + if (Main_DirectDraw_QueryInterface((LPDIRECTDRAW7)This, id, (void**)&pIface) == DD_OK) + { + DX_STUB_str("Got iface"); + if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID, FALSE) == DD_OK); { + DX_STUB_str("here"); + + /* RtlZeroMemory(&wnd_class, sizeof(wnd_class)); wnd_class.style = CS_HREDRAW | CS_VREDRAW; wnd_class.lpfnWndProc = DefWindowProcW; @@ -90,13 +107,17 @@ wnd_class.lpszClassName = classname; if(!RegisterClassW(&wnd_class)) { + DX_STUB_str("DDERR_GENERIC"); return DDERR_GENERIC; } - + */ + + DX_STUB_str("DD_OK"); return DD_OK; } } + DX_STUB_str("DDERR_INVALIDPARAMS"); return DDERR_INVALIDPARAMS; } @@ -121,6 +142,7 @@ * devicetypes = 3 : both hel are enable * devicetypes = 4 :loading a guid drv from the register */ + if (reenable == FALSE) @@ -141,6 +163,8 @@ } } + DX_STUB_str("here"); + if (reenable == FALSE) { if (lpGuid == NULL) @@ -248,7 +272,7 @@ This->lpLcl->hDD = This->lpLcl->lpGbl->hDD; ddgbl.hDD = This->lpLcl->lpGbl->hDD; - + DX_STUB_str("DD_OK"); return DD_OK; }

1 0

[greatlrd] 26467: adpabte wine SetCooperativeLevel to reactis ddraw. allot test need be done, I also took DDRAWI_DIRECTDRAW_LCL->dwObsolete1 as device windows. memory leak can exists and some value I forget free as well.
by greatlrd＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: greatlrd Date: Sun Apr 22 22:15:31 2007 New Revision: 26467 URL: http://svn.reactos.org/svn/reactos?rev=26467&view=rev Log: adpabte wine SetCooperativeLevel to reactis ddraw. allot test need be done, I also took DDRAWI_DIRECTDRAW_LCL->dwObsolete1 as device windows. memory leak can exists and some value I forget free as well. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Apr 22 22:15:31 2007 @@ -3,7 +3,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS * FILE: lib/ddraw/main/ddraw.c - * PURPOSE: IDirectDraw7 Implementation + * PURPOSE: IDirectDraw7 Implementation * PROGRAMMER: Magnus Olsen, Maarten Bosma * */ @@ -11,19 +11,19 @@ #include "../rosdraw.h" -HRESULT -WINAPI -Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, - REFIID id, - LPVOID *obj) -{ +HRESULT +WINAPI +Main_DirectDraw_QueryInterface (LPDIRECTDRAW7 iface, + REFIID id, + LPVOID *obj) +{ LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); - - /* fixme - the D3D object cab be optain from here - Direct3D7 + + /* fixme + the D3D object cab be optain from here + Direct3D7 */ if (IsEqualGUID(&IID_IDirectDraw7, id)) { @@ -38,7 +38,7 @@ } Main_DirectDraw_AddRef(iface); - return S_OK; + return DD_OK; } /* @@ -46,9 +46,9 @@ * Status ok */ ULONG -WINAPI -Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) -{ +WINAPI +Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface) +{ LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); @@ -67,10 +67,10 @@ } -ULONG -WINAPI -Main_DirectDraw_Release (LPDIRECTDRAW7 iface) -{ +ULONG +WINAPI +Main_DirectDraw_Release (LPDIRECTDRAW7 iface) +{ LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); @@ -92,7 +92,7 @@ { ChangeDisplaySettings(NULL, 0); }*/ - + Cleanup(iface); return 0; } @@ -104,9 +104,9 @@ * IMPLEMENT * Status ok */ -HRESULT -WINAPI -Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) +HRESULT +WINAPI +Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { /* MSDN say not implement but my question what does it return then */ DX_WINDBG_trace(); @@ -117,16 +117,16 @@ * IMPLEMENT * Status ok */ -HRESULT -WINAPI -Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, - DWORD dwFlags, - LPDIRECTDRAWCLIPPER *ppClipper, +HRESULT +WINAPI +Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, + DWORD dwFlags, + LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) { DX_WINDBG_trace(); - DX_STUB; + DX_STUB; } HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, @@ -143,13 +143,13 @@ * Status not done */ HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, - LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) -{ - - DX_WINDBG_trace(); - - DX_STUB; - + LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) +{ + + DX_WINDBG_trace(); + + DX_STUB; + } @@ -158,10 +158,10 @@ * Status not done */ HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, - LPDIRECTDRAWSURFACE7* dst) -{ - DX_WINDBG_trace(); - DX_STUB; + LPDIRECTDRAWSURFACE7* dst) +{ + DX_WINDBG_trace(); + DX_STUB; } /* @@ -169,72 +169,72 @@ * Status ok */ HRESULT WINAPI Main_DirectDraw_EnumDisplayModes(LPDIRECTDRAW7 iface, DWORD dwFlags, - LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) + LPDDSURFACEDESC2 pDDSD, LPVOID context, LPDDENUMMODESCALLBACK2 callback) { DX_WINDBG_trace(); - DX_STUB; + DX_STUB; } /* * stub * Status not done */ -HRESULT WINAPI +HRESULT WINAPI Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, - LPDDENUMSURFACESCALLBACK7 callback) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI + LPDDENUMSURFACESCALLBACK7 callback) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, - LPDDCAPS pHELCaps) -{ - - DX_WINDBG_trace(); - - DX_STUB; -} - - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) -{ + LPDDCAPS pHELCaps) +{ + + DX_WINDBG_trace(); + + DX_STUB; +} + + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) +{ //LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; DX_WINDBG_trace(); - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { DX_WINDBG_trace(); @@ -245,8 +245,8 @@ * Stub * Status todo */ -HRESULT WINAPI -Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, +HRESULT WINAPI +Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { DX_WINDBG_trace(); @@ -257,31 +257,31 @@ * IMPLEMENT * Status ok */ -HRESULT WINAPI +HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * Stub - * Status todo - */ -HRESULT WINAPI +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * Stub + * Status todo + */ +HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL lpbIsInVB) { DX_WINDBG_trace(); @@ -292,78 +292,233 @@ * IMPLEMENT * Status ok */ -HRESULT -WINAPI +HRESULT +WINAPI Main_DirectDraw_Initialize (LPDIRECTDRAW7 iface, LPGUID lpGUID) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI +{ + DX_WINDBG_trace(); + + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { DX_WINDBG_trace(); - DX_STUB; + DX_STUB; return DD_OK; } /* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI + */ +HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel (LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) { DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI -Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, +/* + * Code from wine, this functions have been cut and paste from wine 0.9.35 + * and have been modify allot and are still in devloping so it match with + * msdn document struct and flags + */ + + HWND window; + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + + /* Get the old window */ + window = (HWND) This->lpLcl->hWnd; + if(!window) + { + return DDERR_NOHWND; + } + + /* Tests suggest that we need one of them: */ + if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | + DDSCL_NORMAL | + DDSCL_EXCLUSIVE ))) + { + return DDERR_INVALIDPARAMS; + } + + /* Handle those levels first which set various hwnds */ + if(cooplevel & DDSCL_SETFOCUSWINDOW) + { + /* This isn't compatible with a lot of flags */ + if(cooplevel & ( DDSCL_MULTITHREADED | + DDSCL_FPUSETUP | + DDSCL_FPUPRESERVE | + DDSCL_ALLOWREBOOT | + DDSCL_ALLOWMODEX | + DDSCL_SETDEVICEWINDOW | + DDSCL_NORMAL | + DDSCL_EXCLUSIVE | + DDSCL_FULLSCREEN ) ) + { + return DDERR_INVALIDPARAMS; + } + + else if(This->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) + { + return DDERR_HWNDALREADYSET; + } + else if( (This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) && window) + { + return DDERR_HWNDALREADYSET; + } + + This->lpLcl->hFocusWnd = (ULONG_PTR) hwnd; + + + /* Won't use the hwnd param for anything else */ + hwnd = NULL; + + /* Use the focus window for drawing too */ + This->lpLcl->hWnd = This->lpLcl->hFocusWnd; + + } + + /* DDSCL_NORMAL or DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE */ + if(cooplevel & DDSCL_NORMAL) + { + /* Can't coexist with fullscreen or exclusive */ + if(cooplevel & (DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ) + return DDERR_INVALIDPARAMS; + + + /* Switching from fullscreen? */ + if(This->lpLcl->dwLocalFlags & DDRAWILCL_ISFULLSCREEN) + { + /* Restore the display mode */ + Main_DirectDraw_RestoreDisplayMode(iface); + + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ISFULLSCREEN; + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_HASEXCLUSIVEMODE; + This->lpLcl->dwLocalFlags &= ~DDRAWILCL_ALLOWMODEX; + } + + /* Don't override focus windows or private device windows */ + if( hwnd && + !(This->lpLcl->hFocusWnd) && + !(This->lpLcl->dwObsolete1) && + (hwnd != window) ) + { + This->lpLcl->hWnd = (ULONG_PTR)hwnd; + } + + /* FIXME GL + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + FALSE); + */ + } + else if(cooplevel & DDSCL_FULLSCREEN) + { + /* Needs DDSCL_EXCLUSIVE */ + if(!(cooplevel & DDSCL_EXCLUSIVE) ) + return DDERR_INVALIDPARAMS; + + /* Switch from normal to full screen mode? */ + if (!(This->lpLcl->dwLocalFlags & DDRAWILCL_HASEXCLUSIVEMODE)) + { + /* FIXME GL + IWineD3DDevice_SetFullscreen(This->wineD3DDevice, + TRUE); + */ + } + + /* Don't override focus windows or private device windows */ + if( hwnd && + !(This->lpLcl->hFocusWnd) && + !(This->lpLcl->dwObsolete1) && + (hwnd != window) ) + { + This->lpLcl->hWnd = (ULONG_PTR) hwnd; + } + } + else if(cooplevel & DDSCL_EXCLUSIVE) + { + return DDERR_INVALIDPARAMS; + } + + if(cooplevel & DDSCL_CREATEDEVICEWINDOW) + { + /* Don't create a device window if a focus window is set */ + if( !This->lpLcl->hFocusWnd) + { + HWND devicewindow = CreateWindowExW(0, classname, L"DDraw device window", + WS_POPUP, 0, 0, + GetSystemMetrics(SM_CXSCREEN), + GetSystemMetrics(SM_CYSCREEN), + NULL, NULL, GetModuleHandleW(0), NULL); + + ShowWindow(devicewindow, SW_SHOW); /* Just to be sure */ + + This->lpLcl->dwObsolete1 = (DWORD)devicewindow; + } + } + + if(cooplevel & DDSCL_MULTITHREADED && !(This->lpLcl->dwLocalFlags & DDRAWILCL_MULTITHREADED)) + { + /* FIXME GL + * IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); + */ + } + + + + /* Store the cooperative_level */ + + /* FIXME GL + * This->cooperative_level |= cooplevel; + */ + + return DD_OK; + +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { DX_WINDBG_trace(); - DX_STUB; -} - -/* - * IMPLEMENT - * Status ok - */ -HRESULT WINAPI + DX_STUB; +} + +/* + * IMPLEMENT + * Status ok + */ +HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); - - DX_STUB; + LPDWORD total, LPDWORD free) +{ + DX_WINDBG_trace(); + + DX_STUB; } /* @@ -372,7 +527,7 @@ */ HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) -{ +{ DX_WINDBG_trace(); DX_STUB; } @@ -391,7 +546,7 @@ * Stub * Status todo */ -HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) +HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { DX_WINDBG_trace(); DX_STUB; @@ -403,7 +558,7 @@ */ HRESULT WINAPI Main_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, LPDDDEVICEIDENTIFIER2 pDDDI, DWORD dwFlags) -{ +{ DX_WINDBG_trace(); DX_STUB; } @@ -424,7 +579,7 @@ * Status todo */ HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) -{ +{ DX_WINDBG_trace(); DX_STUB; } Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h Sun Apr 22 22:15:31 2007 @@ -20,6 +20,8 @@ /* DirectDraw startup code only internal use */ extern DDRAWI_DIRECTDRAW_GBL ddgbl; extern DDRAWI_DDRAWSURFACE_GBL ddSurfGbl; +extern WCHAR classname[128]; +extern WNDCLASSW wnd_class; HRESULT WINAPI StartDirectDraw(LPDIRECTDRAW* iface, LPGUID pGUID, BOOL reenable); Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Apr 22 22:15:31 2007 @@ -13,9 +13,11 @@ #include "d3dhal.h" #include "ddrawgdi.h" -#include "ddrawi.h" DDRAWI_DIRECTDRAW_GBL ddgbl; DDRAWI_DDRAWSURFACE_GBL ddSurfGbl; + +WCHAR classname[128]; +WNDCLASSW wnd_class; @@ -74,7 +76,25 @@ if (Main_DirectDraw_QueryInterface((LPDIRECTDRAW7)This, id, (void**)&pIface)) { if (StartDirectDraw((LPDIRECTDRAW*)This, pGUID, FALSE) == DD_OK); + { + RtlZeroMemory(&wnd_class, sizeof(wnd_class)); + wnd_class.style = CS_HREDRAW | CS_VREDRAW; + wnd_class.lpfnWndProc = DefWindowProcW; + wnd_class.cbClsExtra = 0; + wnd_class.cbWndExtra = 0; + wnd_class.hInstance = GetModuleHandleW(0); + wnd_class.hIcon = 0; + wnd_class.hCursor = 0; + wnd_class.hbrBackground = (HBRUSH) GetStockObject(BLACK_BRUSH); + wnd_class.lpszMenuName = NULL; + wnd_class.lpszClassName = classname; + if(!RegisterClassW(&wnd_class)) + { + return DDERR_GENERIC; + } + return DD_OK; + } } return DDERR_INVALIDPARAMS; @@ -91,6 +111,7 @@ DWORD dwFlags = 0; DX_WINDBG_trace(); + /* * ddgbl.dwPDevice is not longer in use in windows 2000 and higher @@ -127,7 +148,8 @@ devicetypes= 1; /* Create HDC for default, hal and hel driver */ - This->lpLcl->hDC = (ULONG_PTR) GetDC(GetActiveWindow()); + This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); + This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd); /* cObsolete is undoc in msdn it being use in CreateDCA */ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); @@ -138,7 +160,8 @@ { devicetypes = 2; /* Create HDC for default, hal driver */ - This->lpLcl->hDC = (ULONG_PTR) GetDC(GetActiveWindow()); + This->lpLcl->hWnd =(ULONG_PTR) GetActiveWindow(); + This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd); /* cObsolete is undoc in msdn it being use in CreateDCA */ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); @@ -150,7 +173,8 @@ devicetypes = 3; /* Create HDC for default, hal and hel driver */ - This->lpLcl->hDC = (ULONG_PTR) GetDC(GetActiveWindow()); + This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); + This->lpLcl->hDC = (ULONG_PTR) GetDC((HWND)This->lpLcl->hWnd); /* cObsolete is undoc in msdn it being use in CreateDCA */ RtlCopyMemory(&ddgbl.cObsolete,&"DISPLAY",7); @@ -165,6 +189,7 @@ */ devicetypes = 4; This->lpLcl->hDC = (ULONG_PTR) NULL ; + This->lpLcl->hWnd = (ULONG_PTR) GetActiveWindow(); } if ( (HDC)This->lpLcl->hDC == NULL) @@ -222,6 +247,7 @@ This->lpLcl->lpDDCB = This->lpLcl->lpGbl->lpDDCBtmp; This->lpLcl->hDD = This->lpLcl->lpGbl->hDD; ddgbl.hDD = This->lpLcl->lpGbl->hDD; + return DD_OK; } @@ -318,12 +344,12 @@ DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks; LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - RtlZeroMemory(&mHALInfo, sizeof(DDHALINFO)); RtlZeroMemory(&mD3dCallbacks, sizeof(D3DHAL_CALLBACKS)); RtlZeroMemory(&mD3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); RtlZeroMemory(&mD3dBufferCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); + if (reenable == FALSE) { ddgbl.lpDDCBtmp = DxHeapMemAlloc(sizeof(DDHAL_CALLBACKS)); @@ -345,6 +371,8 @@ DxHeapMemFree(ddgbl.lpDDCBtmp); return DD_FALSE; } + + /* Some card disable the dx after it have been created so * we are force reanble it

1 0

[ekohl] 26466: Add message boxes to confirm the removal of user cursor schemes and the replacement of existing cursor schemes.
by ekohl＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: ekohl Date: Sun Apr 22 21:55:11 2007 New Revision: 26466 URL: http://svn.reactos.org/svn/reactos?rev=26466&view=rev Log: Add message boxes to confirm the removal of user cursor schemes and the replacement of existing cursor schemes. Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/pl-PL.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc Sun Apr 22 21:55:11 2007 @@ -163,4 +163,8 @@ IDS_SYSTEM_SCHEME "(systémové schéma)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Sun Apr 22 21:55:11 2007 @@ -165,4 +165,9 @@ IDS_SYSTEM_SCHEME "(Systemschema)" IDS_BROWSE_FILTER "Cursor (*.ani, *.cur)\0*.ani;*.cur\0Animierte Cursor (*.ani)\0*.ani\0Statische Cursor (*.cur)\0*.cur\0Alle Dateien\0*.*\0\0" IDS_BROWSE_TITLE "Durchsuchen" + IDS_REMOVE_TITLE "Löschen des Cursorschemas bestätigen" + IDS_REMOVE_TEXT "Soll das Cursorschema '%s' wirklich gelöscht werden?" + IDS_OVERWRITE_TITLE "Cursorschema überscheiben" + IDS_OVERWRITE_TEXT "Ein Cursorschema mit diesem Namen existiert bereits. Möchen Sie das existierende Cursorschema überscheiben?" END + Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc Sun Apr 22 21:55:11 2007 @@ -163,4 +163,8 @@ IDS_SYSTEM_SCHEME "(system scheme)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Cursor Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc Sun Apr 22 21:55:11 2007 @@ -164,4 +164,8 @@ IDS_SYSTEM_SCHEME "(system scheme)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc Sun Apr 22 21:55:11 2007 @@ -164,4 +164,8 @@ IDS_SYSTEM_SCHEME "(Arrangement système)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc Sun Apr 22 21:55:11 2007 @@ -164,4 +164,8 @@ IDS_SYSTEM_SCHEME "(system scheme)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc Sun Apr 22 21:55:11 2007 @@ -163,4 +163,8 @@ IDS_SYSTEM_SCHEME "(skema sistem)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Sun Apr 22 21:55:11 2007 @@ -165,4 +165,8 @@ IDS_SYSTEM_SCHEME "(Schema di sistema)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Sun Apr 22 21:55:11 2007 @@ -163,4 +163,8 @@ IDS_SYSTEM_SCHEME "(system scheme)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Sun Apr 22 21:55:11 2007 @@ -162,4 +162,8 @@ IDS_SYSTEM_SCHEME "(system scheme)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/pl-PL.rc Sun Apr 22 21:55:11 2007 @@ -169,4 +169,8 @@ IDS_SYSTEM_SCHEME "(schemat systemu)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Sun Apr 22 21:55:11 2007 @@ -164,4 +164,8 @@ IDS_SYSTEM_SCHEME "(system scheme)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Sun Apr 22 21:55:11 2007 @@ -171,4 +171,8 @@ IDS_SYSTEM_SCHEME "(ñèñòåìíà ñõåìà)" IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" IDS_BROWSE_TITLE "Browse" + IDS_REMOVE_TITLE "Confirm Scheme Removal" + IDS_REMOVE_TEXT "Are you sure you want to remove the cursor scheme '%s'?" + IDS_OVERWRITE_TITLE "Confirm Cursor Scheme Overwrite" + IDS_OVERWRITE_TEXT "The cursor scheme name you chose is already in use. Do you want to overwrite the existing cursor scheme?" END Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Sun Apr 22 21:55:11 2007 @@ -568,6 +568,9 @@ DeleteUserCursorScheme(HWND hwndDlg) { TCHAR szSchemeName[MAX_PATH]; + TCHAR szTitle[128]; + TCHAR szRawText[256]; + TCHAR szText[256]; HWND hDlgCtrl; HKEY hCuKey; HKEY hCuCursorKey; @@ -581,6 +584,15 @@ SendMessage(hDlgCtrl, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName); + LoadString(hApplet, IDS_REMOVE_TITLE, szTitle, 128); + LoadString(hApplet, IDS_REMOVE_TEXT, szRawText, 256); + + _stprintf(szText, szRawText, szSchemeName); + + /* Confirm scheme removal */ + if (MessageBox(hwndDlg, szText, szTitle, MB_YESNO | MB_ICONQUESTION) == IDNO) + return TRUE; + if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) return FALSE; @@ -646,12 +658,18 @@ { TCHAR szSystemScheme[MAX_PATH]; TCHAR szSchemeName[MAX_PATH]; + TCHAR szNewSchemeName[MAX_PATH]; + TCHAR szTitle[128]; + TCHAR szText[256]; INT nSel; INT index, i, nLength; LPTSTR lpSchemeData; HKEY hCuKey; HKEY hCuCursorKey; LONG lResult = ERROR_SUCCESS; + BOOL bSchemeExists; + + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCURSEL, 0, 0); if (nSel == CB_ERR) @@ -663,55 +681,83 @@ } else { - SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName); - - LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - - if (_tcsstr(szSchemeName, szSystemScheme)) + SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)szNewSchemeName); + + if (_tcsstr(szNewSchemeName, szSystemScheme)) { - szSchemeName[_tcslen(szSchemeName) - _tcslen(szSystemScheme) - 1] = 0; + szNewSchemeName[_tcslen(szNewSchemeName) - _tcslen(szSystemScheme) - 1] = 0; } } - if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), - hwndDlg, SaveSchemeProc, (LPARAM)szSchemeName)) - { - /* Save the cursor scheme */ - nLength = 0; - for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + /* Ask for a name for the new cursor scheme */ + if (!DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), + hwndDlg, SaveSchemeProc, (LPARAM)szNewSchemeName)) + return TRUE; + + /* Check all non-system schemes for the new name */ + nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCOUNT, 0, 0); + if (nSel == CB_ERR) + return FALSE; + + bSchemeExists = FALSE; + for (i = 0; i < nSel; i++) + { + SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, i, (LPARAM)szSchemeName); + if (_tcsstr(szSchemeName, szSystemScheme) == NULL) { - if (i > 0) - nLength++; - nLength += _tcslen(g_CursorData[i].szCursorPath); + if (_tcscmp(szSchemeName, szNewSchemeName) == 0) + { + bSchemeExists = TRUE; + break; + } } - nLength++; - - lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR)); - - for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) - { - if (i > 0) - _tcscat(lpSchemeData, _T(",")); - _tcscat(lpSchemeData, g_CursorData[i].szCursorPath); - } - - if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) - return FALSE; - - if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS) - { - RegCloseKey(hCuKey); - return FALSE; - } - - lResult = RegSetValueEx(hCuCursorKey, szSchemeName, 0, REG_EXPAND_SZ, - (LPBYTE)lpSchemeData, nLength * sizeof(TCHAR)); - - RegCloseKey(hCuCursorKey); + } + + if (bSchemeExists) + { + LoadString(hApplet, IDS_OVERWRITE_TITLE, szTitle, 128); + LoadString(hApplet, IDS_OVERWRITE_TEXT, szText, 256); + + /* Confirm scheme overwrite */ + if (MessageBox(hwndDlg, szText, szTitle, MB_YESNO | MB_ICONQUESTION) == IDNO) + return TRUE; + } + + /* Save the cursor scheme */ + nLength = 0; + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (i > 0) + nLength++; + nLength += _tcslen(g_CursorData[i].szCursorPath); + } + nLength++; + + lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR)); + + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (i > 0) + _tcscat(lpSchemeData, _T(",")); + _tcscat(lpSchemeData, g_CursorData[i].szCursorPath); + } + + if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) + return FALSE; + + if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS) + { RegCloseKey(hCuKey); - - HeapFree(GetProcessHeap(), 0, lpSchemeData); - } + return FALSE; + } + + lResult = RegSetValueEx(hCuCursorKey, szNewSchemeName, 0, REG_EXPAND_SZ, + (LPBYTE)lpSchemeData, nLength * sizeof(TCHAR)); + + RegCloseKey(hCuCursorKey); + RegCloseKey(hCuKey); + + HeapFree(GetProcessHeap(), 0, lpSchemeData); return (lResult == ERROR_SUCCESS); } Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Sun Apr 22 21:55:11 2007 @@ -44,7 +44,10 @@ #define IDS_SYSTEM_SCHEME 1032 #define IDS_BROWSE_FILTER 1033 #define IDS_BROWSE_TITLE 1034 - +#define IDS_REMOVE_TITLE 1035 +#define IDS_REMOVE_TEXT 1036 +#define IDS_OVERWRITE_TITLE 1037 +#define IDS_OVERWRITE_TEXT 1038 #define IDC_SWAP_MOUSE_BUTTONS 2000 #define IDC_SLIDER_DOUBLE_CLICK_SPEED 2001

1 0

[ekohl] 26465: Add missing strings.
by ekohl＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: ekohl Date: Sun Apr 22 19:16:36 2007 New Revision: 26465 URL: http://svn.reactos.org/svn/reactos?rev=26465&view=rev Log: Add missing strings. Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/pl-PL.rc Sun Apr 22 19:16:36 2007 @@ -167,4 +167,6 @@ IDS_HAND "Wybór ³¹cza" IDS_NONE "(Brak)" IDS_SYSTEM_SCHEME "(schemat systemu)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END

1 0

[ekohl] 26464: - Add the ability to save cursor schemes. - Open the browse dialog upon double-click on a cursor in the cursor list. - Localize the filter string and the title string of the browse dialog.
by ekohl＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: ekohl Date: Sun Apr 22 19:11:04 2007 New Revision: 26464 URL: http://svn.reactos.org/svn/reactos?rev=26464&view=rev Log: - Add the ability to save cursor schemes. - Open the browse dialog upon double-click on a cursor in the cursor list. - Localize the filter string and the title string of the browse dialog. Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/en-US.rc trunk/reactos/dll/cpl/main/lang/es-ES.rc trunk/reactos/dll/cpl/main/lang/fr-FR.rc trunk/reactos/dll/cpl/main/lang/hu-HU.rc trunk/reactos/dll/cpl/main/lang/id-ID.rc trunk/reactos/dll/cpl/main/lang/it-IT.rc trunk/reactos/dll/cpl/main/lang/ja-JP.rc trunk/reactos/dll/cpl/main/lang/nl-NL.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/uk-UA.rc trunk/reactos/dll/cpl/main/mouse.c trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/main/lang/cs-CZ.rc Sun Apr 22 19:11:04 2007 @@ -161,4 +161,6 @@ IDS_HAND "Výbìr odkazu" IDS_NONE "(Není)" IDS_SYSTEM_SCHEME "(systémové schéma)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Sun Apr 22 19:11:04 2007 @@ -163,4 +163,6 @@ IDS_HAND "Verknüpfungsauswahl" IDS_NONE "(Kein)" IDS_SYSTEM_SCHEME "(Systemschema)" + IDS_BROWSE_FILTER "Cursor (*.ani, *.cur)\0*.ani;*.cur\0Animierte Cursor (*.ani)\0*.ani\0Statische Cursor (*.cur)\0*.cur\0Alle Dateien\0*.*\0\0" + IDS_BROWSE_TITLE "Durchsuchen" END Modified: trunk/reactos/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/main/lang/en-US.rc Sun Apr 22 19:11:04 2007 @@ -161,4 +161,6 @@ IDS_HAND "Link Select" IDS_NONE "(None)" IDS_SYSTEM_SCHEME "(system scheme)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/main/lang/es-ES.rc Sun Apr 22 19:11:04 2007 @@ -162,4 +162,6 @@ IDS_HAND "Link Select" IDS_NONE "(None)" IDS_SYSTEM_SCHEME "(system scheme)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/main/lang/fr-FR.rc Sun Apr 22 19:11:04 2007 @@ -162,4 +162,6 @@ IDS_HAND "Sélection de lien" IDS_NONE "(Aucun)" IDS_SYSTEM_SCHEME "(Arrangement système)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/hu-HU.rc Sun Apr 22 19:11:04 2007 @@ -162,4 +162,6 @@ IDS_HAND "Link Select" IDS_NONE "(None)" IDS_SYSTEM_SCHEME "(system scheme)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/main/lang/id-ID.rc Sun Apr 22 19:11:04 2007 @@ -161,4 +161,6 @@ IDS_HAND "Memilih Link" IDS_NONE "(tidak ada)" IDS_SYSTEM_SCHEME "(skema sistem)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/main/lang/it-IT.rc Sun Apr 22 19:11:04 2007 @@ -163,4 +163,6 @@ IDS_HAND "Seleziona collegamento" IDS_NONE "(Nessuna)" IDS_SYSTEM_SCHEME "(Schema di sistema)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ja-JP.rc Sun Apr 22 19:11:04 2007 @@ -161,4 +161,6 @@ IDS_HAND "Link Select" IDS_NONE "(None)" IDS_SYSTEM_SCHEME "(system scheme)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/nl-NL.rc Sun Apr 22 19:11:04 2007 @@ -160,4 +160,6 @@ IDS_HAND "Link Select" IDS_NONE "(None)" IDS_SYSTEM_SCHEME "(system scheme)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/main/lang/ru-RU.rc Sun Apr 22 19:11:04 2007 @@ -162,4 +162,6 @@ IDS_HAND "Link Select" IDS_NONE "(None)" IDS_SYSTEM_SCHEME "(system scheme)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/main/lang/uk-UA.rc Sun Apr 22 19:11:04 2007 @@ -169,4 +169,6 @@ IDS_HAND "Âèá³ð ïîñèëàííÿ" IDS_NONE "(Íåìàº)" IDS_SYSTEM_SCHEME "(ñèñòåìíà ñõåìà)" + IDS_BROWSE_FILTER "Cursors (*.ani, *.cur)\0*.ani;*.cur\0Animated Cursors (*.ani)\0*.ani\0Static Cursors (*.cur)\0*.cur\0All Files\0*.*\0\0" + IDS_BROWSE_TITLE "Browse" END Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Sun Apr 22 19:11:04 2007 @@ -26,12 +26,8 @@ */ //TODO: -//detect slider changes - for apply stuff -// cursor icon shows - may need overriden items -// implement Pointer-APPLY -// implement Pointer-Browser -// add missing icons -// Options- pointer precision +// add missing icons +// Options- pointer precision #define WINVER 0x0501 @@ -134,8 +130,6 @@ {IDS_UPARROW, IDC_UPARROW, 0, _T(""), _T("")}, {IDS_HAND, IDC_HAND, 0, _T(""), _T("")}}; - -TCHAR g_szNewScheme[MAX_PATH]; #if 0 static VOID @@ -517,8 +511,6 @@ *p = 0; } -// DebugMsg(_T("szCurrentScheme: \"%s\"\nszValueName: \"%s\""), szCurrentScheme, szValueName); - if (_tcscmp(szValueName, szCurrentScheme) == 0) { nSchemeIndex = (INT)i; @@ -619,16 +611,23 @@ IN WPARAM wParam, IN LPARAM lParam) { - HWND hDlgCtrl; - UNREFERENCED_PARAMETER(lParam); - - switch(uMsg) - { + LPTSTR pSchemeName; + + switch (uMsg) + { + case WM_INITDIALOG: + pSchemeName = (LPTSTR)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSchemeName); + SendDlgItemMessage(hwndDlg, IDC_EDIT_SCHEME_NAME, WM_SETTEXT, + 0, (LPARAM)pSchemeName); + break; + case WM_COMMAND: if (LOWORD(wParam) == IDOK) { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_SCHEME_NAME); - SendMessage(hDlgCtrl, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)g_szNewScheme); + pSchemeName = (LPTSTR)GetWindowLongPtr(hwndDlg, DWLP_USER); + SendDlgItemMessage(hwndDlg, IDC_EDIT_SCHEME_NAME, WM_GETTEXT, + (WPARAM)MAX_PATH, (LPARAM)pSchemeName); EndDialog(hwndDlg, TRUE); } else if (LOWORD(wParam) == IDCANCEL) @@ -639,6 +638,82 @@ } return FALSE; +} + + +static BOOL +SaveCursorScheme(HWND hwndDlg) +{ + TCHAR szSystemScheme[MAX_PATH]; + TCHAR szSchemeName[MAX_PATH]; + INT nSel; + INT index, i, nLength; + LPTSTR lpSchemeData; + HKEY hCuKey; + HKEY hCuCursorKey; + LONG lResult = ERROR_SUCCESS; + + nSel = SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETCURSEL, 0, 0); + if (nSel == CB_ERR) + return FALSE; + + if (nSel == 0) + { + szSchemeName[0] = 0; + } + else + { + SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)szSchemeName); + + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); + + if (_tcsstr(szSchemeName, szSystemScheme)) + { + szSchemeName[_tcslen(szSchemeName) - _tcslen(szSystemScheme) - 1] = 0; + } + } + + if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), + hwndDlg, SaveSchemeProc, (LPARAM)szSchemeName)) + { + /* Save the cursor scheme */ + nLength = 0; + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (i > 0) + nLength++; + nLength += _tcslen(g_CursorData[i].szCursorPath); + } + nLength++; + + lpSchemeData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(TCHAR)); + + for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) + { + if (i > 0) + _tcscat(lpSchemeData, _T(",")); + _tcscat(lpSchemeData, g_CursorData[i].szCursorPath); + } + + if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) + return FALSE; + + if (RegOpenKeyEx(hCuKey, _T("Control Panel\\Cursors\\Schemes"), 0, KEY_READ | KEY_SET_VALUE, &hCuCursorKey) != ERROR_SUCCESS) + { + RegCloseKey(hCuKey); + return FALSE; + } + + lResult = RegSetValueEx(hCuCursorKey, szSchemeName, 0, REG_EXPAND_SZ, + (LPBYTE)lpSchemeData, nLength * sizeof(TCHAR)); + + RegCloseKey(hCuCursorKey); + RegCloseKey(hCuKey); + + HeapFree(GetProcessHeap(), 0, lpSchemeData); + } + + return (lResult == ERROR_SUCCESS); } @@ -646,22 +721,23 @@ BrowseCursor(HWND hwndDlg) { TCHAR szFileName[MAX_PATH]; + TCHAR szFilter[MAX_PATH]; + TCHAR szTitle[MAX_PATH]; OPENFILENAME ofn; INT nSel; - /* FIXME load text resources from string */ - static TCHAR szFilter[] = _T("Cursors\0*.ani;*.cur\0Animated Cursors\0*.ani\0Static Cursors\0*.cur\0All Files\0*.*\0\0"); + LoadString(hApplet, IDS_BROWSE_FILTER, szFilter, MAX_PATH); + LoadString(hApplet, IDS_BROWSE_TITLE, szTitle, MAX_PATH); memset(szFileName, 0x0, sizeof(szFileName)); nSel = SendDlgItemMessage(hwndDlg, IDC_LISTBOX_CURSOR, LB_GETCURSEL, 0, 0); if (nSel == LB_ERR) { - MessageBox(hwndDlg, _T("LB_ERR"), _T(""),MB_ICONERROR); + MessageBox(hwndDlg, _T("LB_ERR"), _T(""), MB_ICONERROR); return FALSE; } ZeroMemory(&ofn, sizeof(OPENFILENAME)); - ofn.lStructSize = sizeof(OPENFILENAME); ofn.hwndOwner = hwndDlg; ofn.lpstrFilter = szFilter; @@ -669,7 +745,7 @@ ofn.lpstrFile = szFileName; ofn.nMaxFile = MAX_PATH; ofn.lpstrInitialDir = _T("%WINDIR%\\Cursors"); - ofn.lpstrTitle = _T("Browse"); /* FIXME load text resources from string */ + ofn.lpstrTitle = szTitle; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST; if (!GetOpenFileName(&ofn)) @@ -844,6 +920,15 @@ } +static BOOL +ApplyCursorScheme(HWND hwndDlg) +{ + /* FIXME: Apply the cursor scheme */ + + return TRUE; +} + + static INT_PTR CALLBACK PointerProc(IN HWND hwndDlg, IN UINT uMsg, @@ -898,6 +983,7 @@ lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_APPLY) { + ApplyCursorScheme(hwndDlg); #if (WINVER >= 0x0500) SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)pPointerData->bDropShadow, SPIF_SENDCHANGE); #endif @@ -920,20 +1006,34 @@ break; case IDC_LISTBOX_CURSOR: - if (HIWORD(wParam) == LBN_SELCHANGE) - { - nSel = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); - SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, - (LPARAM)g_CursorData[nSel].hCursor); - EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), - (g_CursorData[nSel].szCursorPath[0] != 0)); + switch (HIWORD(wParam)) + { + case LBN_SELCHANGE: + nSel = SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); + SendDlgItemMessage(hwndDlg, IDC_IMAGE_CURRENT_CURSOR, STM_SETIMAGE, IMAGE_CURSOR, + (LPARAM)g_CursorData[nSel].hCursor); + EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), + (g_CursorData[nSel].szCursorPath[0] != 0)); + break; + + case LBN_DBLCLK: + if (BrowseCursor(hwndDlg)) + { + /* Update cursor list and preview */ + ReloadCurrentCursorScheme(); + RefreshCursorList(hwndDlg, FALSE); + + /* Enable the "Set Default" button */ + EnableWindow(GetDlgItem(hwndDlg,IDC_BUTTON_USE_DEFAULT_CURSOR), TRUE); + } + break; } break; case IDC_BUTTON_SAVEAS_SCHEME: - if (DialogBox(hApplet, MAKEINTRESOURCE(IDD_CURSOR_SCHEME_SAVEAS), hwndDlg, SaveSchemeProc)) - { - /* FIXME: save the cursor scheme */ + if (SaveCursorScheme(hwndDlg)) + { + } break; Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Sun Apr 22 19:11:04 2007 @@ -25,7 +25,6 @@ #define IDS_CPLDESCRIPTION_1 1001 #define IDS_CPLNAME_2 1002 #define IDS_CPLDESCRIPTION_2 1003 - #define IDS_ARROW 1016 #define IDS_HELP 1017 #define IDS_APPSTARTING 1018 @@ -43,6 +42,8 @@ #define IDS_HAND 1030 #define IDS_NONE 1031 #define IDS_SYSTEM_SCHEME 1032 +#define IDS_BROWSE_FILTER 1033 +#define IDS_BROWSE_TITLE 1034 #define IDC_SWAP_MOUSE_BUTTONS 2000

1 0

[dgorbachev] 26463: Fix Polish translation (bug #2194).
by dgorbachev＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: dgorbachev Date: Sun Apr 22 18:35:02 2007 New Revision: 26463 URL: http://svn.reactos.org/svn/reactos?rev=26463&view=rev Log: Fix Polish translation (bug #2194). Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/main/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/main/lang/pl-PL.rc Sun Apr 22 18:35:02 2007 @@ -1,8 +1,9 @@ /* -* translated by xrogers -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ + * translated by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + */ + LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 @@ -135,12 +136,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Przewijanie", -1, 5, 5, 230, 80 + ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Obrócenie kó³kiem o jeden skok powoduje przewiniêcie:", -1, 60, 15, 150, 10 - CONTROL "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, "Button", 0x50010009, 60, 30, 150, 10 - EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15,ES_RIGHT | WS_GROUP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 45, 12, 12 - CONTROL "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, "Button", 0x50010009, 60, 65, 90, 10 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 + RADIOBUTTON "&O tyle linii naraz:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP + RADIOBUTTON "O jeden &ekran", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 + EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 60, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP + CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 115, 45, 12, 12 END STRINGTABLE

1 0

[greatlrd] 26462: fixing a small bug in startup.c
by greatlrd＠svn.reactos.org 22 Apr '07

22 Apr '07

Author: greatlrd Date: Sun Apr 22 18:02:37 2007 New Revision: 26462 URL: http://svn.reactos.org/svn/reactos?rev=26462&view=rev Log: fixing a small bug in startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Apr 22 18:02:37 2007 @@ -88,7 +88,7 @@ DWORD hal_ret = DD_FALSE; DWORD hel_ret = DD_FALSE; DWORD devicetypes = 0; - DWORD dwFlags; + DWORD dwFlags = 0; DX_WINDBG_trace(); @@ -218,8 +218,10 @@ } /* Fill some basic info for Surface */ - - This->lpLcl->hDD = ddgbl.hDD; + This->lpLcl->lpGbl->dwFlags = dwFlags | DDRAWI_ATTACHEDTODESKTOP; + This->lpLcl->lpDDCB = This->lpLcl->lpGbl->lpDDCBtmp; + This->lpLcl->hDD = This->lpLcl->lpGbl->hDD; + ddgbl.hDD = This->lpLcl->lpGbl->hDD; return DD_OK; }

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