October 2010 - Wine-Commits

Jerome Leclanche : gdi32: Properly set ERROR_NOACCESS when GetObject receives invalid arguments.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: d429664016e69310930b7b15fa9c0705cb560da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429664016e69310930b7b15f… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Thu Aug 19 14:30:49 2010 +0100 gdi32: Properly set ERROR_NOACCESS when GetObject receives invalid arguments. (cherry picked from commit da40f95efa58534d6f59dff11f8c9dbbbbb68520) --- dlls/gdi32/gdiobj.c | 14 ++++++++++++-- dlls/gdi32/tests/gdiobj.c | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 3f84f9c..a941e2b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -973,7 +973,12 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) GDI_ReleaseObj( handle ); if (funcs && funcs->pGetObjectA) - result = funcs->pGetObjectA( handle, count, buffer ); + { + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + SetLastError( ERROR_NOACCESS ); + else + result = funcs->pGetObjectA( handle, count, buffer ); + } else SetLastError( ERROR_INVALID_HANDLE ); @@ -995,7 +1000,12 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) GDI_ReleaseObj( handle ); if (funcs && funcs->pGetObjectW) - result = funcs->pGetObjectW( handle, count, buffer ); + { + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + SetLastError( ERROR_NOACCESS ); + else + result = funcs->pGetObjectW( handle, count, buffer ); + } else SetLastError( ERROR_INVALID_HANDLE ); diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index c1adc0f..7302134 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -81,6 +81,14 @@ static void test_gdi_objects(void) "GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", i, GetLastError()); + /* GetObject expects ERROR_NOACCESS when passed an invalid buffer */ + hp = SelectObject(hdc, GetStockObject(BLACK_PEN)); + SetLastError(0); + i = GetObjectA(hp, (INT_PTR)buff, (LPVOID)sizeof(buff)); + ok (!i && GetLastError() == ERROR_NOACCESS, + "GetObject(invalid buff), expected 0, ERROR_NOACCESS, got %d, %u\n", + i, GetLastError()); + /* GetObjectType does SetLastError() on a null object */ SetLastError(0); i = GetObjectType(NULL);

1 0

Wolfram Sang : hhctrl: Add check for no filename.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: d40f6132d574e076bedcdb2b665d829806a6c68e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d40f6132d574e076bedcdb2b6… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Sep 8 16:23:47 2010 +0200 hhctrl: Add check for no filename. (cherry picked from commit 9e1d9ef972f65e292e7b00e1da9293271bc60486) --- dlls/hhctrl.ocx/hhctrl.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 9ab66de..2101e05 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -295,6 +295,9 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) ptr += strlen("mapid")+1; space = strchr(ptr, ' '); + /* command line ends without number */ + if (!space) + return 0; memcpy(idtxt, ptr, space-ptr); idtxt[space-ptr] = '\0'; mapid = atoi(idtxt); @@ -315,6 +318,11 @@ int WINAPI doWinMain(HINSTANCE hInstance, LPSTR szCmdLine) len = endq - szCmdLine; else len = strlen(szCmdLine); + + /* no filename given */ + if (!len) + return 0; + buflen = MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, NULL, 0) + 1; filename = heap_alloc(buflen * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, szCmdLine, len, filename, buflen);

1 0

Juan Lang : iphlpapi: Don' t overwrite last IPv4 address with first IPv6 address.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 216806c456f4d178850caef0d8cf02c80a526ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216806c456f4d178850caef0d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 17 11:01:03 2010 -0700 iphlpapi: Don't overwrite last IPv4 address with first IPv6 address. (cherry picked from commit acda9f6ba94fa1da422632b12153ff682ad254f7) --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index af97390..493fe3f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -721,6 +721,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD for (ua = aa->FirstUnicastAddress; ua->Next; ua = ua->Next) ; ua->Next = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; + ua = (IP_ADAPTER_UNICAST_ADDRESS *)ptr; } else ua = aa->FirstUnicastAddress = (IP_ADAPTER_UNICAST_ADDRESS *)ptr;

1 0

Octavian Voicu : wined3d: Add missing ckey, fx, and pal directdraw caps.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: ba35dab7126ddfe1b2764cc749948fe73d7a1353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba35dab7126ddfe1b2764cc74… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Sep 1 16:44:11 2010 +0300 wined3d: Add missing ckey, fx, and pal directdraw caps. (cherry picked from commit f9cdd5097fc5bb2cbfcc4e0c9ce2b39496b48f44) --- dlls/wined3d/directx.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 268fee1..81e7561 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4217,7 +4217,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, int ps_selected_mode; struct shader_caps shader_caps; struct fragment_caps fragment_caps; - DWORD ckey_caps, blit_caps, fx_caps; + DWORD ckey_caps, blit_caps, fx_caps, pal_caps; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -4744,6 +4744,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDCAPS_COLORKEY | WINEDDCAPS_COLORKEYHWASSIST | WINEDDCAPS_ALIGNBOUNDARYSRC; + pal_caps = WINEDDPCAPS_8BIT | + WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ pCaps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | @@ -4754,6 +4756,9 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINEDDCAPS2_PRIMARYGAMMA | WINEDDCAPS2_WIDESURFACES | WINEDDCAPS2_CANRENDERWINDOWED; + pCaps->DirectDrawCaps.CKeyCaps = ckey_caps; + pCaps->DirectDrawCaps.FXCaps = fx_caps; + pCaps->DirectDrawCaps.PalCaps = pal_caps; pCaps->DirectDrawCaps.SVBCaps = blit_caps; pCaps->DirectDrawCaps.SVBCKeyCaps = ckey_caps; pCaps->DirectDrawCaps.SVBFXCaps = fx_caps;

1 0

Huw Davies : winspool.drv: Allow for spaces in either the printer name or the spool file.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 981a1844ffad0b75d6aab96ee019069682e51fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981a1844ffad0b75d6aab96ee… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 25 11:47:53 2010 +0100 winspool.drv: Allow for spaces in either the printer name or the spool file. (cherry picked from commit 246f741eb31799fec82cfb2908e34a330059f718) --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7bf1bcb..8c6486b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7205,7 +7205,7 @@ BOOL WINAPI GetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, LPBYTE pJob, static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { char *unixname, *queue, *cmd; - char fmt[] = "lpr -P%s %s"; + char fmt[] = "lpr -P'%s' '%s'"; DWORD len; int r;

1 0

Nikolay Sivov : comctl32/listview: Fix infinite loop case for full item range as a first search range.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 776938852700d5eea72831c08990a3162f1f440d URL: http://source.winehq.org/git/wine.git/?a=commit;h=776938852700d5eea72831c08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 11:03:25 2010 +0400 comctl32/listview: Fix infinite loop case for full item range as a first search range. (cherry picked from commit ce5a06c1b0428347048f9b37f96a3fda0dceef47) --- dlls/comctl32/listview.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4e13577..2ff37ba 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1855,8 +1855,9 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L } } - /* found something or second search completed with any result */ - if (nItem != -1 || endidx != infoPtr->nItemCount) + if ( nItem != -1 || /* found something */ + endidx != infoPtr->nItemCount || /* second search done */ + (startidx == 0 && endidx == infoPtr->nItemCount) /* full range for first search */ ) break; }; }

1 0

Austin English : kernel32: Add stub for SetFileValidData.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 003bc82b3904d0f5274b6bed6d6ec324c3e6680e URL: http://source.winehq.org/git/wine.git/?a=commit;h=003bc82b3904d0f5274b6bed6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 18 00:17:39 2010 -0700 kernel32: Add stub for SetFileValidData. (cherry picked from commit 7cd7851ca149101183ee90ea3b69e1ad7d55591a) --- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index edec6b0..dadaea6 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1001,6 +1001,16 @@ error: } /*********************************************************************** + * SetFileValidData (KERNEL32.@) + */ +BOOL WINAPI SetFileValidData( HANDLE hFile, LONGLONG ValidDataLength ) +{ + FIXME("stub: %p, %s\n", hFile, wine_dbgstr_longlong(ValidDataLength)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * GetFileTime (KERNEL32.@) */ BOOL WINAPI GetFileTime( HANDLE hFile, FILETIME *lpCreationTime, diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 843e97c..a0b729d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1028,7 +1028,7 @@ # @ stub SetFileShortNameA # @ stub SetFileShortNameW @ stdcall SetFileTime(long ptr ptr ptr) -# @ stub SetFileValidData +@ stdcall SetFileValidData(ptr double) # @ stub SetFirmwareEnvironmentVariableA # @ stub SetFirmwareEnvironmentVariableW @ stdcall SetHandleContext(long long)

1 0

Dmitry Timoshkov : gdi32: Make sure that all the glyph metrics are transformed before caching them.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 816124a2a5e0b7ba6b46d806cf3c2d323deda2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=816124a2a5e0b7ba6b46d806c… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 28 17:07:09 2010 +0900 gdi32: Make sure that all the glyph metrics are transformed before caching them. (cherry picked from commit 213d84be157398dea1fb70782f6bf7decd4d452a) --- dlls/gdi32/freetype.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9d88211..532278c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4704,14 +4704,11 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } - left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; - right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; - - adv = (INT)((ft_face->glyph->metrics.horiAdvance) + 63) >> 6; - lsb = left >> 6; - bbx = (right - left) >> 6; - if(!needsTransform) { + left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; + right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; + adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - ft_face->glyph->metrics.height) & -64; @@ -4720,6 +4717,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } else { INT xc, yc; FT_Vector vec; + + left = right = 0; + for(xc = 0; xc < 2; xc++) { for(yc = 0; yc < 2; yc++) { vec.x = (ft_face->glyph->metrics.horiBearingX + @@ -4756,6 +4756,9 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMatUnrotated); adv = (vec.x+63) >> 6; } + + lsb = left >> 6; + bbx = (right - left) >> 6; lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; lpgm->gmptGlyphOrigin.x = left >> 6;

1 0

Jacek Caban : widl: Define _WIN32 by default.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: b22822d1f1a3c806664e9a4cb30add6848edb6db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22822d1f1a3c806664e9a4cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 11:53:58 2010 +0200 widl: Define _WIN32 by default. (cherry picked from commit 06f3b94584fd064d5714e49e39ef648cc2330f85) --- tools/widl/widl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cc25201..c4aa91f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -694,6 +694,7 @@ int main(int argc,char *argv[]) if (do_server) server_token = dup_basename_token(server_name,"_s.c"); add_widl_version_define(); + wpp_add_define("_WIN32", NULL); atexit(rm_tempfile); if (!no_preprocess)

1 0

Detlef Riekenberg : wineps: Use winspool.drv for job management.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: stable Commit: 9e1259704a42abed6b4c6a8081734df817db8e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1259704a42abed6b4c6a808… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Aug 12 14:37:36 2010 +0200 wineps: Use winspool.drv for job management. (cherry picked from commit bd1941c3c214208949cc116fab32926bae0d2047) --- dlls/wineps.drv/escape.c | 152 +++++++++++----------------------------------- dlls/wineps.drv/psdrv.h | 1 + dlls/winspool.drv/info.c | 49 +++++++++++---- 3 files changed, 71 insertions(+), 131 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9e1259704a42abed6b4c6…

1 0