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

Paul Vriens : ole32/tests: Prevent a crash.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: dae64e67fc9b1bf1b1950b86f7d58184a4b4c942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dae64e67fc9b1bf1b1950b86f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri May 30 09:56:47 2008 +0200 ole32/tests: Prevent a crash. --- dlls/ole32/tests/compobj.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 24d790a..b2aaa22 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -944,7 +944,9 @@ static void test_CoFreeUnusedLibraries(void) ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n"); - IUnknown_Release(pUnk); + ok(pUnk != NULL, "Expected a valid pointer\n"); + if (pUnk) + IUnknown_Release(pUnk); ok(is_module_loaded("urlmon.dll"), "urlmon.dll should be loaded\n");

1 0

Michael Karcher : dsound: Fix double free in dsound capture.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 84fd6e629a05a87cf788cff8bf009fbc94a269e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fd6e629a05a87cf788cff8b… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Fri May 30 09:34:45 2008 +0200 dsound: Fix double free in dsound capture. --- dlls/dsound/capture.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index f445b4f..c9444a4 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -860,6 +860,12 @@ IDirectSoundCaptureBufferImpl_Release( LPDIRECTSOUNDCAPTUREBUFFER8 iface ) if (This->notify) IDirectSoundNotify_Release((LPDIRECTSOUNDNOTIFY)This->notify); + /* If driver manages its own buffer, IDsCaptureDriverBuffer_Release + should have freed the buffer. Prevent freeing it again in + IDirectSoundCaptureBufferImpl_Create */ + if (!(This->device->drvdesc.dwFlags & DSDDESC_USESYSTEMMEMORY)) + This->device->buffer = NULL; + HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree( GetProcessHeap(), 0, This ); TRACE("(%p) released\n", This);

1 0

Vitaly Lipatov : wine.inf: Create default spool dir.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 9dc3ecb9e3c3f1b4d3e811d3f4191a3d7e54017d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc3ecb9e3c3f1b4d3e811d3f… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Thu May 29 21:15:24 2008 +0400 wine.inf: Create default spool dir. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 694ed94..251f706 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2225,6 +2225,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,system, 10,temp, 11,spool\drivers\color, +11,spool\printers, 10,,explorer.exe 10,,hh.exe 10,,notepad.exe

1 0

Alexandre Julliard : include: Use WINE_NO_UNICODE_MACROS instead of __WINESRC__ where appropriate.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: a2ba7dcf7b6dd0ddc3571c4f034510f6060aa5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2ba7dcf7b6dd0ddc3571c4f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 30 10:02:42 2008 +0200 include: Use WINE_NO_UNICODE_MACROS instead of __WINESRC__ where appropriate. --- include/dbt.h | 6 +++--- include/dxdiag.h | 2 +- include/mapidefs.h | 2 +- include/msiquery.h | 2 +- include/setupapi.h | 6 +++--- include/shlwapi.h | 2 +- include/winbase.h | 3 +-- include/winnt.h | 4 ++-- include/winuser.h | 3 +-- 9 files changed, 14 insertions(+), 16 deletions(-) diff --git a/include/dbt.h b/include/dbt.h index 7ae8498..0110e6c 100644 --- a/include/dbt.h +++ b/include/dbt.h @@ -20,11 +20,11 @@ #define __WINE_DBT_H /* dbt.h doesn't use the normal convention, it adds an underscore before A/W */ -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_DBT_TYPE_AW(type) /* nothing */ -#else /* __WINESRC__ */ +#else # define DECL_WINELIB_DBT_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; -#endif /* __WINESRC__ */ +#endif #define DBT_NO_DISK_SPACE 0x0047 #define DBT_LOW_DISK_SPACE 0x0048 diff --git a/include/dxdiag.h b/include/dxdiag.h index f080ec8..47cd36e 100644 --- a/include/dxdiag.h +++ b/include/dxdiag.h @@ -67,7 +67,7 @@ typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER; /***************************************************************************** * IDxDiagContainer interface */ -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS #undef GetProp #endif diff --git a/include/mapidefs.h b/include/mapidefs.h index 4f7cbd4..2744427 100644 --- a/include/mapidefs.h +++ b/include/mapidefs.h @@ -218,7 +218,7 @@ typedef struct _MAPIUID #define MVI_FLAG (MV_FLAG|MV_INSTANCE) #define MVI_PROP(t) ((t)|MVI_FLAG) -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS # ifdef UNICODE # define PT_TSTRING PT_UNICODE # define PT_MV_TSTRING (MV_FLAG|PT_UNICODE) diff --git a/include/msiquery.h b/include/msiquery.h index 1c52a76..1358033 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -61,7 +61,7 @@ typedef enum tagMSIMODIFY MSIMODIFY_VALIDATE_DELETE = 11 } MSIMODIFY; -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS #define MSIDBOPEN_READONLY (LPCTSTR)0 #define MSIDBOPEN_TRANSACT (LPCTSTR)1 #define MSIDBOPEN_DIRECT (LPCTSTR)2 diff --git a/include/setupapi.h b/include/setupapi.h index 927de6b..cb680d2 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -27,11 +27,11 @@ extern "C" { #endif /* setupapi doesn't use the normal convention, it adds an underscore before A/W */ -#ifdef __WINESRC__ +#ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_SETUPAPI_TYPE_AW(type) /* nothing */ -#else /* __WINESRC__ */ +#else # define DECL_WINELIB_SETUPAPI_TYPE_AW(type) typedef WINELIB_NAME_AW(type##_) type; -#endif /* __WINESRC__ */ +#endif #ifdef __cplusplus extern "C" { diff --git a/include/shlwapi.h b/include/shlwapi.h index 94d98c8..e4100fc 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -782,7 +782,7 @@ LPSTR WINAPI StrFormatByteSizeA (DWORD,LPSTR,UINT); /* A/W Pairing is broken for this function */ LPSTR WINAPI StrFormatByteSize64A (LONGLONG,LPSTR,UINT); LPWSTR WINAPI StrFormatByteSizeW (LONGLONG,LPWSTR,UINT); -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS #ifdef UNICODE #define StrFormatByteSize StrFormatByteSizeW #else diff --git a/include/winbase.h b/include/winbase.h index 03e3bbc..433b985 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -467,8 +467,7 @@ typedef struct _PROCESS_HEAP_ENTRY #define INVALID_ATOM ((ATOM)0) #define MAXINTATOM 0xc000 -#ifdef __WINESRC__ -/* force using a cast when inside Wine */ +#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */ #define MAKEINTATOM(atom) ((ULONG_PTR)((WORD)(atom))) #else #define MAKEINTATOM(atom) ((LPTSTR)((ULONG_PTR)((WORD)(atom)))) diff --git a/include/winnt.h b/include/winnt.h index 9d6e05d..7085363 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -385,7 +385,7 @@ typedef const WCHAR *PCWSTR, *LPCWSTR; * the emulator. The reason is they depend on the UNICODE * macro which only exists in the user's code. */ -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS # ifdef UNICODE # ifndef _TCHAR_DEFINED typedef WCHAR TCHAR, *PTCHAR; @@ -404,7 +404,7 @@ typedef LPCSTR PCTSTR, LPCTSTR; # define __TEXT(string) string # endif /* UNICODE */ # define TEXT(quote) __TEXT(quote) -#endif /* __WINESRC__ */ +#endif /* WINE_NO_UNICODE_MACROS */ /* Misc common WIN32 types */ typedef char CCHAR; diff --git a/include/winuser.h b/include/winuser.h index 366ab9f..c569f31 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -652,8 +652,7 @@ typedef struct tagWINDOWPLACEMENT #define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i))) #define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i))) -#ifdef __WINESRC__ -/* force using a cast when inside Wine */ +#ifdef WINE_NO_UNICODE_MACROS /* force using a cast */ #define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i))) #else #define MAKEINTRESOURCE WINELIB_NAME_AW(MAKEINTRESOURCE)

1 0

Dmitry Timoshkov : user32: CBT hook doesn't send window messages.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: e6d9fc65a2c588c2a59fce6647d17d0b948f6067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d9fc65a2c588c2a59fce664… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 30 11:57:58 2008 +0900 user32: CBT hook doesn't send window messages. --- dlls/user32/tests/msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f68f73a..f87d101 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -316,12 +316,12 @@ static const struct message WmSwitchNotMaximizedChild[] = { /* Activate 2nd MDI child */ { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE}, /* in the 2nd MDI child */ { WM_NCACTIVATE, sent|wparam|defwinproc, 1 }, /* in the 2nd MDI child */ - { WM_SETVISIBLE, hook }, /* in the 1st MDI child */ + { HCBT_SETFOCUS, hook }, /* in the 1st MDI child */ { WM_KILLFOCUS, sent|defwinproc }, /* in the 1st MDI child */ { WM_IME_SETCONTEXT, sent|defwinproc|optional }, /* in the 1st MDI child */ { WM_IME_SETCONTEXT, sent|optional }, /* in the MDI client */ { WM_SETFOCUS, sent, 0 }, /* in the MDI client */ - { WM_SETVISIBLE, hook }, + { HCBT_SETFOCUS, hook }, { WM_KILLFOCUS, sent }, /* in the MDI client */ { WM_IME_SETCONTEXT, sent|optional }, /* in the MDI client */ { WM_IME_SETCONTEXT, sent|defwinproc|optional }, /* in the 1st MDI child */

1 0

Alexandre Julliard : user32: We no longer need to ensure that the BeginPaint window belongs to the current thread .
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 2c4a3c8ad6f3a5dc7feb566806fa6225dc713cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c4a3c8ad6f3a5dc7feb56680… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 30 10:03:30 2008 +0200 user32: We no longer need to ensure that the BeginPaint window belongs to the current thread. --- dlls/user32/painting.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 7ec7634..436bd16 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -859,20 +859,11 @@ static HWND fix_caret(HWND hWnd, const RECT *scroll_rect, INT dx, INT dy, */ HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) { - HWND full_handle; HRGN hrgn; UINT flags = UPDATE_NONCLIENT | UPDATE_ERASE | UPDATE_PAINT | UPDATE_INTERNALPAINT | UPDATE_NOCHILDREN; if (!lps) return 0; - if (!(full_handle = WIN_IsCurrentThread( hwnd ))) - { - if (IsWindow(hwnd)) - FIXME( "window %p belongs to other thread\n", hwnd ); - return 0; - } - hwnd = full_handle; - HideCaret( hwnd ); if (!(hrgn = send_ncpaint( hwnd, NULL, &flags ))) return 0;

1 0

Michael Stefaniuc : mshtml: Fix the Hungarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 6b2495863d78fa69fb04f3df6a7603ae637f25aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2495863d78fa69fb04f3df6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:56:25 2008 +0200 mshtml: Fix the Hungarian translation. --- dlls/mshtml/Hu.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Hu.rc b/dlls/mshtml/Hu.rc index bb2d330..7f3d254 100644 --- a/dlls/mshtml/Hu.rc +++ b/dlls/mshtml/Hu.rc @@ -23,4 +23,6 @@ STRINGTABLE DISCARDABLE { IDS_HTMLDISABLED "A HTML rajzol�s jelenleg le van tiltva." IDS_HTMLDOCUMENT "HTML Dokumentum" + IDS_DOWNLOADING "Downloading..." + IDS_INSTALLING "Installing..." }

1 0

Michael Stefaniuc : shell32: Fix the Hungarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: b020e8fa0bd6092e4ababdce94d65653f6b74b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b020e8fa0bd6092e4ababdce9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:56:41 2008 +0200 shell32: Fix the Hungarian translation. --- dlls/shell32/shell32_Hu.rc | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Hu.rc b/dlls/shell32/shell32_Hu.rc index 8a10e5e..00ac554 100644 --- a/dlls/shell32/shell32_Hu.rc +++ b/dlls/shell32/shell32_Hu.rc @@ -40,17 +40,19 @@ BEGIN END END -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 "N�vjegy: %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "Wine &license...", 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 "A WINE-t �rt�k:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 170, 10 + LTEXT "Running on %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "A WINE-t �rt�k:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95

1 0

Michael Stefaniuc : notepad: Fix the Hungarian translation.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: 471f80d65d5d1066e2f2f20dadb200a5592d5b28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=471f80d65d5d1066e2f2f20da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:56:55 2008 +0200 notepad: Fix the Hungarian translation. --- programs/notepad/Hu.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Hu.rc b/programs/notepad/Hu.rc index a5f411a..9c9d90f 100644 --- a/programs/notepad/Hu.rc +++ b/programs/notepad/Hu.rc @@ -29,8 +29,8 @@ MAIN_MENU MENU LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT MENUITEM "&Ment�s\tCtrl+S", CMD_SAVE MENUITEM "Ment�s m�&sk�nt...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "&Oldalbe�ll�t�s...", CMD_PAGE_SETUP MENUITEM "Nyom&tat�s...\tCtrl+P", CMD_PRINT + MENUITEM "&Oldalbe�ll�t�s...", CMD_PAGE_SETUP MENUITEM "Nyomtat� &be�ll�t�s...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&Kil�p�s", CMD_EXIT @@ -47,6 +47,7 @@ POPUP "S&zerkeszt MENUITEM "&Id�/d�tum\tF5", CMD_TIME_DATE MENUITEM SEPARATOR MENUITEM "&Hossz� sorok t�rdel�se", CMD_WRAP + MENUITEM "&Font...", CMD_FONT } POPUP "&Keres�s" { MENUITEM "&Keres�s...", CMD_SEARCH

1 0

Michael Stefaniuc : comdlg32: Fix some control sizes in the default English resource.
by Alexandre Julliard May 30, 2008

May 30, 2008

Module: wine Branch: master Commit: f19e8470fa23141e1226984eb5c124e33a95c2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f19e8470fa23141e1226984eb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 30 00:56:10 2008 +0200 comdlg32: Fix some control sizes in the default English resource. --- dlls/comdlg32/cdlg_En.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc index 2021448..761a746 100644 --- a/dlls/comdlg32/cdlg_En.rc +++ b/dlls/comdlg32/cdlg_En.rc @@ -103,8 +103,8 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Orientation", grp2, 6, 85, 100, 50, BS_GROUPBOX - RADIOBUTTON "Po&rtrait", rad3, 50, 100, 40, 12 - RADIOBUTTON "&Landscape", rad4, 50, 115, 40, 12 + RADIOBUTTON "Po&rtrait", rad3, 50, 100, 50, 12 + RADIOBUTTON "&Landscape", rad4, 50, 115, 50, 12 ICON "LANDSCAP", stc10, 10, 95, 32, 32 ICON "PORTRAIT", stc11, 10, 95, 32, 32 GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX @@ -191,7 +191,7 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Match &Case", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "Direction", grp1, 107, 26, 68, 28 - CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 + CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 30, 12 CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 DEFPUSHBUTTON "&Find Next", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON

1 0