May 2008 - Wine-Commits - list.winehq.org

Vitaliy Margolen : dmime: Update dx version to 9.0c.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 6d678fcfc2359742912d1ea43ffe96edd17191c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d678fcfc2359742912d1ea43… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun May 11 13:34:17 2008 -0600 dmime: Update dx version to 9.0c. --- dlls/dmime/version.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/version.rc b/dlls/dmime/version.rc index 097a0b0..a94996f 100644 --- a/dlls/dmime/version.rc +++ b/dlls/dmime/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine DirectMusic Interactive Engine" #define WINE_FILENAME_STR "dmime.dll" -#define WINE_FILEVERSION 5,3,0,900 -#define WINE_FILEVERSION_STR "5.3.0.900" -#define WINE_PRODUCTVERSION 5,3,0,900 -#define WINE_PRODUCTVERSION_STR "5.3" +#define WINE_FILEVERSION 5,3,1,904 +#define WINE_FILEVERSION_STR "5.3.1.904" +#define WINE_PRODUCTVERSION 5,3,1,904 +#define WINE_PRODUCTVERSION_STR "5.3.1.904" #include "wine/wine_common_ver.rc"

1 0

Jens Albretsen : winhelp: Danish translation additions, fixes.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 94daf32000dea8edee842dc66bb2b1319910e95f URL: http://source.winehq.org/git/wine.git/?a=commit;h=94daf32000dea8edee842dc66… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 11 21:30:53 2008 +0200 winhelp: Danish translation additions, fixes. --- programs/winhelp/Da.rc | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/winhelp/Da.rc b/programs/winhelp/Da.rc index 7f713a6..77569cd 100644 --- a/programs/winhelp/Da.rc +++ b/programs/winhelp/Da.rc @@ -3,6 +3,7 @@ * * Copyright 1997 Henrik Olsen * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * Copyright 2008 Jens Albretsen<jens(a)albretsen.dk> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,7 +25,7 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT { POPUP "&Filer" { - MENUITEM "�&bn...", MNID_FILE_OPEN + MENUITEM "�&ben...", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&Udskriv emne", MNID_FILE_PRINT MENUITEM "&Indstil printer", MNID_FILE_SETUP @@ -43,16 +44,24 @@ MAIN_MENU MENU LANGUAGE LANG_DANISH, SUBLANG_DEFAULT MENUITEM "&Brug af Hj�lp", MNID_HELP_HELPON MENUITEM "Altid &�verst", MNID_HELP_HELPTOP MENUITEM SEPARATOR - MENUITEM "&Info...", MNID_HELP_ABOUT + MENUITEM "&Information...", MNID_HELP_ABOUT #ifdef WINELIB MENUITEM "Om &WINE", MNID_HELP_WINE #endif } } +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Index" +{ + LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_BORDER + PUSHBUTTON "&OK", IDOK, 40, 170, 50, 12 + PUSHBUTTON "&Annuller", IDCANCEL, 120, 170, 50, 12 +} /* Strings */ - STRINGTABLE DISCARDABLE LANGUAGE LANG_DANISH, SUBLANG_DEFAULT { STID_WINE_HELP, "WINE Hj�lp" @@ -65,9 +74,9 @@ STID_CONTENTS, "&Indhold" STID_SEARCH, "&S�g" STID_BACK, "&Tilbage" STID_HISTORY, "&Oversigt" -STID_TOPICS, "To&pics" +STID_TOPICS, "&Emner" STID_ALL_FILES, "Alle filer (*.*)" STID_HELP_FILES_HLP, "Hj�lpe filer (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" -STID_NO_RICHEDIT "Cannot find a richedit implementation... Aborting" +STID_FILE_NOT_FOUND_s "Kan ikke finde '%s'. Vil du selv finde filen?" +STID_NO_RICHEDIT "Kan ikke finde en 'richedit' implementering... Afbryder" }

1 0

Jens Albretsen : user32: Danish spelling fixes.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 2bae809881a2ef214dc743a3bb1722b829fba2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bae809881a2ef214dc743a3b… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 11 08:48:28 2008 +0200 user32: Danish spelling fixes. --- dlls/user32/resources/user32_Da.rc | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/user32/resources/user32_Da.rc b/dlls/user32/resources/user32_Da.rc index bff194f..fb7c3d7 100644 --- a/dlls/user32/resources/user32_Da.rc +++ b/dlls/user32/resources/user32_Da.rc @@ -1,5 +1,6 @@ /* * Copyright 1995 Morten Welinder + * Copyright 2008 Jens Albretsen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,10 +42,10 @@ EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE MENUITEM SEPARATOR MENUITEM "&Klip", WM_CUT MENUITEM "K&opier", WM_COPY - MENUITEM "S�t &ind", WM_PASTE + MENUITEM "&Inds�t", WM_PASTE MENUITEM "&Slet", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "V�lg &Alt", EM_SETSEL + MENUITEM "Marker &Alt", EM_SETSEL END } @@ -60,7 +61,24 @@ BEGIN PUSHBUTTON "&Ignorer", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Nej", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Pr�v igen", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Forts�t", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "V�lg vindue" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */ + DEFPUSHBUTTON "OK", IDOK, 75, 100, 35, 14 + PUSHBUTTON "Annuller", IDCANCEL, 120, 100, 35, 14 +END + + +STRINGTABLE DISCARDABLE +{ + IDS_ERROR "Fejl" + IDS_MDI_MOREWINDOWS "&Flere vinduer..." +}

1 0

Dmitry Timoshkov : user32: Make sure that we send proper notifications in all cases.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 939c7f9c6b42137fccb6ff16c628972b6e1270d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=939c7f9c6b42137fccb6ff16c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat May 10 13:08:43 2008 +0900 user32: Make sure that we send proper notifications in all cases. --- dlls/user32/mdi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 60297b0..0594b55 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -570,7 +570,8 @@ static LRESULT MDIDestroyChild( HWND client, MDICLIENTINFO *ci, ci->hwndChildMaximized = 0; MDI_UpdateFrameText(frame, client, TRUE, NULL); } - if (flagDestroy) ci->hwndActiveChild = 0; + if (flagDestroy) + MDI_ChildActivate(client, 0); } }

1 0

Maarten Lankhorst : quartz: Don' t return a pin in filesource when there is none.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: c83a63d4b678f9d54ef2bb2560e8b390ff4cb61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83a63d4b678f9d54ef2bb256… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 9 15:15:07 2008 -0700 quartz: Don't return a pin in filesource when there is none. Based on a patch by Olivier Samyn. --- dlls/quartz/filesource.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f410b56..ffb5bce 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -529,7 +529,7 @@ static HRESULT AsyncReader_GetPin(IBaseFilter *iface, ULONG pos, IPin **pin, DWO /* Our pins are almost static, not changing so setting static tick count is ok */ *lastsynctick = This->lastpinchange; - if (pos >= 1) + if (pos >= 1 || !This->pOutputPin) return S_FALSE; *pin = (IPin *)This->pOutputPin;

1 0

Andrew Talbot : qmgr: Memory allocation size fix.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 801c9698848705bf0b0fabb7bd68b8bb48c11094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=801c9698848705bf0b0fabb7b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 10 16:25:29 2008 +0100 qmgr: Memory allocation size fix. --- dlls/qmgr/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 84cd30c..1ca1bf3 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -355,7 +355,7 @@ static const IBindStatusCallbackVtbl DLBindStatusCallback_Vtbl = static DLBindStatusCallback *DLBindStatusCallbackConstructor( BackgroundCopyFileImpl *file) { - DLBindStatusCallback *This = HeapAlloc(GetProcessHeap(), 0, sizeof This); + DLBindStatusCallback *This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) return NULL;

1 0

Jens Albretsen : wineps.drv: Danish spelling fixes.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 52be871d8cd80c9af3cb90b44c4272e49c6691d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52be871d8cd80c9af3cb90b44… Author: Jens Albretsen <jens(a)albretsen.dk> Date: Sun May 11 08:47:27 2008 +0200 wineps.drv: Danish spelling fixes. --- dlls/wineps.drv/wps_Da.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/wps_Da.rc b/dlls/wineps.drv/wps_Da.rc index 0b54ca5..1fa6a58 100644 --- a/dlls/wineps.drv/wps_Da.rc +++ b/dlls/wineps.drv/wps_Da.rc @@ -27,9 +27,9 @@ FONT 8, "MS Shell Dlg" LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Retning", -1, 10, 80, 200, 50 - CONTROL "&St�ende", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + CONTROL "&Portr�t", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 90, 60, 10 - CONTROL "&Liggende", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + CONTROL "&Landskab", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, 20, 110, 60, 10 LTEXT "Retninger:", IDD_DUPLEX_NAME, 10, 140, 100, 8 COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS |

1 0

Dmitry Timoshkov : shell32: Fix calling convention of LPFNOFN, don' t use static buffers.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: ca3b8741b5ea454bd14ad488d603a06201c1bcfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3b8741b5ea454bd14ad488d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat May 10 13:09:12 2008 +0900 shell32: Fix calling convention of LPFNOFN, don't use static buffers. --- dlls/shell32/dialogs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 6c5db44..fd401b5 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -49,7 +49,7 @@ typedef struct UINT uFlags ; } RUNFILEDLGPARAMS ; -typedef BOOL (*LPFNOFN) (OPENFILENAMEA *) ; +typedef BOOL (*WINAPI LPFNOFN) (OPENFILENAMEA *) ; WINE_DEFAULT_DEBUG_CHANNEL(shell); static INT_PTR CALLBACK RunDlgProc (HWND, UINT, WPARAM, LPARAM) ; @@ -178,8 +178,8 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR { HMODULE hComdlg = NULL ; LPFNOFN ofnProc = NULL ; - static char szFName[1024] = "", szFileTitle[256] = "", szInitDir[768] = "" ; - static OPENFILENAMEA ofn = + char szFName[1024] = "", szFileTitle[256] = "", szInitDir[768] = "" ; + OPENFILENAMEA ofn = { sizeof (OPENFILENAMEA), NULL, @@ -211,7 +211,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR return TRUE ; } - if ((LPFNOFN)NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameA"))) + if (NULL == (ofnProc = (LPFNOFN)GetProcAddress (hComdlg, "GetOpenFileNameA"))) { MessageBoxA (hwnd, "Unable to display dialog box (GetProcAddress) !", "Nix", MB_OK | MB_ICONEXCLAMATION) ; return TRUE ;

1 0

Michael Stefaniuc : shdocvw: Plug memory leak introduced in 1.0-rc1 (Smatch ).
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 38cae0b2c49a10873d9fab0e82e23dcb3ad7e354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38cae0b2c49a10873d9fab0e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat May 10 01:30:05 2008 +0200 shdocvw: Plug memory leak introduced in 1.0-rc1 (Smatch). --- dlls/shdocvw/factory.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 69cbaa3..85b59db 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -293,6 +293,7 @@ static BOOL check_native_ie(void) { static const WCHAR cszPath[] = {'b','r','o','w','s','e','u','i','.','d','l','l',0}; DWORD handle,size; + BOOL ret = TRUE; size = GetFileVersionInfoSizeW(cszPath,&handle); if (size) @@ -308,10 +309,12 @@ static BOOL check_native_ie(void) if (VerQueryValueW(buf, cszFD, (LPVOID*)&lpFileDescription, &dwBytes) && strstrW(lpFileDescription,cszWine)) - return FALSE; + ret = FALSE; + + HeapFree(GetProcessHeap(), 0, buf); } - return TRUE; + return ret; } DWORD register_iexplore(BOOL doregister)

1 0

Andrew Talbot : dsound: Memory allocation sizes fix.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 7b3ab79710d932e316da7fa6752c906f5a4d3b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3ab79710d932e316da7fa67… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 10 16:25:26 2008 +0100 dsound: Memory allocation sizes fix. --- dlls/dsound/buffer.c | 2 +- dlls/dsound/capture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 108636a..480e8a1 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -154,7 +154,7 @@ static HRESULT IDirectSoundNotifyImpl_Create( IDirectSoundNotifyImpl * dsn; TRACE("(%p,%p)\n",dsb,pdsn); - dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dsn)); + dsn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dsn)); if (dsn == NULL) { WARN("out of memory\n"); diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index a7977d6..f445b4f 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -748,7 +748,7 @@ static HRESULT IDirectSoundCaptureNotifyImpl_Create( IDirectSoundCaptureNotifyImpl * dscn; TRACE("(%p,%p)\n",dscb,pdscn); - dscn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dscn)); + dscn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dscn)); if (dscn == NULL) { WARN("out of memory\n");

1 0