wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Rob Shearman : include: Fix a typo in a level of indirection in tom.idl.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0120c1a58215883d07e2c278876abb17ae357072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0120c1a58215883d07e2c2788… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:55:51 2008 +0100 include: Fix a typo in a level of indirection in tom.idl. The parameter for ITextPara::GetDuplicate should have two levels of indirection. --- include/tom.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index f4dd2f0..28a71a7 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -368,7 +368,7 @@ interface ITextFont : IDispatch ] interface ITextPara : IDispatch { - HRESULT GetDuplicate([retval, out]ITextPara *ppPara); + HRESULT GetDuplicate([retval, out]ITextPara **ppPara); HRESULT SetDuplicate([in]ITextPara *pPara); HRESULT CanChange([out]long *pB); HRESULT IsEqual([in]ITextPara *pPara, [retval, out]long *pB);

1 0

Rob Shearman : include: The unique attribute doesn' t make any sense in the interface header, so remove it.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f86ace9067289ce867e44e4e71ee2b543f5f25e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86ace9067289ce867e44e4e7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:55:25 2008 +0100 include: The unique attribute doesn't make any sense in the interface header, so remove it. It is only accepted by MIDL as a synonym for pointer_default(unique), but it isn't a synonym in widl so remove it. --- include/indexsrv.idl | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/include/indexsrv.idl b/include/indexsrv.idl index 85e4e66..397e691 100644 --- a/include/indexsrv.idl +++ b/include/indexsrv.idl @@ -50,7 +50,6 @@ typedef enum tagWORDREP_BREAK_TYPE * IWordSink interface */ [ - unique, uuid(cc907054-c058-101a-b554-08002b33b0e6), object, local @@ -77,7 +76,6 @@ interface IWordSink : IUnknown * IPhraseSink interface */ [ - unique, uuid(cc906ff0-c058-101a-b554-08002b33b0e6), object, local @@ -99,7 +97,6 @@ interface IPhraseSink: IUnknown * IWordBreaker interface */ [ - unique, uuid(d53552c8-77e3-101a-b552-08002b33b0e6), object, local

1 0

Alexandre Julliard : winex11: Fix the type hint for the desktop window.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 18f4fb98836eb615a46efabf20945e59339520ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f4fb98836eb615a46efabf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 13:27:38 2008 +0200 winex11: Fix the type hint for the desktop window. --- dlls/winex11.drv/window.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a1477c0..ab63f3b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -829,16 +829,22 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) Window group_leader; Atom window_type; MwmHints mwm_hints; - DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); - DWORD ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - HWND owner = GetWindow( data->hwnd, GW_OWNER ); + DWORD style, ex_style; + HWND owner; if (data->hwnd == GetDesktopWindow()) { /* force some styles for the desktop to get the correct decorations */ - style |= WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + style = WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + ex_style = WS_EX_APPWINDOW; owner = 0; } + else + { + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + owner = GetWindow( data->hwnd, GW_OWNER ); + } /* transient for hint */ if (owner)

1 0

Alexandre Julliard : winex11: Make WS_EX_APPWINDOW windows have normal type .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 9bf9c0b7ec6d4475962e6c739ca2f83a7a11fda7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf9c0b7ec6d4475962e6c739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 13:27:19 2008 +0200 winex11: Make WS_EX_APPWINDOW windows have normal type. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7cbd102..a1477c0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -857,13 +857,14 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) set_size_hints( display, data, style ); /* set the WM_WINDOW_TYPE */ - window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); #if 0 /* many window managers don't handle utility windows very well */ else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); #endif + else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0

Alexandre Julliard : winex11: Don' t set full screen style on minimized windows.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 8577358ef54cce8a35c25f1d3c6d766cb9301f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8577358ef54cce8a35c25f1d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 13:26:38 2008 +0200 winex11: Don't set full screen style on minimized windows. --- dlls/winex11.drv/winpos.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index b12ded1..f6b75d6 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -136,7 +136,7 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); - else + else if (!(style & WS_MINIMIZE)) new_state |= (1 << NET_WM_STATE_FULLSCREEN); } else if (style & WS_MAXIMIZE)

1 0

Kai Blin : dpnhpast: Implement a stub for DirectPlayNATHelpCreate.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: ab62cd360f611ea2cc806acee044a7ea25773fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab62cd360f611ea2cc806acee… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Apr 12 21:13:59 2008 +0200 dpnhpast: Implement a stub for DirectPlayNATHelpCreate. --- dlls/dpnhpast/dpnhpast.spec | 2 +- dlls/dpnhpast/main.c | 7 +++---- include/dpnathlp.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dpnhpast/dpnhpast.spec b/dlls/dpnhpast/dpnhpast.spec index 67fb171..ea61468 100644 --- a/dlls/dpnhpast/dpnhpast.spec +++ b/dlls/dpnhpast/dpnhpast.spec @@ -1,4 +1,4 @@ -1 stub DirectPlayNATHelpCreate +1 stdcall DirectPlayNATHelpCreate(ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 6ec2e6f..74427ba 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -55,12 +55,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) * * */ -#if 0 -HRESULT WINAPI DPNHPAST_DirectPlayNATHelpCreate(void) +HRESULT WINAPI DirectPlayNATHelpCreate(LPCGUID pIID, PVOID *ppvInterface) { - /* @stub in .spec */ + TRACE("(%p, %p) stub\n", pIID, ppvInterface); + return E_NOTIMPL; } -#endif /****************************************************************** diff --git a/include/dpnathlp.h b/include/dpnathlp.h index 68c0456..c1fa3c9 100644 --- a/include/dpnathlp.h +++ b/include/dpnathlp.h @@ -23,7 +23,7 @@ extern "C" { #endif -HRESULT DirectPlayNATHelpCreate(const PGUID pIID, void ** ppvInterface); +HRESULT DirectPlayNATHelpCreate(LPCGUID pIID, LPVOID *ppvInterface); DEFINE_GUID(CLSID_DirectPlayNATHelpUPnP, 0xb9c2e9c4,0x68c1,0x4d42,0xa7,0xa1,0xe7,0x6a,0x26,0x98,0x2a,0xd6); DEFINE_GUID(CLSID_DirectPlayNATHelpPAST, 0x963ab779,0x16a1,0x477c,0xa3,0x6d,0xcb,0x5e,0x71,0x19,0x38,0xf7);

1 0

Rok Mandeljc : shell32: Updated Slovenian translation to reflect changes in About dialog.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a2a8d1ad19d4920aff0c034458aab87a7a707984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a8d1ad19d4920aff0c03445… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:53 2008 +0200 shell32: Updated Slovenian translation to reflect changes in About dialog. --- dlls/shell32/shell32_Si.rc | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index d10ab6b..af7e5f2 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -138,17 +138,19 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "V redu", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "V redu", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "&Licenčna pog.", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine smo ustvarili:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 + LTEXT "Različica Wine: %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine smo ustvarili:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -250,4 +252,22 @@ STRINGTABLE IDS_NEWFOLDER "Nova mapa" } +STRINGTABLE +{ + IDS_LICENSE_CAPTION, "Licenčna pogodba za Wine" +IDS_LICENSE, +"Wine is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\n\ +Wine is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." +} + + #pragma code_page(default)

1 0

Rok Mandeljc : winecfg: Update Slovenian translation to reflect recently introduced changes.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 7445e90b7ad1f0a5a74a4934e8082335b826025a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7445e90b7ad1f0a5a74a4934e… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:57 2008 +0200 winecfg: Update Slovenian translation to reflect recently introduced changes. --- programs/winecfg/Si.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index f560760..59df1e8 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -64,7 +64,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Nastavitve oken ",IDC_STATIC,8,4,244,184 - CONTROL "Dovoli DirectX programom, da preprečijo &miški zapuščanje njihovega okna",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Dovoli DirectX programom, da preprečijo &miški zapuščanje okna",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + + CONTROL "Dovoli upravljalniku oken, da okra&si okna",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 CONTROL "Dovoli upravljalniku &oken, da upravlja z Wine-ovimi okni",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Če z Wine-ovimi okni upravlja upravljalnik oken, so robovi, obnašanje in ostale nastavitve le-teh enake, kot za ostala okna vašega namizja, kar omogoča boljšo združitev z vašim namizjem.\n\nV nasprotnem primeru okna ne bodo tako tesno povezana z vašim namizjem, kar pa v nekaterih primerih omogoča pravilnejšo emulacijo in izboljša delovanje nekaterih programoh.",

1 0

Rok Mandeljc : comdlg32: Fix a mistake in Slovenian translation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 202cbcc11b96483c85b7e383293c4a954c09d722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202cbcc11b96483c85b7e3832… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:52 2008 +0200 comdlg32: Fix a mistake in Slovenian translation. --- dlls/comdlg32/cdlg_Si.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Si.rc b/dlls/comdlg32/cdlg_Si.rc index dfd7e0a..66dc0d7 100644 --- a/dlls/comdlg32/cdlg_Si.rc +++ b/dlls/comdlg32/cdlg_Si.rc @@ -256,10 +256,10 @@ FONT 8, "MS Shell Dlg" CONTROL "&Vse", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,30,12 CONTROL "St&rani", rad3,"Button",BS_AUTORADIOBUTTON,16,122,30,12 CONTROL "I&zbor", rad2,"Button",BS_AUTORADIOBUTTON,16,138,30,12 - EDITTEXT edt1, 64,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt1, 66,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 108,122, 26,12, WS_GROUP | ES_NUMBER - LTEXT "&od:", stc2, 52,124, 10,8 - LTEXT "&do:", stc3, 94,124, 10,8 + RTEXT "&od:", stc2, 52,124, 12,8 + RTEXT "&do:", stc3, 94,124, 12,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178

1 0

Rok Mandeljc : winmm: Slovenian translation: Add a string that got lost during last update.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f261e6db4d6befa5893600199c6cac3acd23fe94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f261e6db4d6befa5893600199… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:54 2008 +0200 winmm: Slovenian translation: Add a string that got lost during last update. --- dlls/winmm/winmm_Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winmm_Si.rc b/dlls/winmm/winmm_Si.rc index 1146e74..c4c11d0 100644 --- a/dlls/winmm/winmm_Si.rc +++ b/dlls/winmm/winmm_Si.rc @@ -50,6 +50,7 @@ MIDIERR_NODEVICE, "Trenutna nastavitev MIDI se sklicuje na MIDI napravo, ki ni MIDIERR_INVALIDSETUP, "Trenutna nastavitev MIDI je pošodovana. Namestite originalno datoteko MIDIMAP.CFG v sistemsko mapo Oken in poskusite znova." /* MCI errors */ +MCIERR_INVALID_DEVICE_ID, "Neveljaven ID MCI naprave. Uporabite ID, ki ga vrne odpiranje MCI naprave." MCIERR_UNRECOGNIZED_KEYWORD, "Naveden parameter ukaza ni definiran v naboru MCI ukazov." MCIERR_UNRECOGNIZED_COMMAND, "Naveden ukaz je neveljaven MCI ukaz." MCIERR_HARDWARE, "Z večpredstavnostno napravo so težave. Preverite, ali naprava deluje pravilno ali pa se posvetujte z izdelovalcem."

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008