January 2009 - Wine-commits

Huw Davies : ole32: Move private data structure out of header file.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 70ee1123376cfd137ea778fbea225c780588765f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ee1123376cfd137ea778fbe… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 27 15:27:08 2009 +0000 ole32: Move private data structure out of header file. --- dlls/ole32/stg_bigblockfile.c | 18 ++++++++++++++++++ dlls/ole32/storage32.h | 20 -------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index a2ee1de..0d7b366 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -85,6 +85,8 @@ typedef struct * file this mapping represents. (The mappings are always * PAGE_SIZE-aligned.) */ + +typedef struct MappedPage MappedPage; struct MappedPage { MappedPage *next; @@ -99,6 +101,22 @@ struct MappedPage BlockBits writable_blocks; }; +struct BigBlockFile +{ + BOOL fileBased; + ULARGE_INTEGER filesize; + ULONG blocksize; + HANDLE hfile; + HANDLE hfilemap; + DWORD flProtect; + MappedPage *maplist; + MappedPage *victimhead, *victimtail; + ULONG num_victim_pages; + ILockBytes *pLkbyt; + HGLOBAL hbytearray; + LPVOID pbytearray; +}; + /*********************************************************** * Prototypes for private methods */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index b358ed2..639ec6a 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -152,27 +152,7 @@ struct StgProperty * this section appear in stg_bigblockfile.c */ -/* - * Declaration of the data structures - */ typedef struct BigBlockFile BigBlockFile,*LPBIGBLOCKFILE; -typedef struct MappedPage MappedPage,*LPMAPPEDPAGE; - -struct BigBlockFile -{ - BOOL fileBased; - ULARGE_INTEGER filesize; - ULONG blocksize; - HANDLE hfile; - HANDLE hfilemap; - DWORD flProtect; - MappedPage *maplist; - MappedPage *victimhead, *victimtail; - ULONG num_victim_pages; - ILockBytes *pLkbyt; - HGLOBAL hbytearray; - LPVOID pbytearray; -}; /* * Declaration of the functions used to manipulate the BigBlockFile

1 0

Dylan Smith : richedit: Updated internal style flags on EM_SHOWSCROLLBAR.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: f42e151a6cc2d4bca630bcbb081c13f2a3256ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42e151a6cc2d4bca630bcbb0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 28 01:35:06 2009 -0500 richedit: Updated internal style flags on EM_SHOWSCROLLBAR. The internal style flags are used to determine whether to show or hide the scrollbar when ME_UpdateScrollBar is called. EM_SHOWSCROLLBAR seems to update this state in native richedit controls. --- dlls/riched20/editor.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cd130a5..4495fb4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3183,6 +3183,28 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SHOWSCROLLBAR: { + DWORD flags; + + switch (wParam) + { + case SB_HORZ: + flags = WS_HSCROLL; + break; + case SB_VERT: + flags = WS_VSCROLL; + break; + case SB_BOTH: + flags = WS_HSCROLL|WS_VSCROLL; + break; + default: + return 0; + } + + if (lParam) + editor->styleFlags |= flags; + else + editor->styleFlags &= flags; + ITextHost_TxShowScrollBar(editor->texthost, wParam, lParam); return 0; }

1 0

Marcus Meissner : riched20: rcUpdate cannot be NULL in ME_PaintContent ( Coverity).
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 43eb9ab9d7fd9b3c63b0ca5a768ffcd08041733c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43eb9ab9d7fd9b3c63b0ca5a7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 28 09:35:07 2009 +0100 riched20: rcUpdate cannot be NULL in ME_PaintContent (Coverity). --- dlls/riched20/paint.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0c027e4..30548fe 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -74,15 +74,12 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT * if (!bOnlyNew || (item->member.para.nFlags & MEPF_REPAINT)) { /* Draw the pargraph if any of the paragraph is in the update region. */ - BOOL bPaint = (rcUpdate == NULL); - if (rcUpdate) - bPaint = ys < rcUpdate->bottom && ye > rcUpdate->top; - if (bPaint) + if (ys < rcUpdate->bottom && ye > rcUpdate->top) { ME_DrawParagraph(&c, item); /* Clear the repaint flag if the whole paragraph is in the * update region. */ - if (!rcUpdate || (rcUpdate->top <= ys && rcUpdate->bottom >= ye)) + if (rcUpdate->top <= ys && rcUpdate->bottom >= ye) item->member.para.nFlags &= ~MEPF_REPAINT; } }

1 0

Dylan Smith : richedit: Actually store end of line string for end paragraph runs.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 5d74f5838266e81a969f97cf389f6369c5bc46c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d74f5838266e81a969f97cf3… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 28 01:34:56 2009 -0500 richedit: Actually store end of line string for end paragraph runs. Previously a count of the carraige returns and line feeds were stored for end of paragraph runs, and a paragraph sign was stored as the actual string. This was causing many special cases where the length of the run needed to be determined differently if the run was or wasn't an end of paragraph run. There wasn't any use for storing the paragraph sign unless some drawing code gets commented out to allow the end paragraphs to be shown, therefore I changed the code to store the actual string that gets retrieved by WM_GETTEXT. --- dlls/riched20/caret.c | 35 +++++++++++---------- dlls/riched20/editor.c | 69 +++++++++++++---------------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 3 +- dlls/riched20/list.c | 6 +-- dlls/riched20/paint.c | 1 - dlls/riched20/para.c | 32 ++++++++----------- dlls/riched20/run.c | 8 +---- dlls/riched20/string.c | 1 + dlls/riched20/table.c | 21 ++++++++----- dlls/riched20/undo.c | 6 +-- dlls/riched20/writer.c | 58 ++++++++-------------------------- dlls/riched32/tests/editor.c | 13 ++++++-- 13 files changed, 101 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d74f5838266e81a969f9…

1 0

Dylan Smith : richedit: Suppress scrollbar if missing WS_[VH]SCROLL style.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: a051a231190a0b76887a8f90a00d41b54ac703d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a051a231190a0b76887a8f90a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jan 28 01:35:02 2009 -0500 richedit: Suppress scrollbar if missing WS_[VH]SCROLL style. If the scrollbar style isn't initially used, then the scrollbar should be shown. Otherwise this can be a problem when the horizontal scrollbar is shown for a single line richedit control, since it will cover all the text (See bug 12088). --- dlls/riched20/paint.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 7d7ea76..0c027e4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1067,14 +1067,16 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) { LONG winStyle = GetWindowLongW(editor->hWnd, GWL_STYLE); bScrollBarIsVisible = (winStyle & WS_HSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx) + bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx + && (editor->styleFlags & WS_HSCROLL)) || (editor->styleFlags & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy) + bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy + && (editor->styleFlags & WS_VSCROLL)) || (editor->styleFlags & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, @@ -1163,8 +1165,14 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (si.fMask & SIF_DISABLENOSCROLL) + if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; + } else if (!(editor->styleFlags & WS_HSCROLL)) { + /* SetScrollInfo or SetScrollRange may cause the scrollbar to be + * shown, so hide the scrollbar if necessary. */ + bScrollBarWasVisible = bScrollBarWillBeVisible; + bScrollBarWillBeVisible = FALSE; + } if (bScrollBarWasVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); @@ -1203,8 +1211,14 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (si.fMask & SIF_DISABLENOSCROLL) + if (si.fMask & SIF_DISABLENOSCROLL) { bScrollBarWillBeVisible = TRUE; + } else if (!(editor->styleFlags & WS_VSCROLL)) { + /* SetScrollInfo or SetScrollRange may cause the scrollbar to be + * shown, so hide the scrollbar if necessary. */ + bScrollBarWasVisible = bScrollBarWillBeVisible; + bScrollBarWillBeVisible = FALSE; + } if (bScrollBarWasVisible != bScrollBarWillBeVisible) ITextHost_TxShowScrollBar(editor->texthost, SB_VERT,

1 0

Austin English : kernel32: Add a stub for OpenProfileUserMapping.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: eb877e442122ecf3c5f8178916cc91ff7998f0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb877e442122ecf3c5f817891… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 27 23:44:20 2009 -0600 kernel32: Add a stub for OpenProfileUserMapping. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/profile.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9c70d56..79d1720 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -835,7 +835,7 @@ @ stdcall OpenMutexA(long long str) @ stdcall OpenMutexW(long long wstr) @ stdcall OpenProcess(long long long) -@ stub OpenProfileUserMapping +@ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall OpenSemaphoreW(long long wstr) @ stdcall OpenThread(long long long) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8fe83bb..e0b709c 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1850,6 +1850,15 @@ void WINAPI WriteOutProfiles16(void) } /*********************************************************************** + * OpenProfileUserMapping (KERNEL32.@) + */ +BOOL WINAPI OpenProfileUserMapping(void) { + FIXME("(), stub!\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * CloseProfileUserMapping (KERNEL32.@) */ BOOL WINAPI CloseProfileUserMapping(void) {

1 0

Michael Stefaniuc : dsound: Fix mixup between HWAVEOUT and HWAVEIN.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 7ab165a5907b2f7bfd3f062b98cd02abac7a45f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab165a5907b2f7bfd3f062b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 28 01:06:57 2009 +0100 dsound: Fix mixup between HWAVEOUT and HWAVEIN. The code path is taken when a valid wod isn't found. The loop thus doesn't call waveInMessage() for each wid but retries the same wrong wod. --- dlls/dsound/propset.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 43caa63..00a3120 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -543,14 +543,14 @@ static HRESULT DSPROPERTY_Description1( ppd->DataFlow = DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE; ppd->WaveDeviceId = wid; ppd->Devnode = wid; - err = mmErr(waveInMessage((HWAVEIN)wod,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&(desc),0)); + err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDDESC,(DWORD_PTR)&(desc),0)); if (err == DS_OK) { PIDSDRIVER drv = NULL; lstrcpynA(ppd->DescriptionA, desc.szDesc, sizeof(ppd->DescriptionA)); lstrcpynA(ppd->ModuleA, desc.szDrvname, sizeof(ppd->ModuleA)); MultiByteToWideChar( CP_ACP, 0, desc.szDesc, -1, ppd->DescriptionW, sizeof(ppd->DescriptionW)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, desc.szDrvname, -1, ppd->ModuleW, sizeof(ppd->ModuleW)/sizeof(WCHAR) ); - err = mmErr(waveInMessage((HWAVEIN)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); + err = mmErr(waveInMessage((HWAVEIN)wid, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&drv, 0)); if (err == DS_OK && drv) ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD; else

1 0

Michael Stefaniuc : dsound: Use UlongToHandle to make the real payload a HWAVEIN/HWAVEOUT.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 0ae74c2a9b2b59e1414522e162c51b1d83b7cb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae74c2a9b2b59e1414522e16… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 28 01:07:25 2009 +0100 dsound: Use UlongToHandle to make the real payload a HWAVEIN/HWAVEOUT. Fixes Win64 compiler warnings. --- dlls/dsound/capture.c | 10 +++--- dlls/dsound/dsound_main.c | 8 ++-- dlls/dsound/propset.c | 88 ++++++++++++++++++++++---------------------- 3 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ae74c2a9b2b59e141452…

1 0

Lei Zhang : wineps.drv: Remove SelectBitmap stub implementation.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 271e3bbad444d0975f0ea8a1230c2a46b766c1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=271e3bbad444d0975f0ea8a12… Author: Lei Zhang <thestig(a)google.com> Date: Tue Jan 27 15:49:30 2009 -0800 wineps.drv: Remove SelectBitmap stub implementation. --- dlls/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/objects.c | 33 --------------------------------- dlls/wineps.drv/wineps.drv.spec | 1 - 3 files changed, 0 insertions(+), 35 deletions(-) diff --git a/dlls/wineps.drv/Makefile.in b/dlls/wineps.drv/Makefile.in index fef94ae..52bc28f 100644 --- a/dlls/wineps.drv/Makefile.in +++ b/dlls/wineps.drv/Makefile.in @@ -60,7 +60,6 @@ C_SRCS = \ glyphlist.c \ graphics.c \ init.c \ - objects.c \ pen.c \ ppd.c \ ps.c \ diff --git a/dlls/wineps.drv/objects.c b/dlls/wineps.drv/objects.c deleted file mode 100644 index 274e7f9..0000000 --- a/dlls/wineps.drv/objects.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * PostScript driver object handling - * - * Copyright 1998 Huw D M Davies - * - * This library 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. - * - * This library 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. - * - * 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 - */ - -#include "psdrv.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(psdrv); - -/*********************************************************************** - * SelectBitmap (WINEPS.@) - */ -HBITMAP PSDRV_SelectBitmap( PSDRV_PDEVICE *physDev, HBITMAP hbitmap ) -{ - FIXME("stub\n"); - return 0; -} diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 1d3f20c..38ada75 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -27,7 +27,6 @@ @ cdecl Rectangle(ptr long long long long) PSDRV_Rectangle @ cdecl ResetDC(ptr ptr) PSDRV_ResetDC @ cdecl RoundRect(ptr long long long long long long) PSDRV_RoundRect -@ cdecl SelectBitmap(ptr long) PSDRV_SelectBitmap @ cdecl SelectBrush(ptr long) PSDRV_SelectBrush @ cdecl SelectFont(ptr long long) PSDRV_SelectFont @ cdecl SelectPen(ptr long) PSDRV_SelectPen

1 0

Michael Stefaniuc : wineesd.drv: Add missing return in function returning non-void.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 0b872e65b263392b4850a3e43d8ca11847d8d32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b872e65b263392b4850a3e43… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 28 01:05:45 2009 +0100 wineesd.drv: Add missing return in function returning non-void. Return value is analog to what the ALSA and OSS driver are doing. --- dlls/wineesd.drv/audio.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 161cedb..e59b711 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1157,6 +1157,8 @@ static DWORD CALLBACK wodPlayer(LPVOID pmt) dwNextFeedTime = dwNextNotifyTime = INFINITE; } } + + return 0; } /**************************************************************************

1 0