January 2009 - Wine-Commits

Dylan Smith : richedit: Tested EM_CHARFROMPOS with position outside of control.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 576ff4b104f4c05a1e6a8b56f02e90dfab8d44e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576ff4b104f4c05a1e6a8b56f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 11 02:59:01 2009 -0500 richedit: Tested EM_CHARFROMPOS with position outside of control. --- dlls/riched20/tests/editor.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 534d217..8c3281c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5715,17 +5715,51 @@ static void test_EM_CHARFROMPOS(void) { HWND hwnd; int result; + RECT rcClient; POINTL point; point.x = 0; - point.y = 50; + point.y = 40; /* multi-line control inserts CR normally */ hwnd = new_richedit(NULL); result = SendMessageA(hwnd, WM_SETTEXT, 0, - (LPARAM)"one two three four five six seven"); + (LPARAM)"one two three four five six seven\reight"); + GetClientRect(hwnd, &rcClient); + + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + ok(result == 34, "expected character index of 34 but got %d\n", result); + + /* Test with points outside the bounds of the richedit control. */ + point.x = -1; + point.y = 40; + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + todo_wine ok(result == 34, "expected character index of 34 but got %d\n", result); + + point.x = 1000; + point.y = 0; + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + todo_wine ok(result == 33, "expected character index of 33 but got %d\n", result); + + point.x = 1000; + point.y = 40; + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + todo_wine ok(result == 39, "expected character index of 39 but got %d\n", result); + + point.x = 1000; + point.y = -1; + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + todo_wine ok(result == 0, "expected character index of 0 but got %d\n", result); + + point.x = 1000; + point.y = rcClient.bottom + 1; + result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); + todo_wine ok(result == 34, "expected character index of 34 but got %d\n", result); + + point.x = 1000; + point.y = rcClient.bottom; result = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&point); - ok(result == 0, "expected character index of 0 but got %d\n", result); + todo_wine ok(result == 39, "expected character index of 39 but got %d\n", result); DestroyWindow(hwnd); }

1 0

Dylan Smith : richedit: Added tests to show that options are stored internally.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: a1aaf97c11c3d0581a63193ede58147ba7c00945 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1aaf97c11c3d0581a63193ed… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 11 22:20:23 2009 -0500 richedit: Added tests to show that options are stored internally. --- dlls/riched20/tests/editor.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 11930ad..4efe8e3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1458,6 +1458,10 @@ static void test_EM_SETOPTIONS(void) HWND hwndRichEdit = new_richedit(NULL); static const char text[] = "Hello. My name is RichEdit!"; char buffer[1024] = {0}; + DWORD dwStyle, options, oldOptions; + DWORD optionStyles = ES_AUTOVSCROLL|ES_AUTOHSCROLL|ES_NOHIDESEL| + ES_READONLY|ES_WANTRETURN|ES_SAVESEL| + ES_SELECTIONBAR|ES_VERTICAL; /* NEGATIVE TESTING - NO OPTIONS SET */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text); @@ -1480,6 +1484,25 @@ static void test_EM_SETOPTIONS(void) ok(buffer[0]==text[0], "EM_SETOPTIONS: Text changed! s1:%s s2:%s\n", text, buffer); + /* EM_SETOPTIONS changes the window style, but changing the + * window style does not change the options. */ + dwStyle = GetWindowLong(hwndRichEdit, GWL_STYLE); + ok(dwStyle & ES_READONLY, "Readonly style not set by EM_SETOPTIONS\n"); + SetWindowLong(hwndRichEdit, GWL_STYLE, dwStyle & ~ES_READONLY); + options = SendMessage(hwndRichEdit, EM_GETOPTIONS, 0, 0); + todo_wine ok(options & ES_READONLY, "Readonly option set by SetWindowLong\n"); + /* Confirm that the text is still read only. */ + SendMessage(hwndRichEdit, WM_CHAR, 'a', ('a' << 16) | 0x0001); + SendMessage(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM) buffer); + todo_wine ok(buffer[0]==text[0], + "EM_SETOPTIONS: Text changed! s1:%s s2:%s\n", text, buffer); + + oldOptions = options; + SetWindowLong(hwndRichEdit, GWL_STYLE, dwStyle|optionStyles); + options = SendMessage(hwndRichEdit, EM_GETOPTIONS, 0, 0); + todo_wine ok(options == oldOptions, + "Options set by SetWindowLong (%x -> %x)\n", oldOptions, options); + DestroyWindow(hwndRichEdit); }

1 0

Andrey Turkin : ntdll: Add RtlCaptureStackBackTrace stub.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: d2685e7bd7d1c7f595c86ae08ddeaf9c696c43d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2685e7bd7d1c7f595c86ae08… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jan 12 03:34:30 2009 +0300 ntdll: Add RtlCaptureStackBackTrace stub. --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/exception.c | 24 ++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d02f6e3..c38d27f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -921,7 +921,7 @@ @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext -# @ stub RtlCaptureStackBackTrace ( -> ntdll.RtlCaptureStackBackTrace) +@ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 607d0e2..91a269b 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -585,6 +585,30 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) } +/************************************************************************* + * RtlCaptureStackBackTrace [NTDLL.@] + * + * Captures stack backtrace + * + * PARAMS + * Skip [I] Number of stack frames to skip before starting a capture + * Count [I] Number of stack frames to capture into Buffer + * Buffer [O] Array of backtrace pointers captured from stack + * Hash [O] Optional pointer to variable where backtrace hash should be stored + * + * RETURNS + * Number of captured stack frames or 0 if error occurred + * + * NOTES + * Unimplemented + */ +USHORT WINAPI RtlCaptureStackBackTrace(ULONG Skip, ULONG Count, PVOID *Buffer, ULONG *Hash) +{ + FIXME("(%d, %d, %p, %p) stub!\n", Skip, Count, Buffer, Hash); + return 0; +} + + /************************************************************* * __wine_spec_unimplemented_stub * diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1eb53d7..0ac4b51 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -434,7 +434,7 @@ @ stdcall RtlAssert(ptr ptr long long) # @ stub RtlCancelTimer @ stdcall -register RtlCaptureContext(ptr) -@ stub RtlCaptureStackBackTrace +@ stdcall RtlCaptureStackBackTrace(long long ptr ptr) # @ stub RtlCaptureStackContext @ stdcall RtlCharToInteger(ptr long ptr) # @ stub RtlCheckForOrphanedCriticalSections

1 0

Andrey Turkin : ntoskrnl: Add version resource.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: a0f681ad4c1626459db14668d5d046bd19b53d18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f681ad4c1626459db14668d… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jan 12 03:34:10 2009 +0300 ntoskrnl: Add version resource. --- dlls/ntoskrnl.exe/Makefile.in | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.rc | 27 +++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index f7787d8..0dad8c3 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -9,6 +9,8 @@ IMPORTS = kernel32 ntdll C_SRCS = \ ntoskrnl.c +RC_SRCS = ntoskrnl.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ntoskrnl.exe/ntoskrnl.rc b/dlls/ntoskrnl.exe/ntoskrnl.rc new file mode 100644 index 0000000..322dd75 --- /dev/null +++ b/dlls/ntoskrnl.exe/ntoskrnl.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2009 Andrey Turkin + * + * 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 + */ + +#define WINE_FILENAME_STR "ntoskrnl.exe" + +/* Version as of Win XP SP3 */ +#define WINE_FILEVERSION 5,1,2600,5657 +#define WINE_FILEVERSION_STR "5.1.2600.5657" +#define WINE_PRODUCTVERSION 5,1,2600,5657 +#define WINE_PRODUCTVERSION_STR "5.1.2600.5657" + +#include "wine/wine_common_ver.rc" diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 5b1d990..dece252 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2281,6 +2281,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msxml3.dll 11,,notepad.exe 11,,ntdll.dll +11,,ntoskrnl.exe 11,,ole32.dll 11,,oleaut32.dll 11,,oledlg.dll

1 0

Andrey Turkin : loadperf: Add LoadPerfCounterTextStrings stubs.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 86635b3c48742bb0a4fb4850733c0cb882733228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86635b3c48742bb0a4fb48507… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Jan 12 03:35:01 2009 +0300 loadperf: Add LoadPerfCounterTextStrings stubs. --- dlls/loadperf/loadperf.spec | 4 ++-- dlls/loadperf/loadperf_main.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/loadperf.h | 4 ++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/loadperf/loadperf.spec b/dlls/loadperf/loadperf.spec index 2ea2680..b46fe29 100644 --- a/dlls/loadperf/loadperf.spec +++ b/dlls/loadperf/loadperf.spec @@ -3,8 +3,8 @@ @ stub InstallPerfDllW @ stub LoadMofFromInstalledServiceA @ stub LoadMofFromInstalledServiceW -@ stub LoadPerfCounterTextStringsA -@ stub LoadPerfCounterTextStringsW +@ stdcall LoadPerfCounterTextStringsA(str long) +@ stdcall LoadPerfCounterTextStringsW(wstr long) @ stub RestorePerfRegistryFromFileW @ stub SetServiceAsTrustedA @ stub SetServiceAsTrustedW diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 8dbfab7..89a9c4f 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -51,6 +51,47 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /************************************************************* + * LoadPerfCounterTextStringsA (loadperf.@) + * + * NOTES + * See LoadPerfCounterTextStringsW + */ +DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR cmdline, BOOL quiet) +{ + DWORD ret; + LPWSTR cmdlineW = NULL; + + if (cmdline) + { + INT len = MultiByteToWideChar(CP_ACP, 0, cmdline, -1, NULL, 0); + cmdlineW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!cmdlineW) return ERROR_NOT_ENOUGH_MEMORY; + MultiByteToWideChar(CP_ACP, 0, cmdline, -1, cmdlineW, len); + } + + ret = LoadPerfCounterTextStringsW(cmdlineW, quiet); + + HeapFree(GetProcessHeap(), 0, cmdlineW); + + return ret; +} + +/************************************************************* + * LoadPerfCounterTextStringsW (loadperf.@) + * + * PARAMS + * cmdline [in] Last argument in command line - ini file to be used + * quiet [in] FALSE - the function may write to stdout + * + */ +DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR cmdline, BOOL quiet) +{ + FIXME("(%s, %d): stub\n", debugstr_w(cmdline), quiet); + + return ERROR_SUCCESS; +} + +/************************************************************* * UnloadPerfCounterTextStringsA (loadperf.@) * * NOTES diff --git a/include/loadperf.h b/include/loadperf.h index 74472c7..45679a2 100644 --- a/include/loadperf.h +++ b/include/loadperf.h @@ -23,6 +23,10 @@ extern "C" { #endif +DWORD WINAPI LoadPerfCounterTextStringsA(LPCSTR, BOOL); +DWORD WINAPI LoadPerfCounterTextStringsW(LPCWSTR, BOOL); +#define LoadPerfCounterTextStrings WINELIB_NAME_AW(LoadPerfCounterTextStrings) + DWORD WINAPI UnloadPerfCounterTextStringsA(LPCSTR, BOOL); DWORD WINAPI UnloadPerfCounterTextStringsW(LPCWSTR, BOOL); #define UnloadPerfCounterTextStrings WINELIB_NAME_AW(UnloadPerfCounterTextStrings)

1 0

Christian Costa : mciavi: In MCI, RECT structure is used differently: rc. right = width & rc.bottom = height so do the conversion when needed.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 2322a06dd61677a8af84110ccc6cb41115f7c3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2322a06dd61677a8af84110cc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Jan 11 16:45:51 2009 +0100 mciavi: In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height so do the conversion when needed. --- dlls/mciavi32/wnd.c | 46 +++++++++++++++++++++++++++++----------------- 1 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index 682a311..36f56e6 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -158,7 +158,12 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) EnterCriticalSection(&wma->cs); if (dwFlags & MCI_DGV_RECT) { - rc = lpParms->rc; + /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height + * So convert input MCI RECT into a normal RECT */ + rc.left = lpParms->rc.left; + rc.top = lpParms->rc.top; + rc.right = lpParms->rc.left + lpParms->rc.right; + rc.bottom = lpParms->rc.top + lpParms->rc.bottom; } else { GetClientRect(wma->hWndPaint, &rc); } @@ -188,7 +193,7 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) } if (dwFlags & MCI_DGV_PUT_WINDOW) { TRACE("PUT_WINDOW %s\n", wine_dbgstr_rect(&rc)); - SetWindowPos(wma->hWndPaint, NULL, rc.left, rc.top, rc.right, rc.bottom, SWP_NOZORDER); + SetWindowPos(wma->hWndPaint, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, SWP_NOZORDER); } LeaveCriticalSection(&wma->cs); return 0; @@ -200,6 +205,7 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); + RECT rc; TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); @@ -210,11 +216,11 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) if (dwFlags & MCI_DGV_WHERE_DESTINATION) { if (dwFlags & MCI_DGV_WHERE_MAX) { - GetClientRect(wma->hWndPaint, &lpParms->rc); - TRACE("WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&lpParms->rc)); + GetClientRect(wma->hWndPaint, &rc); + TRACE("WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&rc)); } else { TRACE("WHERE_DESTINATION %s\n", wine_dbgstr_rect(&wma->dest)); - lpParms->rc = wma->dest; + rc = wma->dest; } } if (dwFlags & MCI_DGV_WHERE_FRAME) { @@ -227,16 +233,14 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) } if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) { - RECT rect; - rect.left = 0; - rect.top = 0; - rect.right = wma->inbih->biWidth; - rect.bottom = wma->inbih->biHeight; - TRACE("WHERE_SOURCE_MAX %s\n", wine_dbgstr_rect(&rect)); - lpParms->rc = rect; + rc.left = 0; + rc.top = 0; + rc.right = wma->inbih->biWidth; + rc.bottom = wma->inbih->biHeight; + TRACE("WHERE_SOURCE_MAX %s\n", wine_dbgstr_rect(&rc)); } else { TRACE("WHERE_SOURCE %s\n", wine_dbgstr_rect(&wma->source)); - lpParms->rc = wma->source; + rc = wma->source; } } if (dwFlags & MCI_DGV_WHERE_VIDEO) { @@ -249,13 +253,21 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) } if (dwFlags & MCI_DGV_WHERE_WINDOW) { if (dwFlags & MCI_DGV_WHERE_MAX) { - GetWindowRect(GetDesktopWindow(), &lpParms->rc); - TRACE("WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&lpParms->rc)); + GetWindowRect(GetDesktopWindow(), &rc); + TRACE("WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&rc)); } else { - GetWindowRect(wma->hWndPaint, &lpParms->rc); - TRACE("WHERE_WINDOW %s\n", wine_dbgstr_rect(&lpParms->rc)); + GetWindowRect(wma->hWndPaint, &rc); + TRACE("WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); } } + + /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height + * So convert the normal RECT into a MCI RECT before returning */ + lpParms->rc.left = rc.left; + lpParms->rc.top = rc.top; + lpParms->rc.right = rc.right - rc.left; + lpParms->rc.bottom = rc.bottom - rc.top; + LeaveCriticalSection(&wma->cs); return 0; }

1 0

Chris Wulff : gdiplus: Implement hatch brush accessor functions.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 10637b4f0d602555a19d914383e6b270789bbe92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10637b4f0d602555a19d91438… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Sat Jan 10 18:52:31 2009 -0500 gdiplus: Implement hatch brush accessor functions. --- dlls/gdiplus/brush.c | 33 +++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 6 +++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 59d3aa2..7e1fa69 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -717,6 +717,39 @@ GpStatus WINGDIPAPI GdipGetBrushType(GpBrush *brush, GpBrushType *type) return Ok; } +GpStatus WINGDIPAPI GdipGetHatchBackgroundColor(GpHatch *brush, ARGB *backcol) +{ + TRACE("(%p, %p)\n", brush, backcol); + + if(!brush || !backcol) return InvalidParameter; + + *backcol = brush->backcol; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetHatchForegroundColor(GpHatch *brush, ARGB *forecol) +{ + TRACE("(%p, %p)\n", brush, forecol); + + if(!brush || !forecol) return InvalidParameter; + + *forecol = brush->forecol; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetHatchStyle(GpHatch *brush, HatchStyle *hatchstyle) +{ + TRACE("(%p, %p)\n", brush, hatchstyle); + + if(!brush || !hatchstyle) return InvalidParameter; + + *hatchstyle = brush->hatchstyle; + + return Ok; +} + GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) { TRACE("(%p)\n", brush); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e7ddc2a..3716207 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -275,9 +275,9 @@ @ stdcall GdipGetGenericFontFamilyMonospace(ptr) @ stdcall GdipGetGenericFontFamilySansSerif(ptr) @ stdcall GdipGetGenericFontFamilySerif(ptr) -@ stub GdipGetHatchBackgroundColor -@ stub GdipGetHatchForegroundColor -@ stub GdipGetHatchStyle +@ stdcall GdipGetHatchBackgroundColor(ptr ptr) +@ stdcall GdipGetHatchForegroundColor(ptr ptr) +@ stdcall GdipGetHatchStyle(ptr ptr) @ stub GdipGetHemfFromMetafile @ stub GdipGetImageAttributesAdjustedPalette @ stdcall GdipGetImageBounds(ptr ptr ptr)

1 0

Chris Wulff : gdiplus: Partial implementation of GdipCreateHatchBrush.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: a2a94a49bc2f433890aba98193a39f0992a8e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a94a49bc2f433890aba9819… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Sat Jan 10 18:45:11 2009 -0500 gdiplus: Partial implementation of GdipCreateHatchBrush. --- dlls/gdiplus/brush.c | 69 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 7 ++++ include/gdiplusenums.h | 62 +++++++++++++++++++++++++++++++++++ include/gdiplusgpstubs.h | 2 + 5 files changed, 141 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 9a513e1..59d3aa2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -53,6 +53,14 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); break; + case BrushTypeHatchFill: + *clone = GdipAlloc(sizeof(GpHatch)); + if (!*clone) return OutOfMemory; + + memcpy(*clone, brush, sizeof(GpHatch)); + + (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); + break; case BrushTypePathGradient:{ GpPathGradient *src, *dest; INT count; @@ -124,6 +132,67 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return Ok; } +static LONG HatchStyleToHatch(HatchStyle hatchstyle) +{ + switch (hatchstyle) + { + case HatchStyleHorizontal: return HS_HORIZONTAL; + case HatchStyleVertical: return HS_VERTICAL; + case HatchStyleForwardDiagonal: return HS_FDIAGONAL; + case HatchStyleBackwardDiagonal: return HS_BDIAGONAL; + case HatchStyleCross: return HS_CROSS; + case HatchStyleDiagonalCross: return HS_DIAGCROSS; + default: return 0; + } +} + +/****************************************************************************** + * GdipCreateHatchBrush [GDIPLUS.@] + */ +GpStatus WINGDIAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) +{ + COLORREF fgcol = ARGB2COLORREF(forecol); + + TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); + + if(!brush) return InvalidParameter; + + *brush = GdipAlloc(sizeof(GpHatch)); + if (!*brush) return OutOfMemory; + + switch (hatchstyle) + { + case HatchStyleHorizontal: + case HatchStyleVertical: + case HatchStyleForwardDiagonal: + case HatchStyleBackwardDiagonal: + case HatchStyleCross: + case HatchStyleDiagonalCross: + /* Brushes that map to BS_HATCHED */ + (*brush)->brush.lb.lbStyle = BS_HATCHED; + (*brush)->brush.lb.lbColor = fgcol; + (*brush)->brush.lb.lbHatch = HatchStyleToHatch(hatchstyle); + break; + + default: + FIXME("Unimplemented hatch style %d\n", hatchstyle); + + (*brush)->brush.lb.lbStyle = BS_SOLID; + (*brush)->brush.lb.lbColor = fgcol; + (*brush)->brush.lb.lbHatch = 0; + break; + } + + + (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); + (*brush)->brush.bt = BrushTypeHatchFill; + (*brush)->forecol = forecol; + (*brush)->backcol = backcol; + (*brush)->hatchstyle = hatchstyle; + + return Ok; +} + /****************************************************************************** * GdipCreateLineBrush [GDIPLUS.@] */ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 12a2316..e7ddc2a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -96,7 +96,7 @@ @ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) @ stub GdipCreateHICONFromBitmap @ stdcall GdipCreateHalftonePalette() -@ stub GdipCreateHatchBrush +@ stdcall GdipCreateHatchBrush(long long long ptr) @ stdcall GdipCreateImageAttributes(ptr) @ stdcall GdipCreateLineBrush(ptr ptr long long long ptr) @ stdcall GdipCreateLineBrushFromRect(ptr long long long long ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 714739c..dbeebe3 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -111,6 +111,13 @@ struct GpBrush{ LOGBRUSH lb; }; +struct GpHatch{ + GpBrush brush; + HatchStyle hatchstyle; + ARGB forecol; + ARGB backcol; +}; + struct GpSolidFill{ GpBrush brush; ARGB color; diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 8f7470d..c989000 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -357,6 +357,67 @@ enum MetafileFrameUnit MetafileFrameUnitGdi }; +enum HatchStyle +{ + HatchStyleHorizontal = 0, + HatchStyleVertical = 1, + HatchStyleForwardDiagonal = 2, + HatchStyleBackwardDiagonal = 3, + HatchStyleCross = 4, + HatchStyleDiagonalCross = 5, + HatchStyle05Percent = 6, + HatchStyle10Percent = 7, + HatchStyle20Percent = 8, + HatchStyle25Percent = 9, + HatchStyle30Percent = 10, + HatchStyle40Percent = 11, + HatchStyle50Percent = 12, + HatchStyle60Percent = 13, + HatchStyle70Percent = 14, + HatchStyle75Percent = 15, + HatchStyle80Percent = 16, + HatchStyle90Percent = 17, + HatchStyleLightDownwardDiagonal = 18, + HatchStyleLightUpwardDiagonal = 19, + HatchStyleDarkDownwardDiagonal = 20, + HatchStyleDarkUpwardDiagonal = 21, + HatchStyleWideDownwardDiagonal = 22, + HatchStyleWideUpwardDiagonal = 23, + HatchStyleLightVertical = 24, + HatchStyleLightHorizontal = 25, + HatchStyleNarrowVertical = 26, + HatchStyleNarrowHorizontal = 27, + HatchStyleDarkVertical = 28, + HatchStyleDarkHorizontal = 29, + HatchStyleDashedDownwardDiagonal = 30, + HatchStyleDashedUpwardDiagonal = 31, + HatchStyleDashedHorizontal = 32, + HatchStyleDashedVertical = 33, + HatchStyleSmallConfetti = 34, + HatchStyleLargeConfetti = 35, + HatchStyleZigZag = 36, + HatchStyleWave = 37, + HatchStyleDiagonalBrick = 38, + HatchStyleHorizontalBrick = 39, + HatchStyleWeave = 40, + HatchStylePlaid = 41, + HatchStyleDivot = 42, + HatchStyleDottedGrid = 43, + HatchStyleDottedDiamond = 44, + HatchStyleShingle = 45, + HatchStyleTrellis = 46, + HatchStyleSphere = 47, + HatchStyleSmallGrid = 48, + HatchStyleSmallCheckerBoard = 49, + HatchStyleLargeCheckerBoard = 50, + HatchStyleOutlinedDiamond = 51, + HatchStyleSolidDiamond = 52, + HatchStyleTotal = 53, + HatchStyleLargeGrid = HatchStyleCross, + HatchStyleMin = HatchStyleHorizontal, + HatchStyleMax = HatchStyleTotal - 1 +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -395,6 +456,7 @@ typedef enum CoordinateSpace CoordinateSpace; typedef enum GpTestControlEnum GpTestControlEnum; typedef enum MetafileFrameUnit MetafileFrameUnit; typedef enum PenType PenType; +typedef enum HatchStyle HatchStyle; #endif /* end of c typedefs */ diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index a768638..3edc1f4 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -23,6 +23,7 @@ class GpGraphics {}; class GpBrush {}; +class GpHatch : public GpBrush {}; class GpSolidFill : public GpBrush {}; class GpPath {}; class GpMatrix {}; @@ -49,6 +50,7 @@ class CGpEffect {}; typedef struct GpGraphics GpGraphics; typedef struct GpPen GpPen; typedef struct GpBrush GpBrush; +typedef struct GpHatch GpHatch; typedef struct GpSolidFill GpSolidFill; typedef struct GpPath GpPath; typedef struct GpMatrix GpMatrix;

1 0

Henri Verbeet : dsound: Const correctness fixes.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: 07f9991062cb37ea79d3ddcf233f232957c4c481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f9991062cb37ea79d3ddcf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 12 10:17:50 2009 +0100 dsound: Const correctness fixes. --- dlls/dsound/dsound_convert.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 95a9995..0ebce3d 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -61,18 +61,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); static void convert_8_to_8 (const void *src, void *dst) { BYTE *dest = dst; - *dest = *(BYTE*)src; + *dest = *(const BYTE *)src; } static void convert_8_to_16 (const void *src, void *dst) { - WORD dest = *(BYTE*)src, *dest16 = dst; + WORD dest = *(const BYTE *)src, *dest16 = dst; *dest16 = le16(dest * 257 - 32768); } static void convert_8_to_24 (const void *src, void *dst) { - BYTE dest = *(BYTE*)src; + BYTE dest = *(const BYTE *)src; BYTE *dest24 = dst; dest24[0] = dest; dest24[1] = dest; @@ -81,26 +81,26 @@ static void convert_8_to_24 (const void *src, void *dst) static void convert_8_to_32 (const void *src, void *dst) { - DWORD dest = *(BYTE*)src, *dest32 = dst; + DWORD dest = *(const BYTE *)src, *dest32 = dst; *dest32 = le32(dest * 16843009 - 2147483648U); } static void convert_16_to_8 (const void *src, void *dst) { BYTE *dst8 = dst; - *dst8 = (le16(*(WORD*)src)) / 256; + *dst8 = (le16(*(const WORD *)src)) / 256; *dst8 -= 0x80; } static void convert_16_to_16 (const void *src, void *dst) { WORD *dest = dst; - *dest = *(WORD*)src; + *dest = *(const WORD *)src; } static void convert_16_to_24 (const void *src, void *dst) { - WORD dest = le16(*(WORD*)src); + WORD dest = le16(*(const WORD *)src); BYTE *dest24 = dst; dest24[0] = dest / 256; @@ -110,14 +110,14 @@ static void convert_16_to_24 (const void *src, void *dst) static void convert_16_to_32 (const void *src, void *dst) { - DWORD dest = *(WORD*)src, *dest32 = dst; + DWORD dest = *(const WORD *)src, *dest32 = dst; *dest32 = dest * 65537; } static void convert_24_to_8 (const void *src, void *dst) { BYTE *dst8 = dst; - *dst8 = ((BYTE *)src)[2]; + *dst8 = ((const BYTE *)src)[2]; } static void convert_24_to_16 (const void *src, void *dst) @@ -147,19 +147,19 @@ static void convert_24_to_32 (const void *src, void *dst) static void convert_32_to_8 (const void *src, void *dst) { BYTE *dst8 = dst; - *dst8 = (le32(*(DWORD *)src) / 16777216); + *dst8 = (le32(*(const DWORD *)src) / 16777216); *dst8 -= 0x80; } static void convert_32_to_16 (const void *src, void *dst) { WORD *dest16 = dst; - *dest16 = le16(le32(*(DWORD*)src) / 65536); + *dest16 = le16(le32(*(const DWORD *)src) / 65536); } static void convert_32_to_24 (const void *src, void *dst) { - DWORD dest = le32(*(DWORD*)src); + DWORD dest = le32(*(const DWORD *)src); BYTE *dest24 = dst; dest24[0] = dest / 256; @@ -170,7 +170,7 @@ static void convert_32_to_24 (const void *src, void *dst) static void convert_32_to_32 (const void *src, void *dst) { DWORD *dest = dst; - *dest = *(DWORD*)src; + *dest = *(const DWORD *)src; } const bitsconvertfunc convertbpp[4][4] = {

1 0

Ge van Geldorp : msi/tests: Opening package with relative filename sometimes succeeds on Windows.
by Alexandre Julliard Jan. 12, 2009

Jan. 12, 2009

Module: wine Branch: master Commit: f9f2e91198a456240af839930a24226e6358b94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f2e91198a456240af839930… Author: Ge van Geldorp <ge(a)gse.nl> Date: Sun Jan 11 00:27:50 2009 +0100 msi/tests: Opening package with relative filename sometimes succeeds on Windows. --- dlls/msi/tests/msi.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 3396f5c..a52e011 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1760,7 +1760,6 @@ static void test_MsiGetComponentPath(void) RegDeleteKeyA(compkey, ""); RegCloseKey(prodkey); RegCloseKey(compkey); - RegCloseKey(installprop); DeleteFileA("C:\\imapath"); lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); @@ -1923,9 +1922,6 @@ static void test_MsiGetProductCode(void) RegDeleteKeyA(prodkey, ""); RegCloseKey(prodkey); - RegDeleteKeyA(prodkey, ""); - RegCloseKey(prodkey); - lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); @@ -7368,9 +7364,12 @@ static void test_MsiOpenProduct(void) /* LocalPackage has just the package name */ hprod = 0xdeadbeef; r = MsiOpenProductA(prodcode, &hprod); - ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, - "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED, got %d\n", r); - ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n"); + ok(r == ERROR_INSTALL_PACKAGE_OPEN_FAILED || r == ERROR_SUCCESS, + "Expected ERROR_INSTALL_PACKAGE_OPEN_FAILED or ERROR_SUCCESS, got %d\n", r); + if (r == ERROR_SUCCESS) + MsiCloseHandle(hprod); + else + ok(hprod == 0xdeadbeef, "Expected hprod to be unchanged\n"); lstrcpyA(val, path); lstrcatA(val, "\\winetest.msi");

1 0