November 2011 - Wine-commits

Dmitry Timoshkov : kernel32: Add a test for main module image section protections.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: ed95814ed8b6252c0f122755d04c8fab4a8d3939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed95814ed8b6252c0f122755d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 22 18:02:51 2011 +0800 kernel32: Add a test for main module image section protections. --- dlls/kernel32/tests/loader.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 8f88907..3bc7540 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -604,6 +604,7 @@ static void test_section_access(void) }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; + char buf[256]; int i; DWORD dummy, file_align; HANDLE hfile; @@ -613,7 +614,9 @@ static void test_section_access(void) char dll_name[MAX_PATH]; SIZE_T size; MEMORY_BASIC_INFORMATION info; - BOOL ret; + STARTUPINFO sti; + PROCESS_INFORMATION pi; + DWORD ret; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -642,6 +645,9 @@ static void test_section_access(void) nt_header.FileHeader.NumberOfSections = 1; nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); + /* don't set IMAGE_FILE_DLL to show that it doesn't change anything for a DLL or a process image */ + nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; + nt_header.OptionalHeader.SectionAlignment = si.dwPageSize; nt_header.OptionalHeader.FileAlignment = 0x200; nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER) + si.dwPageSize; @@ -717,6 +723,45 @@ static void test_section_access(void) ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); + memset(&sti, 0, sizeof(sti)); + sti.cb = sizeof(sti); + SetLastError(0xdeadbeef); + ret = CreateProcess(dll_name, NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &sti, &pi); + ok(ret, "CreateProcess() error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + size = VirtualQueryEx(pi.hProcess, (char *)hlib + section.VirtualAddress, &info, sizeof(info)); + ok(size == sizeof(info), + "%d: VirtualQuery error %d\n", i, GetLastError()); + ok(info.BaseAddress == (char *)hlib + section.VirtualAddress, "%d: got %p != expected %p\n", i, info.BaseAddress, (char *)hlib + section.VirtualAddress); + ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); + /* FIXME: remove the condition below once Wine is fixed */ + if ((td[i].scn_file_access & IMAGE_SCN_MEM_WRITE) && + (td[i].scn_file_access & IMAGE_SCN_CNT_UNINITIALIZED_DATA)) + todo_wine ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + else + ok(info.Protect == td[i].scn_page_access, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].scn_page_access); + ok(info.AllocationBase == hlib, "%d: %p != %p\n", i, info.AllocationBase, hlib); + ok(info.AllocationProtect == PAGE_EXECUTE_WRITECOPY, "%d: %#x != PAGE_EXECUTE_WRITECOPY\n", i, info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%d: %#x != MEM_COMMIT\n", i, info.State); + ok(info.Type == SEC_IMAGE, "%d: %#x != SEC_IMAGE\n", i, info.Type); + if (info.Protect != PAGE_NOACCESS) + { + SetLastError(0xdeadbeef); + ret = ReadProcessMemory(pi.hProcess, info.BaseAddress, buf, section.SizeOfRawData, NULL); + ok(ret, "ReadProcessMemory() error %d\n", GetLastError()); + ok(!memcmp(buf, section_data, section.SizeOfRawData), "wrong section data\n"); + } + + SetLastError(0xdeadbeef); + ret = TerminateProcess(pi.hProcess, 0); + ok(ret, "TerminateProcess() error %d\n", GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError());

1 0

Alexandre Julliard : gdi32: Use reallocs when growing a path instead of doing it by hand.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 26b1bfa52b982a943c1f4549209e7ee6c4f22419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b1bfa52b982a943c1f45492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:22:36 2011 +0100 gdi32: Use reallocs when growing a path instead of doing it by hand. --- dlls/gdi32/path.c | 58 ++++++++++++---------------------------------------- 1 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index dfe15ed..6cf92df 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -74,8 +74,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); */ #define NUM_ENTRIES_INITIAL 16 /* Initial size of points / flags arrays */ -#define GROW_FACTOR_NUMER 2 /* Numerator of grow factor for the array */ -#define GROW_FACTOR_DENOM 1 /* Denominator of grow factor */ /* A floating point version of the POINT structure */ typedef struct tagFLOAT_POINT @@ -144,59 +142,31 @@ static void PATH_EmptyPath(GdiPath *pPath) * been allocated; allocates larger arrays and copies the existing entries * to those arrays, if necessary. Returns TRUE if successful, else FALSE. */ -static BOOL PATH_ReserveEntries(GdiPath *pPath, INT numEntries) +static BOOL PATH_ReserveEntries(GdiPath *pPath, INT count) { - INT numEntriesToAllocate; POINT *pPointsNew; BYTE *pFlagsNew; - assert(numEntries>=0); + assert(count>=0); /* Do we have to allocate more memory? */ - if(numEntries > pPath->numEntriesAllocated) + if(count > pPath->numEntriesAllocated) { /* Find number of entries to allocate. We let the size of the array * grow exponentially, since that will guarantee linear time * complexity. */ - if(pPath->numEntriesAllocated) - { - numEntriesToAllocate=pPath->numEntriesAllocated; - while(numEntriesToAllocate<numEntries) - numEntriesToAllocate=numEntriesToAllocate*GROW_FACTOR_NUMER/ - GROW_FACTOR_DENOM; - } - else - numEntriesToAllocate=numEntries; + count = max( pPath->numEntriesAllocated * 2, count ); - /* Allocate new arrays */ - pPointsNew=HeapAlloc( GetProcessHeap(), 0, numEntriesToAllocate * sizeof(POINT) ); - if(!pPointsNew) - return FALSE; - pFlagsNew=HeapAlloc( GetProcessHeap(), 0, numEntriesToAllocate * sizeof(BYTE) ); - if(!pFlagsNew) - { - HeapFree( GetProcessHeap(), 0, pPointsNew ); - return FALSE; - } - - /* Copy old arrays to new arrays and discard old arrays */ - if(pPath->pPoints) - { - assert(pPath->pFlags); + pPointsNew = HeapReAlloc( GetProcessHeap(), 0, pPath->pPoints, count * sizeof(POINT) ); + if (!pPointsNew) return FALSE; + pPath->pPoints = pPointsNew; - memcpy(pPointsNew, pPath->pPoints, - sizeof(POINT)*pPath->numEntriesUsed); - memcpy(pFlagsNew, pPath->pFlags, - sizeof(BYTE)*pPath->numEntriesUsed); + pFlagsNew = HeapReAlloc( GetProcessHeap(), 0, pPath->pFlags, count * sizeof(BYTE) ); + if (!pFlagsNew) return FALSE; + pPath->pFlags = pFlagsNew; - HeapFree( GetProcessHeap(), 0, pPath->pPoints ); - HeapFree( GetProcessHeap(), 0, pPath->pFlags ); - } - pPath->pPoints=pPointsNew; - pPath->pFlags=pFlagsNew; - pPath->numEntriesAllocated=numEntriesToAllocate; + pPath->numEntriesAllocated = count; } - return TRUE; }

1 0

Alexandre Julliard : gdi32: Add helper functions for allocating and freeing paths.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 7698b636e740a171ce1da2f7eed16a0cdacd02ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7698b636e740a171ce1da2f7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:21:33 2011 +0100 gdi32: Add helper functions for allocating and freeing paths. --- dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/path.c | 58 ++++++++++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2bce47c..0868e14 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -84,7 +84,7 @@ typedef enum tagGdiPathState PATH_Closed } GdiPathState; -typedef struct tagGdiPath +typedef struct gdi_path { GdiPathState state; POINT *pPoints; diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 6cf92df..5c7e302 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -100,6 +100,36 @@ static inline void pop_path_driver( DC *dc ) HeapFree( GetProcessHeap(), 0, dev ); } +static void free_gdi_path( struct gdi_path *path ) +{ + HeapFree( GetProcessHeap(), 0, path->pPoints ); + HeapFree( GetProcessHeap(), 0, path->pFlags ); + HeapFree( GetProcessHeap(), 0, path ); +} + +static struct gdi_path *alloc_gdi_path(void) +{ + struct gdi_path *path = HeapAlloc( GetProcessHeap(), 0, sizeof(*path) ); + + if (!path) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } + path->pPoints = HeapAlloc( GetProcessHeap(), 0, NUM_ENTRIES_INITIAL * sizeof(*path->pPoints) ); + path->pFlags = HeapAlloc( GetProcessHeap(), 0, NUM_ENTRIES_INITIAL * sizeof(*path->pFlags) ); + if (!path->pPoints || !path->pFlags) + { + free_gdi_path( path ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } + path->state = PATH_Open; + path->numEntriesUsed = 0; + path->numEntriesAllocated = NUM_ENTRIES_INITIAL; + path->newStroke = TRUE; + return path; +} /* Performs a world-to-viewport transformation on the specified point (which * is in floating point format). @@ -1808,9 +1838,7 @@ static BOOL PATH_WidenPath(DC *dc) else pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); if(!pStrokes) return FALSE; - pStrokes[numStrokes - 1] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pStrokes[numStrokes - 1]); - pStrokes[numStrokes - 1]->state = PATH_Open; + pStrokes[numStrokes - 1] = alloc_gdi_path(); /* fall through */ case PT_LINETO: case (PT_LINETO | PT_CLOSEFIGURE): @@ -1828,17 +1856,11 @@ static BOOL PATH_WidenPath(DC *dc) } } - pNewPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pNewPath); - pNewPath->state = PATH_Open; + pNewPath = alloc_gdi_path(); for(i = 0; i < numStrokes; i++) { - pUpPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pUpPath); - pUpPath->state = PATH_Open; - pDownPath = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pDownPath); - pDownPath->state = PATH_Open; + pUpPath = alloc_gdi_path(); + pDownPath = alloc_gdi_path(); for(j = 0; j < pStrokes[i]->numEntriesUsed; j++) { /* Beginning or end of the path if not closed */ @@ -2022,20 +2044,16 @@ static BOOL PATH_WidenPath(DC *dc) PATH_AddEntry(pNewPath, &pt, ( (j == 0 && (pStrokes[i]->pFlags[pStrokes[i]->numEntriesUsed - 1] & PT_CLOSEFIGURE)) ? PT_MOVETO : PT_LINETO)); } - PATH_DestroyGdiPath(pStrokes[i]); - HeapFree(GetProcessHeap(), 0, pStrokes[i]); - PATH_DestroyGdiPath(pUpPath); - HeapFree(GetProcessHeap(), 0, pUpPath); - PATH_DestroyGdiPath(pDownPath); - HeapFree(GetProcessHeap(), 0, pDownPath); + free_gdi_path( pStrokes[i] ); + free_gdi_path( pUpPath ); + free_gdi_path( pDownPath ); } HeapFree(GetProcessHeap(), 0, pStrokes); pNewPath->state = PATH_Closed; if (!(ret = PATH_AssignGdiPath(pPath, pNewPath))) ERR("Assign path failed\n"); - PATH_DestroyGdiPath(pNewPath); - HeapFree(GetProcessHeap(), 0, pNewPath); + free_gdi_path( pNewPath ); return ret; }

1 0

Alexandre Julliard : gdi32: Return the region directly from PATH_PathToRegion.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: ac1643caecd9a3cb7130b8df7db26ab885c46294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1643caecd9a3cb7130b8df7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:31:27 2011 +0100 gdi32: Return the region directly from PATH_PathToRegion. --- dlls/gdi32/path.c | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 5c7e302..cb45f29 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -379,13 +379,9 @@ static BOOL PATH_FlattenPath(GdiPath *pPath) /* PATH_PathToRegion * * Creates a region from the specified path using the specified polygon - * filling mode. The path is left unchanged. A handle to the region that - * was created is stored in *pHrgn. If successful, TRUE is returned; if an - * error occurs, SetLastError is called with the appropriate value and - * FALSE is returned. + * filling mode. The path is left unchanged. */ -static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, - HRGN *pHrgn) +static HRGN PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode) { int numStrokes, iStroke, i; INT *pNumPointsInStroke; @@ -407,7 +403,7 @@ static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, if(!pNumPointsInStroke) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; + return 0; } /* Second pass: remember number of points in each polygon */ @@ -428,18 +424,8 @@ static BOOL PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode, hrgn=CreatePolyPolygonRgn(pPath->pPoints, pNumPointsInStroke, numStrokes, nPolyFillMode); - /* Free memory for number-of-points-in-stroke array */ HeapFree( GetProcessHeap(), 0, pNumPointsInStroke ); - - if(hrgn==NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Success! */ - *pHrgn=hrgn; - return TRUE; + return hrgn; } /* PATH_ScaleNormalizedPoint @@ -689,10 +675,8 @@ HRGN WINAPI PathToRegion(HDC hdc) else { /* FIXME: Should we empty the path even if conversion failed? */ - if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgnRval)) - PATH_EmptyPath(pPath); - else - hrgnRval=0; + hrgnRval = PATH_PathToRegion(pPath, GetPolyFillMode(hdc)); + if (hrgnRval) PATH_EmptyPath(pPath); } release_dc_ptr( dc ); return hrgnRval; @@ -707,7 +691,7 @@ static BOOL PATH_FillPath( HDC hdc, GdiPath *pPath ) HRGN hrgn; /* Construct a region from the path and fill it */ - if(PATH_PathToRegion(pPath, GetPolyFillMode(hdc), &hrgn)) + if ((hrgn = PATH_PathToRegion(pPath, GetPolyFillMode(hdc)))) { /* Since PaintRgn interprets the region as being in logical coordinates * but the points we store for the path are already in device @@ -2164,7 +2148,7 @@ BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - if (!PATH_PathToRegion( &dc->path, GetPolyFillMode(dev->hdc), &hrgn )) return FALSE; + if (!(hrgn = PATH_PathToRegion( &dc->path, GetPolyFillMode(dev->hdc)))) return FALSE; ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; if (ret) PATH_EmptyPath( &dc->path ); /* FIXME: Should this function delete the path even if it failed? */

1 0

Alexandre Julliard : gdi32: Return a new path from PATH_FlattenPath instead of replacing the DC path.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: f388827c8df8a747cfb9bdf2e9f8ed3656763318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f388827c8df8a747cfb9bdf2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:41:33 2011 +0100 gdi32: Return a new path from PATH_FlattenPath instead of replacing the DC path. --- dlls/gdi32/path.c | 83 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index cb45f29..35069e1 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -349,31 +349,36 @@ static BOOL PATH_AddFlatBezier(GdiPath *pPath, POINT *pt, BOOL closed) * Replaces Beziers with line segments * */ -static BOOL PATH_FlattenPath(GdiPath *pPath) +static struct gdi_path *PATH_FlattenPath(const struct gdi_path *pPath) { - GdiPath newPath; + struct gdi_path *new_path; INT srcpt; - memset(&newPath, 0, sizeof(newPath)); - newPath.state = PATH_Open; + if (!(new_path = alloc_gdi_path())) return NULL; + for(srcpt = 0; srcpt < pPath->numEntriesUsed; srcpt++) { switch(pPath->pFlags[srcpt] & ~PT_CLOSEFIGURE) { case PT_MOVETO: case PT_LINETO: - PATH_AddEntry(&newPath, &pPath->pPoints[srcpt], - pPath->pFlags[srcpt]); + if (!PATH_AddEntry(new_path, &pPath->pPoints[srcpt], pPath->pFlags[srcpt])) + { + free_gdi_path( new_path ); + return NULL; + } break; case PT_BEZIERTO: - PATH_AddFlatBezier(&newPath, &pPath->pPoints[srcpt-1], - pPath->pFlags[srcpt+2] & PT_CLOSEFIGURE); + if (!PATH_AddFlatBezier(new_path, &pPath->pPoints[srcpt-1], + pPath->pFlags[srcpt+2] & PT_CLOSEFIGURE)) + { + free_gdi_path( new_path ); + return NULL; + } srcpt += 2; break; } } - newPath.state = PATH_Closed; - PATH_AssignGdiPath(pPath, &newPath); - PATH_DestroyGdiPath(&newPath); - return TRUE; + new_path->state = PATH_Closed; + return new_path; } /* PATH_PathToRegion @@ -381,37 +386,39 @@ static BOOL PATH_FlattenPath(GdiPath *pPath) * Creates a region from the specified path using the specified polygon * filling mode. The path is left unchanged. */ -static HRGN PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode) +static HRGN PATH_PathToRegion(const struct gdi_path *pPath, INT nPolyFillMode) { + struct gdi_path *rgn_path; int numStrokes, iStroke, i; INT *pNumPointsInStroke; HRGN hrgn; - PATH_FlattenPath(pPath); + if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0; /* FIXME: What happens when number of points is zero? */ /* First pass: Find out how many strokes there are in the path */ /* FIXME: We could eliminate this with some bookkeeping in GdiPath */ numStrokes=0; - for(i=0; i<pPath->numEntriesUsed; i++) - if((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) + for(i=0; i<rgn_path->numEntriesUsed; i++) + if((rgn_path->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) numStrokes++; /* Allocate memory for number-of-points-in-stroke array */ pNumPointsInStroke=HeapAlloc( GetProcessHeap(), 0, sizeof(int) * numStrokes ); if(!pNumPointsInStroke) { + free_gdi_path( rgn_path ); SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } /* Second pass: remember number of points in each polygon */ iStroke=-1; /* Will get incremented to 0 at beginning of first stroke */ - for(i=0; i<pPath->numEntriesUsed; i++) + for(i=0; i<rgn_path->numEntriesUsed; i++) { /* Is this the beginning of a new stroke? */ - if((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) + if((rgn_path->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO) { iStroke++; pNumPointsInStroke[iStroke]=0; @@ -421,10 +428,11 @@ static HRGN PATH_PathToRegion(GdiPath *pPath, INT nPolyFillMode) } /* Create a region from the strokes */ - hrgn=CreatePolyPolygonRgn(pPath->pPoints, pNumPointsInStroke, + hrgn=CreatePolyPolygonRgn(rgn_path->pPoints, pNumPointsInStroke, numStrokes, nPolyFillMode); HeapFree( GetProcessHeap(), 0, pNumPointsInStroke ); + free_gdi_path( rgn_path ); return hrgn; } @@ -1751,14 +1759,11 @@ static BOOL PATH_WidenPath(DC *dc) { INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; BOOL ret = FALSE; - GdiPath *pPath, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; + struct gdi_path *flat_path; + GdiPath *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; - pPath = &dc->path; - - PATH_FlattenPath(pPath); - size = GetObjectW( dc->hPen, 0, NULL ); if (!size) { SetLastError(ERROR_CAN_NOT_COMPLETE); @@ -1794,6 +1799,8 @@ static BOOL PATH_WidenPath(DC *dc) return FALSE; } + if (!(flat_path = PATH_FlattenPath( &dc->path ))) return FALSE; + penWidthIn = penWidth / 2; penWidthOut = penWidth / 2; if(penWidthIn + penWidthOut < penWidth) @@ -1801,16 +1808,17 @@ static BOOL PATH_WidenPath(DC *dc) numStrokes = 0; - for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) { + for(i = 0, j = 0; i < flat_path->numEntriesUsed; i++, j++) { POINT point; - if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE)) && - (pPath->pFlags[i] != PT_MOVETO)) { + if((i == 0 || (flat_path->pFlags[i-1] & PT_CLOSEFIGURE)) && + (flat_path->pFlags[i] != PT_MOVETO)) { ERR("Expected PT_MOVETO %s, got path flag %c\n", i == 0 ? "as first point" : "after PT_CLOSEFIGURE", - pPath->pFlags[i]); + flat_path->pFlags[i]); + free_gdi_path( flat_path ); return FALSE; } - switch(pPath->pFlags[i]) { + switch(flat_path->pFlags[i]) { case PT_MOVETO: if(numStrokes > 0) { pStrokes[numStrokes - 1]->state = PATH_Closed; @@ -1826,16 +1834,16 @@ static BOOL PATH_WidenPath(DC *dc) /* fall through */ case PT_LINETO: case (PT_LINETO | PT_CLOSEFIGURE): - point.x = pPath->pPoints[i].x; - point.y = pPath->pPoints[i].y; - PATH_AddEntry(pStrokes[numStrokes - 1], &point, pPath->pFlags[i]); + point.x = flat_path->pPoints[i].x; + point.y = flat_path->pPoints[i].y; + PATH_AddEntry(pStrokes[numStrokes - 1], &point, flat_path->pFlags[i]); break; case PT_BEZIERTO: /* should never happen because of the FlattenPath call */ ERR("Should never happen\n"); break; default: - ERR("Got path flag %c\n", pPath->pFlags[i]); + ERR("Got path flag %c\n", flat_path->pFlags[i]); return FALSE; } } @@ -2033,9 +2041,10 @@ static BOOL PATH_WidenPath(DC *dc) free_gdi_path( pDownPath ); } HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path( flat_path ); pNewPath->state = PATH_Closed; - if (!(ret = PATH_AssignGdiPath(pPath, pNewPath))) + if (!(ret = PATH_AssignGdiPath(&dc->path, pNewPath))) ERR("Assign path failed\n"); free_gdi_path( pNewPath ); return ret; @@ -2203,13 +2212,17 @@ BOOL nulldrv_StrokePath( PHYSDEV dev ) BOOL nulldrv_FlattenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); + struct gdi_path *path; if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - return PATH_FlattenPath( &dc->path ); + if (!(path = PATH_FlattenPath( &dc->path ))) return FALSE; + PATH_AssignGdiPath( &dc->path, path ); + free_gdi_path( path ); + return TRUE; } BOOL nulldrv_WidenPath( PHYSDEV dev )

1 0

Alexandre Julliard : gdi32: Return a new path from PATH_WidenPath instead of replacing the DC path.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: ddc9860a4295b9c1502b696a4e58dc2b928dece3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc9860a4295b9c1502b696a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 11:44:31 2011 +0100 gdi32: Return a new path from PATH_WidenPath instead of replacing the DC path. --- dlls/gdi32/path.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 35069e1..a8c9c89 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1755,19 +1755,17 @@ static BOOL PATH_StrokePath( HDC hdc, GdiPath *pPath ) #define round(x) ((int)((x)>0?(x)+0.5:(x)-0.5)) -static BOOL PATH_WidenPath(DC *dc) +static struct gdi_path *PATH_WidenPath(DC *dc) { INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; - BOOL ret = FALSE; - struct gdi_path *flat_path; - GdiPath *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; + struct gdi_path *flat_path, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; size = GetObjectW( dc->hPen, 0, NULL ); if (!size) { SetLastError(ERROR_CAN_NOT_COMPLETE); - return FALSE; + return NULL; } elp = HeapAlloc( GetProcessHeap(), 0, size ); @@ -1783,7 +1781,7 @@ static BOOL PATH_WidenPath(DC *dc) else { SetLastError(ERROR_CAN_NOT_COMPLETE); HeapFree( GetProcessHeap(), 0, elp ); - return FALSE; + return NULL; } penWidth = elp->elpWidth; @@ -1796,10 +1794,10 @@ static BOOL PATH_WidenPath(DC *dc) /* The function cannot apply to cosmetic pens */ if(obj_type == OBJ_EXTPEN && penType == PS_COSMETIC) { SetLastError(ERROR_CAN_NOT_COMPLETE); - return FALSE; + return NULL; } - if (!(flat_path = PATH_FlattenPath( &dc->path ))) return FALSE; + if (!(flat_path = PATH_FlattenPath( &dc->path ))) return NULL; penWidthIn = penWidth / 2; penWidthOut = penWidth / 2; @@ -1816,7 +1814,7 @@ static BOOL PATH_WidenPath(DC *dc) i == 0 ? "as first point" : "after PT_CLOSEFIGURE", flat_path->pFlags[i]); free_gdi_path( flat_path ); - return FALSE; + return NULL; } switch(flat_path->pFlags[i]) { case PT_MOVETO: @@ -1829,7 +1827,7 @@ static BOOL PATH_WidenPath(DC *dc) pStrokes = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath*)); else pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); - if(!pStrokes) return FALSE; + if(!pStrokes) return NULL; pStrokes[numStrokes - 1] = alloc_gdi_path(); /* fall through */ case PT_LINETO: @@ -1844,7 +1842,7 @@ static BOOL PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->pFlags[i]); - return FALSE; + return NULL; } } @@ -2044,10 +2042,7 @@ static BOOL PATH_WidenPath(DC *dc) free_gdi_path( flat_path ); pNewPath->state = PATH_Closed; - if (!(ret = PATH_AssignGdiPath(&dc->path, pNewPath))) - ERR("Assign path failed\n"); - free_gdi_path( pNewPath ); - return ret; + return pNewPath; } @@ -2228,13 +2223,17 @@ BOOL nulldrv_FlattenPath( PHYSDEV dev ) BOOL nulldrv_WidenPath( PHYSDEV dev ) { DC *dc = get_nulldrv_dc( dev ); + struct gdi_path *path; if (dc->path.state != PATH_Closed) { SetLastError( ERROR_CAN_NOT_COMPLETE ); return FALSE; } - return PATH_WidenPath( dc ); + if (!(path = PATH_WidenPath( dc ))) return FALSE; + PATH_AssignGdiPath( &dc->path, path ); + free_gdi_path( path ); + return TRUE; } const struct gdi_dc_funcs path_driver =

1 0

Michael Stefaniuc : qedit/tests: Add SampleGrabber COM aggregation test.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 24da40fa8556e247bb2521ac4ad920ad51532883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24da40fa8556e247bb2521ac4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 21 14:46:57 2011 +0100 qedit/tests: Add SampleGrabber COM aggregation test. --- dlls/qedit/tests/mediadet.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index de9b3a4..1d9a2f1 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include "initguid.h" #include "ole2.h" @@ -28,6 +29,47 @@ #include "qedit.h" #include "rc.h" +/* Outer IUnknown for COM aggregation tests */ +struct unk_impl { + IUnknown IUnknown_iface; + LONG ref; + IUnknown *inner_unk; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return IUnknown_QueryInterface(This->inner_unk, riid, ppv); +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + + static WCHAR test_avi_filename[MAX_PATH]; static WCHAR test_sound_avi_filename[MAX_PATH]; @@ -294,6 +336,31 @@ static void test_mediadet(void) DeleteFileW(test_sound_avi_filename); } +static void test_samplegrabber(void) +{ + struct unk_impl unk_obj = {{&unk_vtbl}, 19, NULL}; + ISampleGrabber *sg; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_SampleGrabber, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&unk_obj.inner_unk); + todo_wine ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + if (hr != S_OK) return; + + hr = IUnknown_QueryInterface(unk_obj.inner_unk, &IID_ISampleGrabber, (void**)&sg); + ok(hr == S_OK, "QueryInterface for IID_ISampleGrabber failed: %08x\n", hr); + refcount = ISampleGrabber_AddRef(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == unk_obj.ref, "SampleGrabber just pretends to support COM aggregation\n"); + refcount = ISampleGrabber_Release(sg); + ok(refcount == 19, "Refcount should be back at 19 but is %u\n", refcount); + + IUnknown_Release(unk_obj.inner_unk); +} + START_TEST(mediadet) { if (!init_tests()) @@ -304,5 +371,6 @@ START_TEST(mediadet) CoInitialize(NULL); test_mediadet(); + test_samplegrabber(); CoUninitialize(); }

1 0

Francois Gouget : gphoto2.ds: Remove an unused and untranslatable listview label.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: cc1bfa79691fa0ccaf4c3ee2e531c98708eda222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1bfa79691fa0ccaf4c3ee2e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 21 17:56:20 2011 +0100 gphoto2.ds: Remove an unused and untranslatable listview label. Spotted by Luca Bennati. --- dlls/gphoto2.ds/gphoto2_Da.rc | 2 +- dlls/gphoto2.ds/gphoto2_De.rc | 2 +- dlls/gphoto2.ds/gphoto2_En.rc | 2 +- dlls/gphoto2.ds/gphoto2_Es.rc | 2 +- dlls/gphoto2.ds/gphoto2_Fr.rc | 2 +- dlls/gphoto2.ds/gphoto2_He.rc | 2 +- dlls/gphoto2.ds/gphoto2_Hu.rc | 2 +- dlls/gphoto2.ds/gphoto2_It.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ja.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ko.rc | 2 +- dlls/gphoto2.ds/gphoto2_Lt.rc | 2 +- dlls/gphoto2.ds/gphoto2_Nl.rc | 2 +- dlls/gphoto2.ds/gphoto2_No.rc | 2 +- dlls/gphoto2.ds/gphoto2_Pl.rc | 2 +- dlls/gphoto2.ds/gphoto2_Pt.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ro.rc | 2 +- dlls/gphoto2.ds/gphoto2_Ru.rc | 2 +- dlls/gphoto2.ds/gphoto2_Si.rc | 2 +- dlls/gphoto2.ds/gphoto2_Sr.rc | 2 +- dlls/gphoto2.ds/gphoto2_Sv.rc | 2 +- dlls/gphoto2.ds/gphoto2_Uk.rc | 2 +- dlls/gphoto2.ds/gphoto2_Zh.rc | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc1bfa79691fa0ccaf4c3…

1 0

Henri Verbeet : wined3d: Recognize the SM4 udiv opcode.
by Alexandre Julliard 22 Nov '11

22 Nov '11

Module: wine Branch: master Commit: 9afff037e50a6c173287182cd5703a2f4bdb6d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9afff037e50a6c173287182cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 21 18:48:37 2011 +0100 wined3d: Recognize the SM4 udiv opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 32197d5..5739733 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5127,6 +5127,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2AR */ pshader_hw_texreg2ar, /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, + /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9d88794..8e1724c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5082,6 +5082,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, + /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UTOF */ NULL, }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e182435..998b431 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -138,6 +138,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2AR */ "texreg2ar", /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", + /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_UTOF */ "utof", }; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 973d606..b78f03b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -94,6 +94,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, + WINED3D_SM4_OP_UDIV = 0x4e, WINED3D_SM4_OP_UTOF = 0x56, }; @@ -180,6 +181,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1, 5}, {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, 1, 1}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, 2, 1}, + {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, 2, 2}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, 1, 1}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a22faf..7e77347 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2AR, WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, + WINED3DSIH_UDIV, WINED3DSIH_UTOF, WINED3DSIH_TABLE_SIZE };

1 0

Bruno Jesus : ws2_32: Invert SIOCATMARK logic.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 06d759ed7e885498b6d51b73192d229615972ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d759ed7e885498b6d51b731… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Nov 19 23:20:30 2011 -0200 ws2_32: Invert SIOCATMARK logic. --- dlls/ws2_32/socket.c | 9 ++++++++- dlls/ws2_32/tests/sock.c | 12 ++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e345e87..72e2a5f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3133,7 +3133,14 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID || (!oob && ioctl(fd, SIOCATMARK, &atmark ) == -1)) status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); else - (*(WS_u_long *) out_buff) = oob | atmark; + { + /* The SIOCATMARK value read from ioctl() is reversed + * because BSD returns TRUE if it's in the OOB mark + * while Windows returns TRUE if there are NO OOB bytes. + */ + (*(WS_u_long *) out_buff) = oob | !atmark; + } + release_sock_fd( s, fd ); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7b5dde8..11e7b3c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -506,7 +506,7 @@ static VOID WINAPI oob_server ( server_params *par ) /* check atmark state */ ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - todo_wine ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); + ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); /* Receive normal data and check atmark state */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); @@ -516,7 +516,7 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - todo_wine ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); + ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); /* Receive a part of the out-of-band data and check atmark state */ n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, par->buflen ); @@ -525,13 +525,13 @@ static VOID WINAPI oob_server ( server_params *par ) n_expected -= 8; ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); + todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); /* Receive the rest of the out-of-band data and check atmark state */ do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); - ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); + todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); /* cleanup */ wsa_ok ( closesocket ( mem->sock[0].s ), 0 ==, "oob_server (%x): closesocket error: %d\n" ); @@ -2970,7 +2970,7 @@ static void test_ioctlsocket(void) ret = ioctlsocket(sock, SIOCATMARK, &arg); ok(ret != SOCKET_ERROR, "ioctlsocket failed unexpectedly\n"); - todo_wine ok(arg, "SIOCATMARK expected a non-zero value\n"); + ok(arg, "SIOCATMARK expected a non-zero value\n"); /* when SO_OOBINLINE is set SIOCATMARK must always return TRUE */ optval = 1; @@ -2987,7 +2987,7 @@ static void test_ioctlsocket(void) ok(ret != SOCKET_ERROR, "setsockopt failed unexpectedly\n"); arg = 0; ret = ioctlsocket(sock, SIOCATMARK, &arg); - todo_wine ok(arg, "SIOCATMARK expected a non-zero value\n"); + ok(arg, "SIOCATMARK expected a non-zero value\n"); ret = WSAIoctl(sock, SIO_KEEPALIVE_VALS, &arg, 0, NULL, 0, &arg, NULL, NULL); ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n");

1 0