May 2010 - Wine-commits - list.winehq.org

Michael Stefaniuc : oleview: Use the explicit W types/functions in details. c.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 12be9c39f2818c84a3143d3c96b31dd389b77aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12be9c39f2818c84a3143d3c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 7 10:46:25 2010 +0200 oleview: Use the explicit W types/functions in details.c. --- programs/oleview/details.c | 124 ++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12be9c39f2818c84a3143…

1 0

Michael Stefaniuc : oleview: Switch the rest to use the explicit W-types/ functions.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: c34c6ac20e40e964bb8aeeffc0cc68d86783abda URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34c6ac20e40e964bb8aeeffc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 7 10:46:52 2010 +0200 oleview: Switch the rest to use the explicit W-types/functions. Compile with -DWINE_NO_UNICODE_MACROS. --- programs/oleview/Makefile.in | 2 +- programs/oleview/interface.c | 46 +++++++++++++++++++++--------------------- programs/oleview/main.h | 4 +- programs/oleview/pane.c | 18 ++++++++-------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 18dac96..3b9ec12 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = oleview.exe APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 oleaut32 ole32 user32 advapi32 kernel32 -EXTRADEFS = -DUNICODE +EXTRADEFS = -DWINE_NO_UNICODE_MACROS C_SRCS = \ details.c \ diff --git a/programs/oleview/interface.c b/programs/oleview/interface.c index ca37979..fbbd478 100644 --- a/programs/oleview/interface.c +++ b/programs/oleview/interface.c @@ -28,12 +28,12 @@ typedef struct BOOL IsInterface(HTREEITEM item) { - TVITEM tvi; + TVITEMW tvi; - memset(&tvi, 0, sizeof(TVITEM)); + memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = item; - SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); if(!tvi.lParam) return FALSE; if(((ITEM_INFO*)tvi.lParam)->cFlag & INTERFACE) return TRUE; @@ -43,22 +43,22 @@ BOOL IsInterface(HTREEITEM item) static IUnknown *GetInterface(void) { HTREEITEM hSelect; - TVITEM tvi; + TVITEMW tvi; CLSID clsid; IUnknown *unk; hSelect = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); - memset(&tvi, 0, sizeof(TVITEM)); + memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = hSelect; - SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); CLSIDFromString(((ITEM_INFO *)tvi.lParam)->clsid, &clsid); - memset(&tvi, 0, sizeof(TVITEM)); + memset(&tvi, 0, sizeof(TVITEMW)); tvi.hItem = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)hSelect); - SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); IUnknown_QueryInterface(((ITEM_INFO *)tvi.lParam)->pU, &clsid, (void *)&unk); @@ -82,9 +82,9 @@ static INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, case WM_INITDIALOG: di = (DIALOG_INFO *)lParam; hObject = GetDlgItem(hDlgWnd, IDC_LABEL); - SetWindowText(hObject, di->wszLabel); + SetWindowTextW(hObject, di->wszLabel); hObject = GetDlgItem(hDlgWnd, IDC_IDENTIFIER); - SetWindowText(hObject, di->wszIdentifier); + SetWindowTextW(hObject, di->wszIdentifier); return TRUE; case WM_COMMAND: switch(LOWORD(wParam)) { @@ -96,22 +96,22 @@ static INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, hRes = IPersistStream_IsDirty((IPersistStream *)unk); IUnknown_Release(unk); if(hRes == S_OK) - LoadString(globals.hMainInst, IDS_FALSE, wszBuf, + LoadStringW(globals.hMainInst, IDS_FALSE, wszBuf, sizeof(wszBuf)/sizeof(wszBuf[0])); - else LoadString(globals.hMainInst, IDS_TRUE, wszBuf, + else LoadStringW(globals.hMainInst, IDS_TRUE, wszBuf, sizeof(wszBuf)/sizeof(wszBuf[0])); hObject = GetDlgItem(hDlgWnd, IDC_ISDIRTY); - SetWindowText(hObject, wszBuf); + SetWindowTextW(hObject, wszBuf); return TRUE; case IDC_GETSIZEMAX_BUTTON: unk = GetInterface(); IPersistStream_GetSizeMax((IPersistStream *)unk, &size); IUnknown_Release(unk); - LoadString(globals.hMainInst, IDS_BYTES, wszBuf, + LoadStringW(globals.hMainInst, IDS_BYTES, wszBuf, sizeof(wszBuf)/sizeof(wszBuf[0])); wsprintfW(wszSize, wszFormat, U(size).LowPart, wszBuf); hObject = GetDlgItem(hDlgWnd, IDC_GETSIZEMAX); - SetWindowText(hObject, wszSize); + SetWindowTextW(hObject, wszSize); return TRUE; } } @@ -128,7 +128,7 @@ static void IPersistStreamInterfaceViewer(WCHAR *clsid, WCHAR *wszName) else di.wszLabel = wszName; di.wszIdentifier = clsid; - DialogBoxParam(0, MAKEINTRESOURCE(DLG_IPERSISTSTREAM_IV), + DialogBoxParamW(0, MAKEINTRESOURCEW(DLG_IPERSISTSTREAM_IV), globals.hMainWnd, InterfaceViewerProc, (LPARAM)&di); } @@ -142,7 +142,7 @@ static void IPersistInterfaceViewer(WCHAR *clsid, WCHAR *wszName) else di.wszLabel = wszName; di.wszIdentifier = clsid; - DialogBoxParam(0, MAKEINTRESOURCE(DLG_IPERSIST_IV), + DialogBoxParamW(0, MAKEINTRESOURCEW(DLG_IPERSIST_IV), globals.hMainWnd, InterfaceViewerProc, (LPARAM)&di); } @@ -153,13 +153,13 @@ static void DefaultInterfaceViewer(WCHAR *clsid, WCHAR *wszName) di.wszLabel = wszName; di.wszIdentifier = clsid; - DialogBoxParam(0, MAKEINTRESOURCE(DLG_DEFAULT_IV), + DialogBoxParamW(0, MAKEINTRESOURCEW(DLG_DEFAULT_IV), globals.hMainWnd, InterfaceViewerProc, (LPARAM)&di); } void InterfaceViewer(HTREEITEM item) { - TVITEM tvi; + TVITEMW tvi; WCHAR *clsid; WCHAR wszName[MAX_LOAD_STRING]; WCHAR wszParent[MAX_LOAD_STRING]; @@ -170,23 +170,23 @@ void InterfaceViewer(HTREEITEM item) '0','0','0','0','-','0','0','0','0','-','C','0','0','0','-', '0','0','0','0','0','0','0','0','0','0','4','6','}','\0' }; - memset(&tvi, 0, sizeof(TVITEM)); + memset(&tvi, 0, sizeof(TVITEMW)); tvi.mask = TVIF_TEXT; tvi.hItem = item; tvi.cchTextMax = MAX_LOAD_STRING; tvi.pszText = wszName; - SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); clsid = ((ITEM_INFO*)tvi.lParam)->clsid; - memset(&tvi, 0, sizeof(TVITEM)); + memset(&tvi, 0, sizeof(TVITEMW)); tvi.mask = TVIF_TEXT; tvi.hItem = (HTREEITEM)SendMessageW(globals.hTree, TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)item); tvi.cchTextMax = MAX_LOAD_STRING; tvi.pszText = wszParent; - SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); + SendMessageW(globals.hTree, TVM_GETITEMW, 0, (LPARAM)&tvi); if(!memcmp(clsid, wszIPersistStream, sizeof(wszIPersistStream))) IPersistStreamInterfaceViewer(clsid, wszParent); diff --git a/programs/oleview/main.h b/programs/oleview/main.h index a6f199a..c3c358d 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -138,7 +138,7 @@ void RefreshMenu(HTREEITEM item); /* pane.c */ BOOL CreatePanedWindow(HWND hWnd, HWND *hWndCreated, HINSTANCE hInst); -BOOL PaneRegisterClass(void); +BOOL PaneRegisterClassW(void); void SetLeft(HWND hParent, HWND hWnd); void SetRight(HWND hParent, HWND hWnd); @@ -153,7 +153,7 @@ void ReleaseInst(HTREEITEM item); /* typelib.c */ BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName); -BOOL TypeLibRegisterClass(void); +BOOL TypeLibRegisterClassW(void); void UpdateData(HTREEITEM item); /* interface.c */ diff --git a/programs/oleview/pane.c b/programs/oleview/pane.c index 6418cf7..a96da4d 100644 --- a/programs/oleview/pane.c +++ b/programs/oleview/pane.c @@ -70,7 +70,7 @@ static LRESULT CALLBACK PaneProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa if(pt.x >= GetSplitPos(hWnd)-pane->size/2 && pt.x <= GetSplitPos(hWnd)+pane->size/2) - SetCursor(LoadCursor(0, IDC_SIZEWE)); + SetCursor(LoadCursorW(0, (LPWSTR)IDC_SIZEWE)); break; case WM_LBUTTONDOWN: if((short)LOWORD(lParam) >= GetSplitPos(hWnd)-pane->size/2 && @@ -103,8 +103,8 @@ static LRESULT CALLBACK PaneProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa if((int)wParam != TYPELIB_TREE) break; switch(((LPNMHDR)lParam)->code) { - case TVN_SELCHANGED: - UpdateData(((NMTREEVIEW *)lParam)->itemNew.hItem); + case TVN_SELCHANGEDW: + UpdateData(((NMTREEVIEWW *)lParam)->itemNew.hItem); break; } break; @@ -123,22 +123,22 @@ static LRESULT CALLBACK PaneProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa HeapFree(GetProcessHeap(), 0, pane); break; default: - return DefWindowProc(hWnd, uMsg, wParam, lParam); + return DefWindowProcW(hWnd, uMsg, wParam, lParam); } return 0; } -BOOL PaneRegisterClass(void) +BOOL PaneRegisterClassW(void) { - WNDCLASS wcc; + WNDCLASSW wcc; const WCHAR wszPaneClass[] = { 'P','A','N','E','\0' }; - memset(&wcc, 0, sizeof(WNDCLASS)); + memset(&wcc, 0, sizeof(WNDCLASSW)); wcc.lpfnWndProc = PaneProc; wcc.hbrBackground = (HBRUSH)(COLOR_WINDOW); wcc.lpszClassName = wszPaneClass; - if(!RegisterClass(&wcc)) + if(!RegisterClassW(&wcc)) return FALSE; return TRUE; } @@ -149,7 +149,7 @@ BOOL CreatePanedWindow(HWND hWnd, HWND *hWndCreated, HINSTANCE hInst) PANE *pane; pane = HeapAlloc(GetProcessHeap(), 0, sizeof(PANE)); - *hWndCreated = CreateWindow(wszPaneClass, NULL, WS_CHILD|WS_VISIBLE, + *hWndCreated = CreateWindowW(wszPaneClass, NULL, WS_CHILD|WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, hWnd, (HMENU)pane, hInst, NULL); if(!*hWndCreated) {

1 0

André Hentschel : kernel32: Double the alarm timeout to prevent a failed test.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 56d28f7d5baeacb4f865df3629a1ad820cd47b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d28f7d5baeacb4f865df362… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 30 18:38:59 2010 +0200 kernel32: Double the alarm timeout to prevent a failed test. --- dlls/kernel32/tests/pipe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 948c704..b48ceec 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -794,9 +794,9 @@ static void test_NamedPipe_2(void) DWORD alarmThreadId; trace("test_NamedPipe_2 starting\n"); - /* Set up a ten second timeout */ + /* Set up a twenty second timeout */ alarm_event = CreateEvent( NULL, TRUE, FALSE, NULL ); - alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 10000, 0, &alarmThreadId); + alarmThread = CreateThread(NULL, 0, alarmThreadMain, (void *) 20000, 0, &alarmThreadId); /* The servers we're about to exercize do try to clean up carefully, * but to reduce the change of a test failure due to a pipe handle

1 0

Alexandre Julliard : kernel32: Define GetProcessHeap as an assembler function on i386.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 18dbaadfc5389337168003a879229479f46710c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18dbaadfc5389337168003a87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 14:07:45 2010 +0200 kernel32: Define GetProcessHeap as an assembler function on i386. --- dlls/kernel32/heap.c | 9 --------- dlls/kernel32/thread.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index ead0778..4d36a1d 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -249,15 +249,6 @@ BOOL WINAPI HeapUnlock( /*********************************************************************** - * GetProcessHeap (KERNEL32.@) - */ -HANDLE WINAPI GetProcessHeap(void) -{ - return NtCurrentTeb()->Peb->ProcessHeap; -} - - -/*********************************************************************** * GetProcessHeaps (KERNEL32.@) */ DWORD WINAPI GetProcessHeaps( DWORD count, HANDLE *heaps ) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index f6a2b0f..5130286 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -596,6 +596,12 @@ __ASM_STDCALL_FUNC( GetCurrentProcessId, 0, ".byte 0x64\n\tmovl 0x20,%eax\n\tret /* DWORD WINAPI GetCurrentThreadId(void) */ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" ) +/*********************************************************************** + * GetProcessHeap (KERNEL32.@) + */ +/* HANDLE WINAPI GetProcessHeap(void) */ +__ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x64\n\tmovl 0x30,%eax\n\tmovl 0x18(%eax),%eax\n\tret"); + #else /* __i386__ */ /********************************************************************** @@ -650,6 +656,14 @@ DWORD WINAPI GetCurrentThreadId(void) return HandleToULong(NtCurrentTeb()->ClientId.UniqueThread); } +/*********************************************************************** + * GetProcessHeap (KERNEL32.@) + */ +HANDLE WINAPI GetProcessHeap(void) +{ + return NtCurrentTeb()->Peb->ProcessHeap; +} + #endif /* __i386__ */ /*************************************************************************

1 0

Alexandre Julliard : kernel32: Add an x86_64 implementation for the TEB access functions.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 383879f6866005689ade46ed2ce003ebe7e13fbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=383879f6866005689ade46ed2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 14:15:25 2010 +0200 kernel32: Add an x86_64 implementation for the TEB access functions. --- dlls/kernel32/thread.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5130286..024e825 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -602,7 +602,39 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" /* HANDLE WINAPI GetProcessHeap(void) */ __ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x64\n\tmovl 0x30,%eax\n\tmovl 0x18(%eax),%eax\n\tret"); -#else /* __i386__ */ +#elif defined(__x86_64__) + +/*********************************************************************** + * SetLastError (KERNEL32.@) + */ +/* void WINAPI SetLastError( DWORD error ); */ +__ASM_STDCALL_FUNC( SetLastError, 8, ".byte 0x65\n\tmovl %ecx,0x68\n\tret" ); + +/*********************************************************************** + * GetLastError (KERNEL32.@) + */ +/* DWORD WINAPI GetLastError(void); */ +__ASM_STDCALL_FUNC( GetLastError, 0, ".byte 0x65\n\tmovl 0x68,%eax\n\tret" ); + +/*********************************************************************** + * GetCurrentProcessId (KERNEL32.@) + */ +/* DWORD WINAPI GetCurrentProcessId(void) */ +__ASM_STDCALL_FUNC( GetCurrentProcessId, 0, ".byte 0x65\n\tmovl 0x40,%eax\n\tret" ); + +/*********************************************************************** + * GetCurrentThreadId (KERNEL32.@) + */ +/* DWORD WINAPI GetCurrentThreadId(void) */ +__ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x65\n\tmovl 0x48,%eax\n\tret" ); + +/*********************************************************************** + * GetProcessHeap (KERNEL32.@) + */ +/* HANDLE WINAPI GetProcessHeap(void) */ +__ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x65\n\tmovq 0x60,%rax\n\tmovq 0x30(%rax),%rax\n\tret"); + +#else /* __x86_64__ */ /********************************************************************** * SetLastError (KERNEL32.@)

1 0

Alexandre Julliard : user32: Make DrawIcon simply call DrawIconEx.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 159145cefe10d5a75a5d80c3115e6923c0b43344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159145cefe10d5a75a5d80c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:45:39 2010 +0200 user32: Make DrawIcon simply call DrawIconEx. --- dlls/user32/cursoricon.c | 83 +--------------------------------------------- 1 files changed, 1 insertions(+), 82 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index bafe4a7..856d900 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1656,88 +1656,7 @@ static void premultiply_alpha_channel( unsigned char *destBitmap, */ BOOL WINAPI DrawIcon( HDC hdc, INT x, INT y, HICON hIcon ) { - CURSORICONINFO *ptr; - HDC hMemDC; - HBITMAP hXorBits = NULL, hAndBits = NULL, hBitTemp = NULL; - COLORREF oldFg, oldBg; - unsigned char *xorBitmapBits; - unsigned int dibLength; - - TRACE("%p, (%d,%d), %p\n", hdc, x, y, hIcon); - - if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; - if (!(hMemDC = CreateCompatibleDC( hdc ))) - { - release_icon_ptr( hIcon, ptr ); - return FALSE; - } - - dibLength = ptr->nHeight * get_bitmap_width_bytes( - ptr->nWidth, ptr->bBitsPerPixel); - - xorBitmapBits = (unsigned char *)(ptr + 1) + ptr->nHeight * - get_bitmap_width_bytes(ptr->nWidth, 1); - - oldFg = SetTextColor( hdc, RGB(0,0,0) ); - oldBg = SetBkColor( hdc, RGB(255,255,255) ); - - if(bitmap_has_alpha_channel(ptr->bBitsPerPixel, xorBitmapBits, dibLength)) - { - BITMAPINFOHEADER bmih; - unsigned char *dibBits; - - memset(&bmih, 0, sizeof(BITMAPINFOHEADER)); - bmih.biSize = sizeof(BITMAPINFOHEADER); - bmih.biWidth = ptr->nWidth; - bmih.biHeight = -ptr->nHeight; - bmih.biPlanes = ptr->bPlanes; - bmih.biBitCount = 32; - bmih.biCompression = BI_RGB; - - hXorBits = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, - (void*)&dibBits, NULL, 0); - - if (hXorBits && dibBits) - { - BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - - /* Do the alpha blending render */ - premultiply_alpha_channel(dibBits, xorBitmapBits, dibLength); - hBitTemp = SelectObject( hMemDC, hXorBits ); - /* Destination width/height has to be "System Large" size */ - GdiAlphaBlend(hdc, x, y, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), hMemDC, - 0, 0, ptr->nWidth, ptr->nHeight, pixelblend); - SelectObject( hMemDC, hBitTemp ); - } - } - else - { - hAndBits = CreateBitmap( ptr->nWidth, ptr->nHeight, 1, 1, ptr + 1 ); - hXorBits = CreateBitmap( ptr->nWidth, ptr->nHeight, ptr->bPlanes, - ptr->bBitsPerPixel, xorBitmapBits); - - if (hXorBits && hAndBits) - { - hBitTemp = SelectObject( hMemDC, hAndBits ); - StretchBlt( hdc, x, y, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), hMemDC, 0, 0, - ptr->nWidth, ptr->nHeight, SRCAND ); - SelectObject( hMemDC, hXorBits ); - StretchBlt( hdc, x, y, GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), hMemDC, 0, 0, - ptr->nWidth, ptr->nHeight, SRCINVERT ); - SelectObject( hMemDC, hBitTemp ); - } - } - - DeleteDC( hMemDC ); - if (hXorBits) DeleteObject( hXorBits ); - if (hAndBits) DeleteObject( hAndBits ); - release_icon_ptr( hIcon, ptr ); - SetTextColor( hdc, oldFg ); - SetBkColor( hdc, oldBg ); - return TRUE; + return DrawIconEx( hdc, x, y, hIcon, 0, 0, 0, 0, DI_NORMAL | DI_COMPAT | DI_DEFAULTSIZE ); } /***********************************************************************

1 0

Alexandre Julliard : shell32: Fix marshalling of 1-bpp systray icons.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 96a939eee1617039949b249b697b9e9f8fd1a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a939eee1617039949b249b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 12:45:55 2010 +0200 shell32: Fix marshalling of 1-bpp systray icons. --- dlls/shell32/systray.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 3e0b5ac..59df2f8 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -163,43 +163,54 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) BITMAP bmMask; BITMAP bmColour; LONG cbMaskBits; - LONG cbColourBits; + LONG cbColourBits = 0; char *buffer; if (!GetIconInfo(nid->hIcon, &iconinfo)) goto noicon; if (!GetObjectW(iconinfo.hbmMask, sizeof(bmMask), &bmMask) || - !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour)) + (iconinfo.hbmColor && !GetObjectW(iconinfo.hbmColor, sizeof(bmColour), &bmColour))) { DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); + if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor); goto noicon; } cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel + 15) / 16 * 2; - cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2; + if (iconinfo.hbmColor) + cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel + 15) / 16 * 2; cds.cbData = sizeof(*data) + cbMaskBits + cbColourBits; buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData); if (!buffer) { DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); + if (iconinfo.hbmColor) DeleteObject(iconinfo.hbmColor); return FALSE; } data = (struct notify_data *)buffer; memset( data, 0, sizeof(*data) ); - data->width = bmColour.bmWidth; - data->height = bmColour.bmHeight; - data->planes = bmColour.bmPlanes; - data->bpp = bmColour.bmBitsPixel; buffer += sizeof(*data); GetBitmapBits(iconinfo.hbmMask, cbMaskBits, buffer); - buffer += cbMaskBits; - GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); + if (!iconinfo.hbmColor) + { + data->width = bmMask.bmWidth; + data->height = bmMask.bmHeight / 2; + data->planes = 1; + data->bpp = 1; + } + else + { + data->width = bmColour.bmWidth; + data->height = bmColour.bmHeight; + data->planes = bmColour.bmPlanes; + data->bpp = bmColour.bmBitsPixel; + buffer += cbMaskBits; + GetBitmapBits(iconinfo.hbmColor, cbColourBits, buffer); + DeleteObject(iconinfo.hbmColor); + } DeleteObject(iconinfo.hbmMask); - DeleteObject(iconinfo.hbmColor); } noicon:

1 0

Vincent Povirk : ole32: Use the cached information in BlockChainStream_GetCount.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 4ad114cfaef87c885231021272ac548766d4393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad114cfaef87c88523102127… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 6 11:35:56 2010 -0500 ole32: Use the cached information in BlockChainStream_GetCount. --- dlls/ole32/storage32.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8bae897..9ac794e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5786,28 +5786,10 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) * * Returns the number of blocks that comprises this chain. * This is not the size of the stream as the last block may not be full! - * - * FIXME: Use the cache to get this information. */ static ULONG BlockChainStream_GetCount(BlockChainStream* This) { - ULONG blockIndex; - ULONG count = 0; - - blockIndex = BlockChainStream_GetHeadOfChain(This); - - while (blockIndex != BLOCK_END_OF_CHAIN) - { - count++; - - if(FAILED(StorageImpl_GetNextBlockInChain( - This->parentStorage, - blockIndex, - &blockIndex))) - return 0; - } - - return count; + return This->numBlocks; } /******************************************************************************

1 0

Vincent Povirk : ole32: Fix reads past the end of streams.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: dbf123ba0dccbe39cf44483eb122f74c9da23cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf123ba0dccbe39cf44483eb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 6 11:36:41 2010 -0500 ole32: Fix reads past the end of streams. --- dlls/ole32/storage32.c | 46 +++++++++++++++++++++++++++----- dlls/ole32/tests/storage32.c | 59 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9ac794e..bc1fb96 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3584,6 +3584,9 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer buffer, &bytesRead); + if (bytesRead != RAW_DIRENTRY_SIZE) + return STG_E_READFAULT; + return hr; } @@ -3929,6 +3932,11 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( offset.u.LowPart += cbRead; } + else + { + resRead = STG_E_READFAULT; + break; + } } while (cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(),0,buffer); @@ -4027,6 +4035,11 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( offset.u.LowPart += cbRead; } + else + { + resRead = STG_E_READFAULT; + break; + } }while(cbTotalRead.QuadPart < size.QuadPart); HeapFree(GetProcessHeap(), 0, buffer); @@ -5810,6 +5823,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, ULONG bytesToReadInBuffer; ULONG blockIndex; BYTE* bufferWalker; + ULARGE_INTEGER stream_size; TRACE("(%p)-> %i %p %i %p\n",This, offset.u.LowPart, buffer, size, bytesRead); @@ -5818,13 +5832,17 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, */ blockIndex = BlockChainStream_GetSectorOfOffset(This, blockNoInSequence); - if (blockIndex == BLOCK_END_OF_CHAIN) - return STG_E_DOCFILECORRUPT; /* We failed to find the starting block */ + *bytesRead = 0; + + stream_size = BlockChainStream_GetSize(This); + if (stream_size.QuadPart > offset.QuadPart) + size = min(stream_size.QuadPart - offset.QuadPart, size); + else + return S_OK; /* * Start reading the buffer. */ - *bytesRead = 0; bufferWalker = buffer; while ( (size > 0) && (blockIndex != BLOCK_END_OF_CHAIN) ) @@ -5862,7 +5880,7 @@ HRESULT BlockChainStream_ReadAt(BlockChainStream* This, break; } - return (size == 0) ? S_OK : STG_E_READFAULT; + return S_OK; } /****************************************************************************** @@ -6295,6 +6313,9 @@ static HRESULT SmallBlockChainStream_GetNextBlockInChain( &buffer, &bytesRead); + if (SUCCEEDED(res) && bytesRead != sizeof(DWORD)) + res = STG_E_READFAULT; + if (SUCCEEDED(res)) { StorageUtl_ReadDWord((BYTE *)&buffer, 0, nextBlockInChain); @@ -6386,7 +6407,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( /* * If we run out of space for the small block depot, enlarge it */ - if (SUCCEEDED(res)) + if (SUCCEEDED(res) && bytesRead == sizeof(DWORD)) { StorageUtl_ReadDWord((BYTE *)&buffer, 0, &nextBlockIndex); @@ -6482,12 +6503,21 @@ HRESULT SmallBlockChainStream_ReadAt( ULONG blockIndex; ULONG bytesReadFromBigBlockFile; BYTE* bufferWalker; + ULARGE_INTEGER stream_size; /* * This should never happen on a small block file. */ assert(offset.u.HighPart==0); + *bytesRead = 0; + + stream_size = SmallBlockChainStream_GetSize(This); + if (stream_size.QuadPart > offset.QuadPart) + size = min(stream_size.QuadPart - offset.QuadPart, size); + else + return S_OK; + /* * Find the first block in the stream that contains part of the buffer. */ @@ -6504,7 +6534,6 @@ HRESULT SmallBlockChainStream_ReadAt( /* * Start reading the buffer. */ - *bytesRead = 0; bufferWalker = buffer; while ( (size > 0) && (blockIndex != BLOCK_END_OF_CHAIN) ) @@ -6538,6 +6567,9 @@ HRESULT SmallBlockChainStream_ReadAt( if (FAILED(rc)) return rc; + if (!bytesReadFromBigBlockFile) + return STG_E_DOCFILECORRUPT; + /* * Step to the next big block. */ @@ -6551,7 +6583,7 @@ HRESULT SmallBlockChainStream_ReadAt( offsetInBlock = (offsetInBlock + bytesReadFromBigBlockFile) % This->parentStorage->smallBlockSize; } - return (size == 0) ? S_OK : STG_E_READFAULT; + return S_OK; } /****************************************************************************** diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 8fa1afd..9bd8f33 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -315,6 +315,55 @@ static void test_storage_stream(void) r = IStream_Commit(stm, STGC_DEFAULT ); ok(r==S_OK, "failed to commit stream\n"); + /* Read past the end of the stream. */ + pos.QuadPart = 3; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 3, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 3, "read bytes past end of stream\n"); + pos.QuadPart = 10; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + pos.QuadPart = 10000; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10000, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + + /* Convert to a big block stream, and read past the end. */ + p.QuadPart = 5000; + r = IStream_SetSize(stm,p); + ok(r==S_OK, "failed to set pos\n"); + pos.QuadPart = 4997; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 4997, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 3, "read bytes past end of stream\n"); + pos.QuadPart = 5001; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 5001, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + pos.QuadPart = 10000; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10000, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to read\n"); + ok(count == 0, "read bytes past end of stream\n"); + /* seek round a bit, reset the stream size */ pos.QuadPart = 0; r = IStream_Seek(stm, pos, 3, &p ); @@ -329,6 +378,16 @@ static void test_storage_stream(void) r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); ok(r==S_OK, "failed to seek stream\n"); ok(p.QuadPart == 10, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to set pos\n"); + ok(count == 0, "read bytes from empty stream\n"); + pos.QuadPart = 10000; + r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); + ok(r==S_OK, "failed to seek stream\n"); + ok(p.QuadPart == 10000, "at wrong place\n"); + r = IStream_Read(stm, buffer, sizeof buffer, &count ); + ok(r==S_OK, "failed to set pos\n"); + ok(count == 0, "read bytes from empty stream\n"); pos.QuadPart = 0; r = IStream_Seek(stm, pos, STREAM_SEEK_END, &p ); ok(r==S_OK, "failed to seek stream\n");

1 0

Vincent Povirk : windowscodecs: Use the BITMAPINFOHEADER structure to get icon bitcount.
by Alexandre Julliard 07 May '10

07 May '10

Module: wine Branch: master Commit: 6a36802f26fc2518c99de329c969fecd907e11e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a36802f26fc2518c99de329c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 6 17:07:39 2010 -0500 windowscodecs: Use the BITMAPINFOHEADER structure to get icon bitcount. --- dlls/windowscodecs/icoformat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index e1ea7c6..180dbb3 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -189,7 +189,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) hr = IStream_Read(This->parent->stream, &bih, sizeof(BITMAPINFOHEADER), &bytesread); if (FAILED(hr) || bytesread != sizeof(BITMAPINFOHEADER)) goto fail; - if (This->entry.wBitCount <= 8) + if (bih.biBitCount <= 8) { /* read the palette */ colorcount = This->entry.bColorCount ? This->entry.bColorCount : 256; @@ -202,7 +202,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) bitsSize = bitsStride * height; /* read the XOR data */ - switch (This->entry.wBitCount) + switch (bih.biBitCount) { case 1: { @@ -440,11 +440,11 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) break; } default: - FIXME("unsupported bitcount: %u\n", This->entry.wBitCount); + FIXME("unsupported bitcount: %u\n", bih.biBitCount); goto fail; } - if (This->entry.wBitCount < 32) + if (bih.biBitCount < 32) { /* set alpha data based on the AND mask */ UINT andBytesPerRow = (width+31)/32*4;

1 0