June 2007 - Wine-commits - list.winehq.org

Alexander Nicolaysen Sørnes : wordpad: Allow toggling of toolbar.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 10b348399ac2b90810b48850ff554142b0a41d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b348399ac2b90810b48850f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 6 11:10:47 2007 +0200 wordpad: Allow toggling of toolbar. --- programs/wordpad/De.rc | 4 +++ programs/wordpad/En.rc | 4 +++ programs/wordpad/Fr.rc | 4 +++ programs/wordpad/Hu.rc | 4 +++ programs/wordpad/Ko.rc | 4 +++ programs/wordpad/Nl.rc | 4 +++ programs/wordpad/No.rc | 4 +++ programs/wordpad/Pl.rc | 4 +++ programs/wordpad/Ru.rc | 4 +++ programs/wordpad/Tr.rc | 4 +++ programs/wordpad/resource.h | 4 +++ programs/wordpad/wordpad.c | 62 ++++++++++++++++++++++++++++++++++++++++--- 12 files changed, 102 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index 64893cb..b09e743 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -52,6 +52,10 @@ BEGIN MENUITEM "&Get text", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "F&ormat" BEGIN POPUP "&Hintergrund" diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index 2f08653..a83eec6 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -52,6 +52,10 @@ BEGIN MENUITEM "&Get text", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "F&ormat" BEGIN POPUP "&Background" diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index c52dac2..0205954 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -52,6 +52,10 @@ BEGIN MENUITEM "&Recevoir texte", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "Forma&t" BEGIN POPUP "&Fond" diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 93c0220..5ebcdee 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -52,6 +52,10 @@ BEGIN MENUITEM "Sz&�vegszerz�s", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "F&orm�tum" BEGIN POPUP "&H�tt�r" diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index d963f62..b01f68f 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -53,6 +53,10 @@ BEGIN MENUITEM "�ؽ�Ʈ ��(&G)", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "��(&O)" BEGIN POPUP "��(&B)" diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index 67f378b..ed05fcc 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -52,6 +52,10 @@ BEGIN MENUITEM "&Haal tekst", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "&Opmaak" BEGIN POPUP "&Achtergrond" diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 87be440..4955ebd 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -52,6 +52,10 @@ BEGIN MENUITEM "&Hent tekst", ID_EDIT_GETTEXT END END + POPUP "&Vis" + BEGIN + MENUITEM "Verk&t�ylinje", ID_TOGGLE_TOOLBAR + END POPUP "F&ormat" BEGIN POPUP "&Bakgrunn" diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index c556264..161a402 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -53,6 +53,10 @@ BEGIN MENUITEM "&Pobie� tekst", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "F&ormat" BEGIN POPUP "&T�o" diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index ef18f08..37bb291 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -50,6 +50,10 @@ BEGIN MENUITEM "�&�� ", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "��&��" BEGIN POPUP "&��" diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 7a124ab..35b9aef 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -54,6 +54,10 @@ BEGIN MENUITEM "&Metni al", ID_EDIT_GETTEXT END END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + END POPUP "&Bi�im" BEGIN POPUP "&Arkaplan" diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index bc7647d..da122db 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -53,6 +53,10 @@ #define ID_FORMAT_ITALIC 1401 #define ID_FORMAT_UNDERLINE 1402 +#define ID_TOGGLE_TOOLBAR 1500 + +#define BANDID_TOOLBAR 0 + #define IDC_STATUSBAR 2000 #define IDC_EDITOR 2001 #define IDC_TOOLBAR 2002 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 6efc15d..7a16b15 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -48,6 +48,8 @@ static HWND hEditorWnd; static WCHAR wszFilter[MAX_STRING_LEN]; +static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ); + /* Load string resources */ static void DoLoadStrings(void) { @@ -324,6 +326,43 @@ static void DoDefaultFont(void) SendMessage(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } +static void toggle_toolbar(int bandId) +{ + HWND hwndReBar = GetDlgItem(hMainWnd, IDC_REBAR); + REBARBANDINFOW rbbinfo; + RECT rect; + + if(!hwndReBar) + return; + + rbbinfo.cbSize = sizeof(rbbinfo); + rbbinfo.fMask = RBBIM_STYLE; + + SendMessageW(hwndReBar, RB_GETBANDINFO, bandId, (LPARAM)&rbbinfo); + + SendMessageW(hwndReBar, RB_SHOWBAND, bandId, (rbbinfo.fStyle & RBBS_HIDDEN)); + + GetWindowRect(hMainWnd, &rect); + + (void) OnSize(hMainWnd, SIZE_RESTORED, MAKELONG(rect.bottom, rect.right)); +} + +static int rebar_height(void) +{ + HWND hwndReBar = GetDlgItem(hMainWnd, IDC_REBAR); + + REBARBANDINFOW rbbinfo; + + if(!hwndReBar) + return 0; + + rbbinfo.cbSize = sizeof(rbbinfo); + rbbinfo.fMask = RBBIM_STYLE; + SendMessageW(hwndReBar, RB_GETBANDINFO, BANDID_TOOLBAR, (LPARAM)&rbbinfo); + + return (rbbinfo.fStyle & RBBS_HIDDEN) ? 0 : SendMessage(hwndReBar, RB_GETBARHEIGHT, 0, 0); +} + static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) { HWND hToolBarWnd, hReBarWnd; @@ -389,7 +428,7 @@ static LRESULT OnCreate( HWND hWnd, WPARAM wParam, LPARAM lParam) rbb.cxMinChild = 0; rbb.cyChild = rbb.cyMinChild = HIWORD(SendMessage(hToolBarWnd, TB_GETBUTTONSIZE, 0, 0)); - SendMessage(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); + SendMessageW(hReBarWnd, RB_INSERTBAND, BANDID_TOOLBAR, (LPARAM)&rbb); hDLL = LoadLibrary("RICHED20.DLL"); assert(hDLL); @@ -674,6 +713,10 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) SendMessage(hwndEditor, EM_SETBKGNDCOLOR, 0, RGB(255,255,192)); break; + case ID_TOGGLE_TOOLBAR: + toggle_toolbar(BANDID_TOOLBAR); + break; + default: SendMessage(hwndEditor, WM_COMMAND, wParam, lParam); break; @@ -685,8 +728,10 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) { HMENU hMenu = (HMENU)wParam; HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); + HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); PARAFORMAT pf; int nAlignment = -1; + REBARBANDINFOW rbbinfo; pf.cbSize = sizeof(PARAFORMAT); SendMessage(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); @@ -701,17 +746,26 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) CheckMenuItem(hMenu, ID_ALIGN_RIGHT, MF_BYCOMMAND|(nAlignment == PFA_RIGHT) ? MF_CHECKED : MF_UNCHECKED); EnableMenuItem(hMenu, ID_EDIT_UNDO, MF_BYCOMMAND|(SendMessage(hwndEditor, EM_CANUNDO, 0, 0)) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(hMenu, ID_EDIT_REDO, MF_BYCOMMAND|(SendMessage(hwndEditor, EM_CANREDO, 0, 0)) ? MF_ENABLED : MF_GRAYED); + + rbbinfo.cbSize = sizeof(rbbinfo); + rbbinfo.fMask = RBBIM_STYLE; + SendMessageW(hwndReBar, RB_GETBANDINFO, 0, (LPARAM)&rbbinfo); + + CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, MF_BYCOMMAND|(rbbinfo.fStyle & RBBS_HIDDEN) ? + MF_UNCHECKED : MF_CHECKED); + return 0; } static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) { - int nStatusSize = 0, nTBSize = 0; + int nStatusSize = 0; RECT rc; HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndStatusBar = GetDlgItem(hWnd, IDC_STATUSBAR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); HWND hwndToolBar = GetDlgItem(hwndReBar, IDC_TOOLBAR); + int rebarHeight; if (hwndStatusBar) { @@ -726,14 +780,14 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) rc.bottom = HIWORD(lParam); SendMessage(hwndToolBar, TB_AUTOSIZE, 0, 0); SendMessage(hwndReBar, RB_SIZETORECT, 0, (LPARAM)&rc); - nTBSize = SendMessage(hwndReBar, RB_GETBARHEIGHT, 0, 0); GetClientRect(hwndReBar, &rc); MoveWindow(hwndReBar, 0, 0, LOWORD(lParam), rc.right, FALSE); } if (hwndEditor) { + rebarHeight = rebar_height(); GetClientRect(hWnd, &rc); - MoveWindow(hwndEditor, 0, nTBSize, rc.right, rc.bottom-nStatusSize-nTBSize, TRUE); + MoveWindow(hwndEditor, 0, rebarHeight, rc.right, rc.bottom-nStatusSize-rebarHeight, TRUE); } return DefWindowProcW(hWnd, WM_SIZE, wParam, lParam);

1 0

Alexander Nicolaysen Sørnes : wordpad: Allow toggling of statusbar.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 2de3d95ea5091b14d91f6003a605391fcd08d7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de3d95ea5091b14d91f6003a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 6 11:21:08 2007 +0200 wordpad: Allow toggling of statusbar. --- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 1 + programs/wordpad/Fr.rc | 1 + programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 1 + programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 1 + programs/wordpad/resource.h | 1 + programs/wordpad/wordpad.c | 33 +++++++++++++++++++++++++++------ 12 files changed, 38 insertions(+), 6 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index b09e743..dbaad47 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -55,6 +55,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "F&ormat" BEGIN diff --git a/programs/wordpad/En.rc b/programs/wordpad/En.rc index a83eec6..d4099b2 100644 --- a/programs/wordpad/En.rc +++ b/programs/wordpad/En.rc @@ -55,6 +55,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "F&ormat" BEGIN diff --git a/programs/wordpad/Fr.rc b/programs/wordpad/Fr.rc index 0205954..a840f98 100644 --- a/programs/wordpad/Fr.rc +++ b/programs/wordpad/Fr.rc @@ -55,6 +55,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "Forma&t" BEGIN diff --git a/programs/wordpad/Hu.rc b/programs/wordpad/Hu.rc index 5ebcdee..3632029 100644 --- a/programs/wordpad/Hu.rc +++ b/programs/wordpad/Hu.rc @@ -55,6 +55,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "F&orm�tum" BEGIN diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index b01f68f..a45e8e5 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -56,6 +56,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "��(&O)" BEGIN diff --git a/programs/wordpad/Nl.rc b/programs/wordpad/Nl.rc index ed05fcc..5c5bd14 100644 --- a/programs/wordpad/Nl.rc +++ b/programs/wordpad/Nl.rc @@ -55,6 +55,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "&Opmaak" BEGIN diff --git a/programs/wordpad/No.rc b/programs/wordpad/No.rc index 4955ebd..e339b3a 100644 --- a/programs/wordpad/No.rc +++ b/programs/wordpad/No.rc @@ -55,6 +55,7 @@ BEGIN POPUP "&Vis" BEGIN MENUITEM "Verk&t�ylinje", ID_TOGGLE_TOOLBAR + MENUITEM "&Statuslinje", ID_TOGGLE_STATUSBAR END POPUP "F&ormat" BEGIN diff --git a/programs/wordpad/Pl.rc b/programs/wordpad/Pl.rc index 161a402..1d1362e 100644 --- a/programs/wordpad/Pl.rc +++ b/programs/wordpad/Pl.rc @@ -56,6 +56,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "F&ormat" BEGIN diff --git a/programs/wordpad/Ru.rc b/programs/wordpad/Ru.rc index 37bb291..8b0ea29 100644 --- a/programs/wordpad/Ru.rc +++ b/programs/wordpad/Ru.rc @@ -53,6 +53,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "��&��" BEGIN diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index 35b9aef..d59856c 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -57,6 +57,7 @@ BEGIN POPUP "&View" BEGIN MENUITEM "&Toolbar", ID_TOGGLE_TOOLBAR + MENUITEM "&Statusbar", ID_TOGGLE_STATUSBAR END POPUP "&Bi�im" BEGIN diff --git a/programs/wordpad/resource.h b/programs/wordpad/resource.h index da122db..667b555 100644 --- a/programs/wordpad/resource.h +++ b/programs/wordpad/resource.h @@ -54,6 +54,7 @@ #define ID_FORMAT_UNDERLINE 1402 #define ID_TOGGLE_TOOLBAR 1500 +#define ID_TOGGLE_STATUSBAR 1501 #define BANDID_TOOLBAR 0 diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 7a16b15..bc18d31 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -326,11 +326,19 @@ static void DoDefaultFont(void) SendMessage(hEditorWnd, EM_SETCHARFORMAT, SCF_DEFAULT, (LPARAM)&fmt); } +static void update_window(void) +{ + RECT rect; + + GetWindowRect(hMainWnd, &rect); + + (void) OnSize(hMainWnd, SIZE_RESTORED, MAKELONG(rect.bottom, rect.right)); +} + static void toggle_toolbar(int bandId) { HWND hwndReBar = GetDlgItem(hMainWnd, IDC_REBAR); REBARBANDINFOW rbbinfo; - RECT rect; if(!hwndReBar) return; @@ -342,9 +350,7 @@ static void toggle_toolbar(int bandId) SendMessageW(hwndReBar, RB_SHOWBAND, bandId, (rbbinfo.fStyle & RBBS_HIDDEN)); - GetWindowRect(hMainWnd, &rect); - - (void) OnSize(hMainWnd, SIZE_RESTORED, MAKELONG(rect.bottom, rect.right)); + update_window(); } static int rebar_height(void) @@ -518,6 +524,7 @@ static LRESULT OnNotify( HWND hWnd, WPARAM wParam, LPARAM lParam) static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) { HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); + HWND hwndStatus = GetDlgItem(hWnd, IDC_STATUSBAR); if ((HWND)lParam == hwndEditor) return 0; @@ -717,6 +724,11 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) toggle_toolbar(BANDID_TOOLBAR); break; + case ID_TOGGLE_STATUSBAR: + ShowWindow(hwndStatus, IsWindowVisible(hwndStatus) ? SW_HIDE : SW_SHOW); + update_window(); + break; + default: SendMessage(hwndEditor, WM_COMMAND, wParam, lParam); break; @@ -729,6 +741,7 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) HMENU hMenu = (HMENU)wParam; HWND hwndEditor = GetDlgItem(hWnd, IDC_EDITOR); HWND hwndReBar = GetDlgItem(hWnd, IDC_REBAR); + HWND hwndStatus = GetDlgItem(hWnd, IDC_STATUSBAR); PARAFORMAT pf; int nAlignment = -1; REBARBANDINFOW rbbinfo; @@ -754,6 +767,8 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam, LPARAM lParam ) CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, MF_BYCOMMAND|(rbbinfo.fStyle & RBBS_HIDDEN) ? MF_UNCHECKED : MF_CHECKED); + CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ? + MF_CHECKED : MF_UNCHECKED); return 0; } @@ -770,8 +785,14 @@ static LRESULT OnSize( HWND hWnd, WPARAM wParam, LPARAM lParam ) if (hwndStatusBar) { SendMessage(hwndStatusBar, WM_SIZE, 0, 0); - GetClientRect(hwndStatusBar, &rc); - nStatusSize = rc.bottom - rc.top; + if (IsWindowVisible(hwndStatusBar)) + { + GetClientRect(hwndStatusBar, &rc); + nStatusSize = rc.bottom - rc.top; + } else + { + nStatusSize = 0; + } } if (hwndToolBar) {

1 0

Alexander Nicolaysen Sørnes : wordpad: Split toolbar into tool- and formatbar.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: ffa7e0e25dc0b6e566ce70a4b486040f939bca3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa7e0e25dc0b6e566ce70a4b… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jun 6 13:28:26 2007 +0200 wordpad: Split toolbar into tool- and formatbar. --- .gitignore | 2 +- programs/wordpad/De.rc | 1 + programs/wordpad/En.rc | 1 + programs/wordpad/Fr.rc | 3 +- programs/wordpad/Hu.rc | 1 + programs/wordpad/Ko.rc | 1 + programs/wordpad/Makefile.in | 2 +- programs/wordpad/Nl.rc | 1 + programs/wordpad/No.rc | 3 +- programs/wordpad/Pl.rc | 1 + programs/wordpad/Ru.rc | 1 + programs/wordpad/Tr.rc | 1 + programs/wordpad/resource.h | 11 ++- programs/wordpad/rsrc.rc | 4 +- programs/wordpad/wordpad.c | 156 +++++++++++++++++++++++++++++------------ 15 files changed, 133 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffa7e0e25dc0b6e566ce7…

1 0

Stefan Dösinger : d3d8: Hold the lock in cubetexture methods.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: e96287e49c9a6154248782cc280ceaf21a01c1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96287e49c9a6154248782cc2… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat May 26 20:02:46 2007 +0200 d3d8: Hold the lock in cubetexture methods. --- dlls/d3d8/cubetexture.c | 104 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 90 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 71daf34..ae343bb 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -57,7 +57,9 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa if (ref == 0) { TRACE("Releasing child %p\n", This->wineD3DCubeTexture); + EnterCriticalSection(&d3d8_cs); IWineD3DCubeTexture_Destroy(This->wineD3DCubeTexture, D3D8CB_DestroySurface); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -67,74 +69,128 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa /* IDirect3DCubeTexture8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n" , This); - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + + EnterCriticalSection(&d3d8_cs); + hr = IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_SetPrivateData(This->wineD3DCubeTexture,refguid,pData,SizeOfData,Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DCubeTexture_SetPrivateData(This->wineD3DCubeTexture,refguid,pData,SizeOfData,Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_GetPrivateData(This->wineD3DCubeTexture,refguid,pData,pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DCubeTexture_GetPrivateData(This->wineD3DCubeTexture,refguid,pData,pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_FreePrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_FreePrivateData(This->wineD3DCubeTexture,refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DCubeTexture_FreePrivateData(This->wineD3DCubeTexture,refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DCubeTexture8Impl_SetPriority(LPDIRECT3DCUBETEXTURE8 iface, DWORD PriorityNew) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_SetPriority(This->wineD3DCubeTexture, PriorityNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DCubeTexture_SetPriority(This->wineD3DCubeTexture, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DCubeTexture8Impl_GetPriority(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_GetPriority(This->wineD3DCubeTexture); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DCubeTexture_GetPriority(This->wineD3DCubeTexture); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_GetType(This->wineD3DCubeTexture); + + EnterCriticalSection(&d3d8_cs); + type = IWineD3DCubeTexture_GetType(This->wineD3DCubeTexture); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DCubeTexture8 IDirect3DBaseTexture8 Interface follow: */ static DWORD WINAPI IDirect3DCubeTexture8Impl_SetLOD(LPDIRECT3DCUBETEXTURE8 iface, DWORD LODNew) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + DWORD lod; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_SetLOD(This->wineD3DCubeTexture, LODNew); + + EnterCriticalSection(&d3d8_cs); + lod = IWineD3DCubeTexture_SetLOD(This->wineD3DCubeTexture, LODNew); + LeaveCriticalSection(&d3d8_cs); + return lod; } static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + DWORD lod; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_GetLOD((LPDIRECT3DBASETEXTURE8) This); + + EnterCriticalSection(&d3d8_cs); + lod = IWineD3DCubeTexture_GetLOD((LPDIRECT3DBASETEXTURE8) This); + LeaveCriticalSection(&d3d8_cs); + return lod; } static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLevelCount(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + DWORD cnt; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture); + + EnterCriticalSection(&d3d8_cs); + cnt = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture); + LeaveCriticalSection(&d3d8_cs); + return cnt; } /* IDirect3DCubeTexture8 Interface follow: */ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE8 iface, UINT Level, D3DSURFACE_DESC *pDesc) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; WINED3DSURFACE_DESC wined3ddesc; TRACE("(%p) Relay\n", This); @@ -150,7 +206,10 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXTU wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; - return IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, Level, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, Level, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level, IDirect3DSurface8 **ppCubeMapSurface) { @@ -160,30 +219,47 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUBE TRACE("(%p) Relay\n", This); + EnterCriticalSection(&d3d8_cs); hrc = IWineD3DCubeTexture_GetCubeMapSurface(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, &mySurface); if (hrc == D3D_OK && NULL != ppCubeMapSurface) { IWineD3DCubeTexture_GetParent(mySurface, (IUnknown **)ppCubeMapSurface); IWineD3DCubeTexture_Release(mySurface); } + LeaveCriticalSection(&d3d8_cs); return hrc; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, CONST RECT *pDirtyRect) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, pDirtyRect); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, pDirtyRect); + LeaveCriticalSection(&d3d8_cs); + return hr; }

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3DIndexBuffer8 methods.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 1ec8788b3487340ac527194e4ac16b3179b49d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec8788b3487340ac527194e4… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat May 26 20:09:24 2007 +0200 d3d8: Hold the lock in IDirect3DIndexBuffer8 methods. --- dlls/d3d8/indexbuffer.c | 75 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 65 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index ad92cf4..c4bd833 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -56,7 +56,9 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa TRACE("(%p) : ReleaseRef to %d\n", This, ref); if (ref == 0) { + EnterCriticalSection(&d3d8_cs); IWineD3DIndexBuffer_Release(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } @@ -66,69 +68,122 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa /* IDirect3DIndexBuffer8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + + EnterCriticalSection(&d3d8_cs); + hr = IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_SetPrivateData(This->wineD3DIndexBuffer, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_SetPrivateData(This->wineD3DIndexBuffer, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetPrivateData(This->wineD3DIndexBuffer, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_GetPrivateData(This->wineD3DIndexBuffer, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_FreePrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_FreePrivateData(This->wineD3DIndexBuffer, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_FreePrivateData(This->wineD3DIndexBuffer, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } static DWORD WINAPI IDirect3DIndexBuffer8Impl_SetPriority(LPDIRECT3DINDEXBUFFER8 iface, DWORD PriorityNew) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_SetPriority(This->wineD3DIndexBuffer, PriorityNew); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DIndexBuffer_SetPriority(This->wineD3DIndexBuffer, PriorityNew); + LeaveCriticalSection(&d3d8_cs); + return ret; } static DWORD WINAPI IDirect3DIndexBuffer8Impl_GetPriority(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + DWORD ret; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetPriority(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d8_cs); + ret = IWineD3DIndexBuffer_GetPriority(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); + return ret; } static void WINAPI IDirect3DIndexBuffer8Impl_PreLoad(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) Relay\n", This); + + EnterCriticalSection(&d3d8_cs); IWineD3DIndexBuffer_PreLoad(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); } static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + D3DRESOURCETYPE type; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetType(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d8_cs); + type = IWineD3DIndexBuffer_GetType(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); + return type; } /* IDirect3DIndexBuffer8 Interface follow: */ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Lock(LPDIRECT3DINDEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE **ppbData, DWORD Flags) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Unlock(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 iface, D3DINDEXBUFFER_DESC *pDesc) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DIndexBuffer_GetDesc(This->wineD3DIndexBuffer, (WINED3DINDEXBUFFER_DESC *) pDesc); + LeaveCriticalSection(&d3d8_cs); + return hr; }

1 0

Stefan Dösinger : d3d8: Hold the lock in IDirect3DSurface8 methods.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 34d1beed747f233ac3ba1a964254e9765977c1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d1beed747f233ac3ba1a964… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat May 26 20:24:16 2007 +0200 d3d8: Hold the lock in IDirect3DSurface8 methods. --- dlls/d3d8/surface.c | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 4d2f9b4..6ecd7af 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -76,7 +76,9 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { if (This->parentDevice) IUnknown_Release(This->parentDevice); /* Implicit surfaces are destroyed with the device, not if refcount reaches 0. */ if (!This->isImplicit) { + EnterCriticalSection(&d3d8_cs); IWineD3DSurface_Release(This->wineD3DSurface); + LeaveCriticalSection(&d3d8_cs); HeapFree(GetProcessHeap(), 0, This); } } @@ -88,25 +90,46 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { /* IDirect3DSurface8 IDirect3DResource8 Interface follow: */ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface, IDirect3DDevice8 **ppDevice) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; - return IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + HRESULT hr; + TRACE("(%p)->(%p)\n", This, ppDevice); + + EnterCriticalSection(&d3d8_cs); + hr = IDirect3DResource8Impl_GetDevice((LPDIRECT3DRESOURCE8) This, ppDevice); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_SetPrivateData(This->wineD3DSurface, refguid, pData, SizeOfData, Flags); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DSurface_SetPrivateData(This->wineD3DSurface, refguid, pData, SizeOfData, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_GetPrivateData(This->wineD3DSurface, refguid, pData, pSizeOfData); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DSurface_GetPrivateData(This->wineD3DSurface, refguid, pData, pSizeOfData); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_FreePrivateData(This->wineD3DSurface, refguid); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DSurface_FreePrivateData(This->wineD3DSurface, refguid); + LeaveCriticalSection(&d3d8_cs); + return hr; } /* IDirect3DSurface8 Interface follow: */ @@ -127,6 +150,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 ifac static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFACE_DESC *pDesc) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; + HRESULT hr; TRACE("(%p) Relay\n", This); /* As d3d8 and d3d9 structures differ, pass in ptrs to where data needs to go */ @@ -140,14 +164,19 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3 wined3ddesc.Width = &pDesc->Width; wined3ddesc.Height = &pDesc->Height; - return IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); TRACE("(%p) calling IWineD3DSurface_LockRect %p %p %p %d\n", This, This->wineD3DSurface, pLockedRect, pRect, Flags); + EnterCriticalSection(&d3d8_cs); if (pRect) { D3DSURFACE_DESC desc; IDirect3DSurface8_GetDesc(iface, &desc); @@ -159,17 +188,25 @@ static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D || (pRect->right > desc.Width) || (pRect->bottom > desc.Height)) { WARN("Trying to lock an invalid rectangle, returning D3DERR_INVALIDCALL\n"); + LeaveCriticalSection(&d3d8_cs); return D3DERR_INVALIDCALL; } } - return IWineD3DSurface_LockRect(This->wineD3DSurface, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + hr = IWineD3DSurface_LockRect(This->wineD3DSurface, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); + LeaveCriticalSection(&d3d8_cs); + return hr; } static HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(LPDIRECT3DSURFACE8 iface) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + HRESULT hr; TRACE("(%p) Relay\n", This); - return IWineD3DSurface_UnlockRect(This->wineD3DSurface); + + EnterCriticalSection(&d3d8_cs); + hr = IWineD3DSurface_UnlockRect(This->wineD3DSurface); + LeaveCriticalSection(&d3d8_cs); + return hr; } const IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl =

1 0

Stefan Dösinger : wined3d: Do not set the dynlock flag on all created surfaces.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: d88fe525646db850dfd15db565f77fcbb7e6ac7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88fe525646db850dfd15db56… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat May 26 19:45:02 2007 +0200 wined3d: Do not set the dynlock flag on all created surfaces. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f3bf509..d81ea0b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -704,7 +704,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U object->pow2Height = pow2Height; /* Flags */ - object->Flags = SFLAG_DYNLOCK; + object->Flags = 0; object->Flags |= (pow2Width != Width || pow2Height != Height) ? SFLAG_NONPOW2 : 0; object->Flags |= Discard ? SFLAG_DISCARD : 0; object->Flags |= (WINED3DFMT_D16_LOCKABLE == Format) ? SFLAG_LOCKABLE : 0;

1 0

Jacek Caban : mshtml: Don't crash in set_font_size if range_cnt is 0.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 068ce61523e74f0c1e9540ace5148af7ff97def4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068ce61523e74f0c1e9540ace… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:31:12 2007 +0200 mshtml: Don't crash in set_font_size if range_cnt is 0. --- dlls/mshtml/editor.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index d257c5f..b727e55 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -364,6 +364,15 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) if(!nsselection) return; + nsISelection_GetRangeCount(nsselection, &range_cnt); + if(range_cnt != 1) { + FIXME("range_cnt %d not supprted\n", range_cnt); + if(!range_cnt) { + nsISelection_Release(nsselection); + return; + } + } + nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); if(NS_FAILED(nsres)) return; @@ -372,10 +381,6 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsAString_Init(&size_str, wszSize); nsAString_Init(&val_str, size); - nsISelection_GetRangeCount(nsselection, &range_cnt); - if(range_cnt != 1) - FIXME("range_cnt %d not supprted\n", range_cnt); - nsIDOMDocument_CreateElement(nsdoc, &font_str, &elem); nsIDOMElement_SetAttribute(elem, &size_str, &val_str);

1 0

Jacek Caban : mshtml: Added get_URL implementation.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: b95197ac1990ec90b083acfa7e0510021670e16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b95197ac1990ec90b083acfa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 11 17:37:20 2007 +0200 mshtml: Added get_URL implementation. --- dlls/mshtml/htmldoc.c | 11 +++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 23 ++++++++++++++++++++--- dlls/mshtml/tests/htmldoc.c | 27 +++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ba57e3e..a606dac 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -508,8 +508,15 @@ static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) { - FIXME("(%p)->(%p)\n", iface, p); - return E_NOTIMPL; + HTMLDocument *This = HTMLDOC_THIS(iface); + + static const WCHAR about_blank_url[] = + {'a','b','o','u','t',':','b','l','a','n','k',0}; + + TRACE("(%p)->(%p)\n", iface, p); + + *p = SysAllocString(This->url ? This->url : about_blank_url); + return S_OK; } static HRESULT WINAPI HTMLDocument_put_domain(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b9f5d61..5623736 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -102,6 +102,7 @@ struct HTMLDocument { BSCallback *bscallback; IMoniker *mon; + BSTR url; HWND hwnd; HWND tooltips_hwnd; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index f933b73..58ca422 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -115,11 +115,27 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx) void set_current_mon(HTMLDocument *This, IMoniker *mon) { - if(This->mon) + HRESULT hres; + + if(This->mon) { IMoniker_Release(This->mon); - if(mon) - IMoniker_AddRef(mon); + This->mon = NULL; + } + + if(This->url) { + SysFreeString(This->url); + This->url = NULL; + } + + if(!mon) + return; + + IMoniker_AddRef(mon); This->mon = mon; + + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); + if(FAILED(hres)) + WARN("GetDisplayName failed: %08x\n", hres); } static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL *bind_complete) @@ -674,4 +690,5 @@ void HTMLDocument_Persist_Init(HTMLDocument *This) This->bscallback = NULL; This->mon = NULL; + This->url = NULL; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index af5d7a4..619d36e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2189,8 +2189,10 @@ static void test_ConnectionPointContainer(IUnknown *unk) static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl) { + IHTMLDocument2 *doc; IPersistMoniker *permon; IMoniker *mon = (void*)0xdeadbeef; + BSTR doc_url = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IPersistMoniker, (void**)&permon); @@ -2198,12 +2200,32 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl) if(FAILED(hres)) return; + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); + ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument2) failed: %08x\n", hres); + + hres = IHTMLDocument2_get_URL(doc, &doc_url); + ok(hres == S_OK, "get_URL failed: %08x\n", hres); + hres = IPersistMoniker_GetCurMoniker(permon, &mon); IPersistMoniker_Release(permon); if(exmon) { + BSTR url; + BOOL exb = expect_GetDisplayName; + BOOL clb = called_GetDisplayName; + ok(hres == S_OK, "GetCurrentMoniker failed: %08x\n", hres); ok(mon == exmon, "mon(%p) != exmon(%p)\n", mon, exmon); + + SET_EXPECT(GetDisplayName); + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); + ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); + CHECK_CALLED(GetDisplayName); + expect_GetDisplayName = exb; + called_GetDisplayName = clb; + + SysFreeString(url); + ok(!lstrcmpW(url, doc_url), "url != doc_url\n"); }else if(exurl) { BSTR url; @@ -2213,13 +2235,18 @@ static void test_GetCurMoniker(IUnknown *unk, IMoniker *exmon, LPCWSTR exurl) ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); ok(!lstrcmpW(url, exurl), "unexpected url\n"); + ok(!lstrcmpW(url, doc_url), "url != doc_url\n"); + SysFreeString(url); }else { ok(hres == E_UNEXPECTED, "GetCurrentMoniker failed: %08x, expected E_UNEXPECTED\n", hres); ok(mon == (IMoniker*)0xdeadbeef, "mon=%p\n", mon); + ok(!lstrcmpW(doc_url, about_blank_url), "doc_url is not about:blank\n"); } + SysFreeString(doc_url); + IHTMLDocument_Release(doc); if(mon && mon != (void*)0xdeadbeef) IMoniker_Release(mon); }

1 0

Dan Hipschman : widl: Simplify correlation descriptor code.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 88c812870430b7031c620d91c974dd5e64e8b687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c812870430b7031c620d91c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Jun 11 18:51:41 2007 -0700 widl: Simplify correlation descriptor code. --- dlls/rpcrt4/tests/server.c | 24 ++++ dlls/rpcrt4/tests/server.idl | 9 ++ tools/widl/parser.y | 1 - tools/widl/typegen.c | 240 ++++++++++++++++++------------------------ tools/widl/widltypes.h | 1 - 5 files changed, 136 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88c812870430b7031c620…

1 0