wine-commits October 2006

wine-commits@winehq.org

3 participants
1032 discussions

Mike McCormack : msi: Fix the ALTER and FREE keywords in the tokenizer.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 57443e01129a041b3adf2bc02d1089ff6d3c58f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57443e01129a041b3adf2bc02… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 14:33:05 2006 +0900 msi: Fix the ALTER and FREE keywords in the tokenizer. --- dlls/msi/tests/db.c | 4 ++-- dlls/msi/tokenize.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 134c12a..a445361 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2754,7 +2754,6 @@ static void test_alter(void) cond = MsiDatabaseIsTablePersistent(hdb, "T"); ok( cond == MSICONDITION_FALSE, "wrong return condition\n"); - todo_wine { query = "ALTER TABLE `T` HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to hold table %d\n", r); @@ -2766,8 +2765,8 @@ static void test_alter(void) query = "ALTER TABLE `T` FREE"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to free table\n"); - } + todo_wine { query = "ALTER TABLE `T` FREE"; r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to free table\n"); @@ -2775,6 +2774,7 @@ static void test_alter(void) query = "ALTER TABLE `T` HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to hold table %d\n", r); + } MsiCloseHandle( hdb ); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 6cd1dae..4866665 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -40,8 +40,8 @@ #define MAX_TOKEN_LEN 11 static const WCHAR ABORT_W[] = { 'A','B','O','R','T',0 }; static const WCHAR AFTER_W[] = { 'A','F','T','E','R',0 }; -static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; static const WCHAR ALL_W[] = { 'A','L','L',0 }; +static const WCHAR ALTER_W[] = { 'A','L','T','E','R',0 }; static const WCHAR AND_W[] = { 'A','N','D',0 }; static const WCHAR AS_W[] = { 'A','S',0 }; static const WCHAR ASC_W[] = { 'A','S','C',0 }; @@ -154,8 +154,8 @@ static const WCHAR WHERE_W[] = { 'W','H' static const Keyword aKeywordTable[] = { { ABORT_W, TK_ABORT }, { AFTER_W, TK_AFTER }, - { ALTER_W, TK_ALTER }, { ALL_W, TK_ALL }, + { ALTER_W, TK_ALTER }, { AND_W, TK_AND }, { AS_W, TK_AS }, { ASC_W, TK_ASC }, @@ -192,6 +192,7 @@ static const Keyword aKeywordTable[] = { { FAIL_W, TK_FAIL }, { FOR_W, TK_FOR }, { FOREIGN_W, TK_FOREIGN }, + { FREE_W, TK_FREE }, { FROM_W, TK_FROM }, { FULL_W, TK_JOIN_KW }, { GLOB_W, TK_GLOB },

1 0

Mike McCormack : msi: Mark components with missing or outdated files as incomplete.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: ddf0b593bb30beb2289dc1f49fc0cc88a67004fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf0b593bb30beb2289dc1f49… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 14:32:48 2006 +0900 msi: Mark components with missing or outdated files as incomplete. --- dlls/msi/action.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7cfd74d..c349a94 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2005,10 +2005,19 @@ static UINT ACTION_CostFinalize(MSIPACKA TRACE("file %s resolves to %s\n", debugstr_w(file->File), debugstr_w(file->TargetPath)); + /* don't check files of components that aren't installed */ + if (comp->Installed == INSTALLSTATE_UNKNOWN || + comp->Installed == INSTALLSTATE_ABSENT) + { + file->state = msifs_missing; /* assume files are missing */ + continue; + } + if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { file->state = msifs_missing; comp->Cost += file->FileSize; + comp->Installed = INSTALLSTATE_INCOMPLETE; continue; } @@ -2022,6 +2031,7 @@ static UINT ACTION_CostFinalize(MSIPACKA { file->state = msifs_overwrite; comp->Cost += file->FileSize; + comp->Installed = INSTALLSTATE_INCOMPLETE; } else file->state = msifs_present;

1 0

Mike McCormack : comctl32: Remove some more Nx1 assumptions.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: d9598c383c7fec6f77f6b703141bdc879d7f5993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9598c383c7fec6f77f6b7031… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 31 14:31:29 2006 +0900 comctl32: Remove some more Nx1 assumptions. --- dlls/comctl32/imagelist.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 60cde81..eac188e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -316,6 +316,7 @@ ImageList_AddMasked (HIMAGELIST himl, HB { hdcMask = himl->hdcMask; nMaskXOffset = nIndex * himl->cx; + imagelist_point_from_index( himl, nIndex, &pt ); } else { @@ -327,13 +328,14 @@ ImageList_AddMasked (HIMAGELIST himl, HB hMaskBitmap = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 1, 1, NULL); SelectObject(hdcMask, hMaskBitmap); nMaskXOffset = 0; + imagelist_point_from_index( himl, 0, &pt ); } /* create monochrome image to the mask bitmap */ bkColor = (clrMask != CLR_DEFAULT) ? clrMask : GetPixel (hdcBitmap, 0, 0); SetBkColor (hdcBitmap, bkColor); BitBlt (hdcMask, - nMaskXOffset, 0, bmp.bmWidth, bmp.bmHeight, + pt.x, pt.y, bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); @@ -2108,16 +2110,17 @@ ImageList_Remove (HIMAGELIST himl, INT i /* copy all images and masks prior to the "removed" image */ if (i > 0) { + POINT pt; + TRACE("Pre image copy: Copy %d images\n", i); SelectObject (hdcBmp, hbmNewImage); - BitBlt (hdcBmp, 0, 0, i * himl->cx, himl->cy, - himl->hdcImage, 0, 0, SRCCOPY); + imagelist_point_from_index(himl, i, &pt); + BitBlt (hdcBmp, 0, 0, pt.x, pt.y, himl->hdcImage, 0, 0, SRCCOPY); if (himl->hbmMask) { SelectObject (hdcBmp, hbmNewMask); - BitBlt (hdcBmp, 0, 0, i * himl->cx, himl->cy, - himl->hdcMask, 0, 0, SRCCOPY); + BitBlt (hdcBmp, 0, 0, pt.x, pt.y, himl->hdcMask, 0, 0, SRCCOPY); } } @@ -2179,6 +2182,7 @@ ImageList_Replace (HIMAGELIST himl, INT HDC hdcImage; BITMAP bmp; HBITMAP hOldBitmap; + POINT pt; TRACE("%p %d %p %p\n", himl, i, hbmImage, hbmMask); @@ -2198,7 +2202,8 @@ ImageList_Replace (HIMAGELIST himl, INT /* Replace Image */ hOldBitmap = SelectObject (hdcImage, hbmImage); - StretchBlt (himl->hdcImage, i * himl->cx, 0, himl->cx, himl->cy, + imagelist_point_from_index(himl, i, &pt); + StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); if (himl->hbmMask) @@ -2209,18 +2214,15 @@ ImageList_Replace (HIMAGELIST himl, INT hdcTemp = CreateCompatibleDC(0); hOldBitmapTemp = SelectObject(hdcTemp, hbmMask); - StretchBlt (himl->hdcMask, i * himl->cx, 0, himl->cx, himl->cy, + StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, hdcTemp, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); SelectObject(hdcTemp, hOldBitmapTemp); DeleteDC(hdcTemp); /* Remove the background from the image */ - BitBlt (himl->hdcImage, - i*himl->cx, 0, bmp.bmWidth, bmp.bmHeight, - himl->hdcMask, - i*himl->cx, 0, - 0x220326); /* NOTSRCAND */ + BitBlt (himl->hdcImage, pt.x, pt.y, bmp.bmWidth, bmp.bmHeight, + himl->hdcMask, pt.x, pt.y, 0x220326); /* NOTSRCAND */ } SelectObject (hdcImage, hOldBitmap); @@ -2255,6 +2257,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, ICONINFO ii; BITMAP bmp; BOOL ret; + POINT pt; TRACE("(%p %d %p)\n", himl, i, hIcon); @@ -2319,12 +2322,13 @@ ImageList_ReplaceIcon (HIMAGELIST himl, SetBkColor (himl->hdcImage, RGB(255,255,255)); hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); - StretchBlt (himl->hdcImage, nIndex * himl->cx, 0, himl->cx, himl->cy, + imagelist_point_from_index(himl, nIndex, &pt); + StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy, hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); if (himl->hbmMask) { SelectObject (hdcImage, ii.hbmMask); - StretchBlt (himl->hdcMask, nIndex * himl->cx, 0, himl->cx, himl->cy, + StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY); }

1 0

Jacek Caban : wininet: Inherit INET_CALLBACKW from parent handler.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 5c53baac8d4907c6ff9d87b684769a6b3ca29c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c53baac8d4907c6ff9d87b68… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 30 22:14:59 2006 +0100 wininet: Inherit INET_CALLBACKW from parent handler. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b85185e..c9a5698 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1007,6 +1007,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(L lpwhr->hdr.dwRefCount = 1; lpwhr->hdr.destroy = HTTP_CloseHTTPRequestHandle; lpwhr->hdr.lpfnStatusCB = lpwhs->hdr.lpfnStatusCB; + lpwhr->hdr.dwInternalFlags = lpwhs->hdr.dwInternalFlags & INET_CALLBACKW; WININET_AddRef( &lpwhs->hdr ); lpwhr->lpHttpSession = lpwhs; @@ -2401,7 +2402,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW lpwhs->hdr.htype = WH_HHTTPSESSION; lpwhs->hdr.dwFlags = dwFlags; lpwhs->hdr.dwContext = dwContext; - lpwhs->hdr.dwInternalFlags = dwInternalFlags; + lpwhs->hdr.dwInternalFlags = dwInternalFlags | (hIC->hdr.dwInternalFlags & INET_CALLBACKW); lpwhs->hdr.dwRefCount = 1; lpwhs->hdr.destroy = HTTP_CloseHTTPSessionHandle; lpwhs->hdr.lpfnStatusCB = hIC->hdr.lpfnStatusCB;

1 0

Jacek Caban : wininet: Use handle stored in WININETHANDLEHEADER instead of WININET_FindHandle.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 7bd385b714ed46a56ff86f5f572a0e79cf63f7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd385b714ed46a56ff86f5f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 30 22:13:52 2006 +0100 wininet: Use handle stored in WININETHANDLEHEADER instead of WININET_FindHandle. --- dlls/wininet/ftp.c | 16 +++------------- dlls/wininet/internet.c | 6 ------ dlls/wininet/internet.h | 1 - 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ded0155..32e1655 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1924,12 +1924,7 @@ static BOOL FTP_SendCommandA(INT nSocket if (lpfnStatusCB) { - HINTERNET hHandle = WININET_FindHandle( hdr ); - if( hHandle ) - { - lpfnStatusCB(hHandle, dwContext, INTERNET_STATUS_SENDING_REQUEST, NULL, 0); - WININET_Release( hdr ); - } + lpfnStatusCB(hdr->hInternet, dwContext, INTERNET_STATUS_SENDING_REQUEST, NULL, 0); } dwParamLen = lpszParam?strlen(lpszParam)+1:0; @@ -1953,13 +1948,8 @@ static BOOL FTP_SendCommandA(INT nSocket if (lpfnStatusCB) { - HINTERNET hHandle = WININET_FindHandle( hdr ); - if( hHandle ) - { - lpfnStatusCB(hHandle, dwContext, INTERNET_STATUS_REQUEST_SENT, - &nBytesSent, sizeof(DWORD)); - WININET_Release( hdr ); - } + lpfnStatusCB(hdr->hInternet, dwContext, INTERNET_STATUS_REQUEST_SENT, + &nBytesSent, sizeof(DWORD)); } TRACE("Sent %d bytes\n", nBytesSent); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 7ee0b88..1308e40 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -154,12 +154,6 @@ end: return info->hInternet = (HINTERNET) (handle+1); } -HINTERNET WININET_FindHandle( LPWININETHANDLEHEADER info ) -{ - WININET_AddRef(info); - return info->hInternet; -} - LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info ) { info->dwRefCount++; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 43b1c85..235e320 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -416,7 +416,6 @@ LPWININETHANDLEHEADER WININET_GetObject( LPWININETHANDLEHEADER WININET_AddRef( LPWININETHANDLEHEADER info ); BOOL WININET_Release( LPWININETHANDLEHEADER info ); BOOL WININET_FreeHandle( HINTERNET hinternet ); -HINTERNET WININET_FindHandle( LPWININETHANDLEHEADER info ); time_t ConvertTimeString(LPCWSTR asctime);

1 0

Andrew Talbot : hhctrl.ocx: Remove duplicate HeapFree().
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 1572dbde2b5095067ddd2ebf4d3e09167bc8bcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1572dbde2b5095067ddd2ebf4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Oct 30 21:54:55 2006 +0000 hhctrl.ocx: Remove duplicate HeapFree(). --- dlls/hhctrl.ocx/help.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 1ed1c8b..4713185 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -796,7 +796,6 @@ static void HH_Close(HHInfo *pHHInfo) HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszType); HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszCaption); HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszToc); - HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszType); HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszIndex); HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszFile); HeapFree(GetProcessHeap(), 0, (LPWSTR)pHHInfo->pHHWinType->pszHome);

1 0

Andrew Talbot : gdi32: Cast-qual warnings fix.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 17ec5aba207e075dc54db23fa344f408dfa08436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ec5aba207e075dc54db23fa… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Oct 30 21:06:56 2006 +0000 gdi32: Cast-qual warnings fix. --- dlls/gdi32/metafile.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 68a9b16..88a01d1 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1069,27 +1069,28 @@ #undef META_UNIMP */ HMETAFILE WINAPI SetMetaFileBitsEx( UINT size, const BYTE *lpData ) { - METAHEADER *mh = (METAHEADER *)lpData; + const METAHEADER *mh_in = (const METAHEADER *)lpData; + METAHEADER *mh_out; if (size & 1) return 0; - if (!size || mh->mtType != METAFILE_MEMORY || mh->mtVersion != MFVERSION || - mh->mtHeaderSize != sizeof(METAHEADER) / 2) + if (!size || mh_in->mtType != METAFILE_MEMORY || mh_in->mtVersion != MFVERSION || + mh_in->mtHeaderSize != sizeof(METAHEADER) / 2) { SetLastError(ERROR_INVALID_DATA); return 0; } - mh = HeapAlloc( GetProcessHeap(), 0, size ); - if (!mh) + mh_out = HeapAlloc( GetProcessHeap(), 0, size ); + if (!mh_out) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } - memcpy(mh, lpData, size); - mh->mtSize = size / 2; - return MF_Create_HMETAFILE(mh); + memcpy(mh_out, mh_in, size); + mh_out->mtSize = size / 2; + return MF_Create_HMETAFILE(mh_out); } /*****************************************************************

1 0

Andrew Talbot : gdi32: Cast-qual warnings fix.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 58df7b660573e6d4c4ebdc6224fc277084a78bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=58df7b660573e6d4c4ebdc622… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Oct 30 21:05:43 2006 +0000 gdi32: Cast-qual warnings fix. --- dlls/gdi32/freetype.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cbbe5fe..53ebd19 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1186,7 +1186,8 @@ #ifdef HAVE_FONTCONFIG_FONTCONFIG_H FcObjectSet *os; FcFontSet *fontset; int i, len; - const char *file, *ext; + char *file; + const char *ext; fc_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0); if(!fc_handle) {

1 0

Louis. Lenders : msvcrt: Add stub for _setmaxstdio + tiny test.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: 32ffc7cb8a1c39800dc4ae6a43079b17d18feb08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32ffc7cb8a1c39800dc4ae6a4… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 30 20:50:32 2006 +0000 msvcrt: Add stub for _setmaxstdio + tiny test. --- dlls/msvcrt/file.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/file.c | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1956a7c..1624f84 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3090,6 +3090,20 @@ int CDECL _getmaxstdio(void) } /********************************************************************* + * _setmaxstdio_ (MSVCRT.@) + */ +int CDECL _setmaxstdio(int newmax) +{ + int res; + if( newmax > 2048) + res = -1; + else + res = newmax; + FIXME("stub: setting new maximum for number of simultaneously open files not implemented,returning %d\n",res); + return res; +} + +/********************************************************************* * __pioinfo (MSVCRT.@) * FIXME: see MSVCRT_MAX_FILES define. */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6a46798..dc78679 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -431,7 +431,7 @@ # extern _pwctype @ cdecl _seterrormode(long) @ cdecl -i386 -norelay _setjmp(ptr) MSVCRT__setjmp @ cdecl -i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -@ stub _setmaxstdio #(long) +@ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) @ stub _setsystime #(ptr long) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index bd4bd5f..d33d7ab 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -788,6 +788,12 @@ static void test_get_osfhandle(void) _unlink(fname); } +static void test_setmaxstdio(void) +{ + ok(2048 == _setmaxstdio(2048),"_setmaxstdio returned %d instead of 2048\n",_setmaxstdio(2048)); + ok(-1 == _setmaxstdio(2049),"_setmaxstdio returned %d instead of -1\n",_setmaxstdio(2049)); +} + START_TEST(file) { int arg_c; @@ -818,4 +824,5 @@ START_TEST(file) test_file_put_get(); test_tmpnam(); test_get_osfhandle(); + test_setmaxstdio(); }

1 0

Kovács András : wined3d: Fix introduced regression in shader_glsl_mnxn and vshader_hw_mnxn.
by Alexandre Julliard 31 Oct '06

31 Oct '06

Module: wine Branch: master Commit: eb7b1f4bced562788972aa30d0ddcacc88f56def URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7b1f4bced562788972aa30d… Author: Kovács András <andras(a)csevego.net> Date: Mon Oct 30 20:27:01 2006 +0100 wined3d: Fix introduced regression in shader_glsl_mnxn and vshader_hw_mnxn. --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/glsl_shader.c | 10 +++++----- dlls/wined3d/vertexshader.c | 3 ++- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index abc9c5c..736edde 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -854,23 +854,23 @@ void vshader_hw_mnxn(SHADER_OPCODE_ARG* switch(arg->opcode->opcode) { case WINED3DSIO_M4x4: nComponents = 4; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); break; case WINED3DSIO_M4x3: nComponents = 3; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); break; case WINED3DSIO_M3x4: nComponents = 4; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); break; case WINED3DSIO_M3x3: nComponents = 3; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); break; case WINED3DSIO_M3x2: nComponents = 2; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); break; default: break; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0eb8847..86d9fc9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1140,23 +1140,23 @@ void shader_glsl_mnxn(SHADER_OPCODE_ARG* switch(arg->opcode->opcode) { case WINED3DSIO_M4x4: nComponents = 4; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); break; case WINED3DSIO_M4x3: nComponents = 3; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP4]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP4); break; case WINED3DSIO_M3x4: nComponents = 4; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); break; case WINED3DSIO_M3x3: nComponents = 3; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); break; case WINED3DSIO_M3x2: nComponents = 2; - tmpArg.opcode = &IWineD3DVertexShaderImpl_shader_ins[WINED3DSIO_DP3]; + tmpArg.opcode = shader_get_opcode(arg->shader, WINED3DSIO_DP3); break; default: break; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d7fcc96..4dac214 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -473,7 +473,8 @@ static void vshader_texldl(WINED3DSHADER } CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { - + /* This table is not order or position dependent. */ + /* Arithmetic */ {WINED3DSIO_NOP, "nop", "NOP", 0, 0, vshader_nop, vshader_hw_map2gl, NULL, 0, 0}, {WINED3DSIO_MOV, "mov", "MOV", 1, 2, vshader_mov, vshader_hw_map2gl, shader_glsl_mov, 0, 0},

1 0

← Newer
1
2
3
4
5
6
7
...
104
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2006