August 2007 - Wine-Commits - list.winehq.org

Evan Stade : gdiplus: Added GdipFillRectangle.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: b66c0a00d9e334c8f732b438978829ab4c550576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66c0a00d9e334c8f732b4389… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 8 19:42:10 2007 -0700 gdiplus: Added GdipFillRectangle. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0da04b0..f0d1bde 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -226,7 +226,7 @@ @ stub GdipFillPolygon2I @ stdcall GdipFillPolygon(ptr ptr ptr long long) @ stdcall GdipFillPolygonI(ptr ptr ptr long long) -@ stub GdipFillRectangle +@ stdcall GdipFillRectangle(ptr ptr long long long long) @ stdcall GdipFillRectangleI(ptr ptr long long long long) @ stub GdipFillRectangles @ stub GdipFillRectanglesI diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f282519..5946fa3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1336,6 +1336,39 @@ end: return retval; } +GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, + REAL x, REAL y, REAL width, REAL height) +{ + INT save_state; + GpPointF ptf[4]; + POINT pti[4]; + + if(!graphics || !brush) + return InvalidParameter; + + ptf[0].X = x; + ptf[0].Y = y; + ptf[1].X = x + width; + ptf[1].Y = y; + ptf[2].X = x + width; + ptf[2].Y = y + height; + ptf[3].X = x; + ptf[3].Y = y + height; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, brush->gdibrush); + SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); + + transform_and_round_points(graphics, pti, ptf, 4); + + Polygon(graphics->hdc, pti, 4); + + RestoreDC(graphics->hdc, save_state); + + return Ok; +} + GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2a0a28e..1ae9ced 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -76,6 +76,7 @@ GpStatus WINGDIPAPI GdipFillPath(GpGraphics*,GpBrush*,GpPath*); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics*,GpBrush*,GDIPCONST GpPoint*,INT, GpFillMode); +GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics*,GpBrush*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipGetCompositingQuality(GpGraphics*,CompositingQuality*); GpStatus WINGDIPAPI GdipGetInterpolationMode(GpGraphics*,InterpolationMode*);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: ebadbd4bd54f8e1775b5c90ef5b4f376f28ffceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebadbd4bd54f8e1775b5c90ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:42:59 2007 +0200 Assorted spelling fixes. --- dlls/dsound/mixer.c | 2 +- dlls/gdi32/tests/path.c | 2 +- dlls/ntdll/time.c | 2 +- dlls/oleaut32/tests/vartest.c | 2 +- dlls/tapi32/line.c | 2 +- dlls/user32/button.c | 2 +- dlls/user32/tests/sysparams.c | 2 +- dlls/winedos/module.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index b00e846..fcbf678 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -121,7 +121,7 @@ DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, D } /** Convert a resampled pointer that fits for primary to a 'native' sample pointer - * freqAccNext is used here rather then freqAcc: In case the app wants to fill up to + * freqAccNext is used here rather than freqAcc: In case the app wants to fill up to * the play position it won't overwrite it */ static DWORD DSOUND_bufpos_to_secpos(const IDirectSoundBufferImpl *dsb, DWORD bufpos) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 9f08ea4..33497bc 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -70,7 +70,7 @@ static void test_widenpath(void) /* Test if WidenPath seems to have done his job */ nSize = GetPath(hdc, NULL, NULL, 0); ok(nSize != -1, "GetPath fails after calling WidenPath.\n"); - ok(nSize > 6, "Path number of points is to low. Should be more than 6 but is %d\n", nSize); + ok(nSize > 6, "Path number of points is too low. Should be more than 6 but is %d\n", nSize); AbortPath(hdc); diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 9f1cef2..4d29c33 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -826,7 +826,7 @@ NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time ) * * Note: Windows uses a timer clocked at a multiple of 1193182 Hz. There is a * good number of applications that crash when the returned frequency is either - * lower or higher then what Windows gives. Also too high counter values are + * lower or higher than what Windows gives. Also too high counter values are * reported to give problems. */ NTSTATUS WINAPI NtQueryPerformanceCounter( PLARGE_INTEGER Counter, PLARGE_INTEGER Frequency ) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c6c2af2..e0d419c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5057,7 +5057,7 @@ static void test_VarAdd(void) VARADD(R8, R8_MAX, R8, R8_MIN, R8, R8_MAX + R8_MIN); VARADD(R8, R8_MIN, R8, R8_MIN, R8, R8_MIN + R8_MIN); - /* Manualy test BSTR + BSTR */ + /* Manually test BSTR + BSTR */ V_VT(&left) = VT_BSTR; V_BSTR(&left) = lbstr; V_VT(&right) = VT_BSTR; diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 19f8d0a..6824d26 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -737,7 +737,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, RegSetValueExA( hkCards, "NextID", 0, REG_DWORD, (LPBYTE)&dwval, sizeof(DWORD)); } - } else hkCards = 0; /* should realy fail */ + } else hkCards = 0; /* should really fail */ /* check if sufficient room is available */ lpTranslateCaps->dwNeededSize = sizeof(LINETRANSLATECAPS) + length; if ( lpTranslateCaps->dwNeededSize > lpTranslateCaps->dwTotalSize ) { diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 14416e2..b80d78a 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -584,7 +584,7 @@ static UINT BUTTON_BStoDT(DWORD style) } /* DrawText ignores vertical alignment for multiline text, - * but we use these flags to align label manualy. + * but we use these flags to align label manually. */ if (get_button_type(style) != BS_GROUPBOX) { diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a2a886d..68e6cca 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1521,7 +1521,7 @@ static void test_SPI_SETMINIMIZEDMETRICS( void ) /* 44 */ lpMm_new.iVertGap, "iVertGap", "%d" ); eq( GetSystemMetrics( SM_ARRANGE ), lpMm_new.iArrange, "iArrange", "%d" ); - /* now some realy invalid settings */ + /* now some really invalid settings */ lpMm_cur.iWidth = -1; lpMm_cur.iHorzGap = -1; lpMm_cur.iVertGap = -1; diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index 24d6a73..1dfaabd 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -302,7 +302,7 @@ static BOOL MZ_DoLoadImage( HANDLE hFile, LPCSTR filename, OverlayBlock *oblk, W SetFilePointer(hFile,image_start,NULL,FILE_BEGIN); if (!ReadFile(hFile,load_start,image_size,&len,NULL) || len != image_size) { /* check if this is due to the workaround for the pre-1.10 MS linker and we - realy had only 4 bytes on the last page */ + really had only 4 bytes on the last page */ if (mz_header.e_cblp != 4 || image_size - len != 512 - 4) { SetLastError(ERROR_BAD_FORMAT); goto load_error;

1 0

Francois Gouget : gdi32: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: ce9672367a9d3a33e13ecbb5850f5c6daccbfc38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9672367a9d3a33e13ecbb58… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:42:25 2007 +0200 gdi32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 319581e..4944be2 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1371,6 +1371,10 @@ ULONG WORD int +%long --pointer + +DWORD_PTR + %float FLOAT @@ -1449,8 +1453,8 @@ PALETTEENTRY * PFLOAT PIXELFORMATDESCRIPTOR * POINT * -PPOLYTEXTA -PPOLYTEXTW +POLYTEXTA * +POLYTEXTW * PVOID RECT * RGBQUAD *

1 0

Francois Gouget : mscoree: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: b4209a7bb80071e5004ca9201213a1d2aa7bd4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4209a7bb80071e5004ca9201… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:42:00 2007 +0200 mscoree: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 8f31635..319581e 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2430,6 +2430,41 @@ LPWSTR PCWSTR PWSTR +%%mscoree.dll + +%long + +BOOL +DWORD +HINSTANCE +HRESULT +__int32 +int + +%ptr + +DWORD * +HMODULE * +IUnknown ** +LPVOID +LPVOID * +PBYTE +REFCLSID +REFIID +PVOID +PVOID * +VOID * + +%wstr + +LPCWSTR +LPWSTR + +%void + +VOID +void + %%msdmo.dll %long

1 0

Francois Gouget : msi: Better match the PSDK types, remove some now unused types from win32.api, and update it to fix the winapi_check warnings.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 57717000195fdee94b119aa033a12d20cf364d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57717000195fdee94b119aa03… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:41:41 2007 +0200 msi: Better match the PSDK types, remove some now unused types from win32.api, and update it to fix the winapi_check warnings. --- dlls/msi/format.c | 6 ++-- dlls/msi/install.c | 20 ++++++------ dlls/msi/msi.c | 64 +++++++++++++++++++++--------------------- dlls/msi/msipriv.h | 46 +++++++++++++++--------------- dlls/msi/msiquery.c | 6 ++-- dlls/msi/package.c | 8 ++-- dlls/msi/record.c | 72 ++++++++++++++++++++++++------------------------ dlls/msi/registry.c | 20 ++++++------ dlls/msi/suminfo.c | 10 +++--- include/msi.h | 48 ++++++++++++++++---------------- include/msiquery.h | 57 ++++++++++++++++++++------------------ tools/winapi/win32.api | 16 ++++++---- 12 files changed, 190 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57717000195fdee94b119…

1 0

Francois Gouget : imm32: Add a couple of missing prototypes and update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: f6848fb6825db1b1917fd56fab96a87369eb60ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6848fb6825db1b1917fd56fa… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:41:02 2007 +0200 imm32: Add a couple of missing prototypes and update win32.api to fix the winapi_check warnings. --- include/imm.h | 3 +++ tools/winapi/win32.api | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/imm.h b/include/imm.h index 5fe3b87..d8f1e4b 100644 --- a/include/imm.h +++ b/include/imm.h @@ -511,6 +511,9 @@ DWORD WINAPI ImmGetGuideLineW(HIMC, DWORD, LPWSTR, DWORD); UINT WINAPI ImmGetIMEFileNameA(HKL, LPSTR, UINT); UINT WINAPI ImmGetIMEFileNameW(HKL, LPWSTR, UINT); #define ImmGetIMEFileName WINELIB_NAME_AW(ImmGetIMEFileName) +DWORD WINAPI ImmGetImeMenuItemsA(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOA, LPIMEMENUITEMINFOA, DWORD); +DWORD WINAPI ImmGetImeMenuItemsW(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMENUITEMINFOW, DWORD); +#define ImmGetImeMenuItems WINELIB_NAME_AW(ImmGetImeMenuItems) BOOL WINAPI ImmGetOpenStatus(HIMC); DWORD WINAPI ImmGetProperty(HKL, DWORD); UINT WINAPI ImmGetRegisterWordStyleA(HKL, UINT, LPSTYLEBUFA); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 253557d..c58341e 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -1701,6 +1701,7 @@ BOOL DWORD HIMC HKL +HIMCC HWND LONG LPARAM @@ -1715,8 +1716,11 @@ LPCANDIDATELIST LPCOMPOSITIONFORM LPCVOID LPDWORD +LPINPUTCONTEXT LPLOGFONTA LPLOGFONTW +LPIMEMENUITEMINFOA +LPIMEMENUITEMINFOW LPPOINT LPSTYLEBUFA LPSTYLEBUFW

1 0

Francois Gouget : d3drm: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: ca99deba39aa6f5d4a27c510f5092a9bc761cb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca99deba39aa6f5d4a27c510f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:40:36 2007 +0200 d3drm: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 5282a91..253557d 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -885,6 +885,26 @@ LPVOID * REFCLSID REFIID +%%d3drm.dll + +%long + +D3DCOLOR + +%float + +D3DVALUE + +%ptr + +D3DRMMATRIX4D +LPD3DRMQUATERNION +LPD3DVECTOR + +%void + +void + %%dbghelp.dll %long

1 0

Francois Gouget : netapi32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: b449a8ba3168fade4ec41ecaeaa8ddce0a4ba4b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b449a8ba3168fade4ec41ecae… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:40:29 2007 +0200 netapi32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index a30c06c..5282a91 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2821,9 +2821,11 @@ DSROLE_PRIMARY_DOMAIN_INFO_LEVEL DWORD NET_API_STATUS UCHAR +ULONG %ptr +GUID * LPBYTE LPBYTE * LPDWORD @@ -2832,9 +2834,13 @@ LPVOID * LPWSTR * PBROWSER_EMULATED_DOMAIN * PBYTE * +PDOMAIN_CONTROLLER_INFOA * +PDOMAIN_CONTROLLER_INFOW * PDWORD +PDWORD_PTR PNCB PNETSETUP_JOIN_STATUS +PSID PVOID PVOID * @@ -2842,8 +2848,13 @@ PVOID * VOID +%str + +LPCSTR + %wstr +LMCSTR LMSTR LPCWSTR LPWSTR

1 0

Francois Gouget : kernel32: Don' t get stuck if the debugger exits without signaling the event.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 2bdf6c75ecc70b7fb21e1e02a81f278a27ec118d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bdf6c75ecc70b7fb21e1e02a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 9 10:39:34 2007 +0200 kernel32: Don't get stuck if the debugger exits without signaling the event. --- dlls/kernel32/except.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 32305cb..0817d23 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -319,7 +319,16 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info); FreeEnvironmentStringsA( env ); - if (ret) WaitForSingleObject(hEvent, INFINITE); /* wait for debugger to come up... */ + if (ret) + { + /* wait for debugger to come up... */ + HANDLE handles[2]; + CloseHandle(info.hThread); + handles[0]=hEvent; + handles[1]=info.hProcess; + WaitForMultipleObjects(2, handles, FALSE, INFINITE); + CloseHandle(info.hProcess); + } else ERR("Couldn't start debugger (%s) (%d)\n" "Read the Wine Developers Guide on how to set up winedbg or another debugger\n", debugstr_a(cmdline), GetLastError());

1 0

Francois Gouget : ddrawex: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Aug. 9, 2007

Aug. 9, 2007

Module: wine Branch: master Commit: 403786bb37faaf49cd9cb7dd4ba2f1c17b6b45aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=403786bb37faaf49cd9cb7dd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 9 10:40:08 2007 +0200 ddrawex: Better match the PSDK types and fix the winapi_check warnings. --- dlls/ddrawex/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index 27c5b7f..6befb95 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -333,7 +333,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD Reason, - void *lpv) + LPVOID lpv) { TRACE("(%p,%x,%p)\n", hInstDLL, Reason, lpv); return TRUE;

1 0