May 2013 - Wine-Commits - list.winehq.org

Hans Leidekker : explorer: Watch the desktop folders for changes and update the launcher list accordingly .
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: d62e7f7b9b2cd32c6e9f55c2642303c40402ab8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62e7f7b9b2cd32c6e9f55c26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 28 12:42:50 2013 +0200 explorer: Watch the desktop folders for changes and update the launcher list accordingly. --- programs/explorer/desktop.c | 133 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index cf0de3c..e426c1a 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -252,6 +252,36 @@ error: return FALSE; } +static void free_launcher( struct launcher *launcher ) +{ + DestroyIcon( launcher->icon ); + HeapFree( GetProcessHeap(), 0, launcher->path ); + HeapFree( GetProcessHeap(), 0, launcher->title ); + HeapFree( GetProcessHeap(), 0, launcher ); +} + +static BOOL remove_launcher( const WCHAR *folder, const WCHAR *filename, int len_filename ) +{ + UINT i; + WCHAR *path; + BOOL ret = FALSE; + + if (!(path = append_path( folder, filename, len_filename ))) return FALSE; + for (i = 0; i < nb_launchers; i++) + { + if (!strcmpiW( launchers[i]->path, path )) + { + free_launcher( launchers[i] ); + if (--nb_launchers) + memmove( &launchers[i], &launchers[i + 1], sizeof(launchers[i]) * (nb_launchers - i) ); + ret = TRUE; + break; + } + } + HeapFree( GetProcessHeap(), 0, path ); + return ret; +} + static BOOL get_icon_text_metrics( HWND hwnd, TEXTMETRICW *tm ) { BOOL ret; @@ -268,6 +298,107 @@ static BOOL get_icon_text_metrics( HWND hwnd, TEXTMETRICW *tm ) return ret; } +static BOOL process_changes( const WCHAR *folder, char *buf ) +{ + FILE_NOTIFY_INFORMATION *info = (FILE_NOTIFY_INFORMATION *)buf; + BOOL ret = FALSE; + + for (;;) + { + switch (info->Action) + { + case FILE_ACTION_ADDED: + case FILE_ACTION_RENAMED_NEW_NAME: + if (add_launcher( folder, info->FileName, info->FileNameLength / sizeof(WCHAR) )) + ret = TRUE; + break; + + case FILE_ACTION_REMOVED: + case FILE_ACTION_RENAMED_OLD_NAME: + if (remove_launcher( folder, info->FileName, info->FileNameLength / sizeof(WCHAR) )) + ret = TRUE; + break; + + default: + WARN( "unexpected action %u\n", info->Action ); + break; + } + if (!info->NextEntryOffset) break; + info = (FILE_NOTIFY_INFORMATION *)((char *)info + info->NextEntryOffset); + } + return ret; +} + +static DWORD CALLBACK watch_desktop_folders( LPVOID param ) +{ + HWND hwnd = param; + HRESULT init = CoInitialize( NULL ); + HANDLE dir0, dir1, events[2]; + OVERLAPPED ovl0, ovl1; + char *buf0 = NULL, *buf1 = NULL; + DWORD count, size = 4096, error = ERROR_OUTOFMEMORY; + BOOL ret, redraw; + + dir0 = CreateFileW( desktop_folder, FILE_LIST_DIRECTORY|SYNCHRONIZE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS|FILE_FLAG_OVERLAPPED, NULL ); + if (dir0 == INVALID_HANDLE_VALUE) return GetLastError(); + dir1 = CreateFileW( desktop_folder_public, FILE_LIST_DIRECTORY|SYNCHRONIZE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS|FILE_FLAG_OVERLAPPED, NULL ); + if (dir1 == INVALID_HANDLE_VALUE) + { + CloseHandle( dir0 ); + return GetLastError(); + } + if (!(ovl0.hEvent = events[0] = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; + if (!(ovl1.hEvent = events[1] = CreateEventW( NULL, FALSE, FALSE, NULL ))) goto error; + if (!(buf0 = HeapAlloc( GetProcessHeap(), 0, size ))) goto error; + if (!(buf1 = HeapAlloc( GetProcessHeap(), 0, size ))) goto error; + + for (;;) + { + ret = ReadDirectoryChangesW( dir0, buf0, size, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ovl0, NULL ); + if (!ret) + { + error = GetLastError(); + goto error; + } + ret = ReadDirectoryChangesW( dir1, buf1, size, FALSE, FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ovl1, NULL ); + if (!ret) + { + error = GetLastError(); + goto error; + } + + redraw = FALSE; + switch ((error = WaitForMultipleObjects( 2, events, FALSE, INFINITE ))) + { + case WAIT_OBJECT_0: + if (!GetOverlappedResult( dir0, &ovl0, &count, FALSE ) || !count) break; + if (process_changes( desktop_folder, buf0 )) redraw = TRUE; + break; + + case WAIT_OBJECT_0 + 1: + if (!GetOverlappedResult( dir1, &ovl1, &count, FALSE ) || !count) break; + if (process_changes( desktop_folder_public, buf1 )) redraw = TRUE; + break; + + default: + goto error; + } + if (redraw) InvalidateRect( hwnd, NULL, TRUE ); + } + +error: + CloseHandle( dir0 ); + CloseHandle( dir1 ); + CloseHandle( events[0] ); + CloseHandle( events[1] ); + HeapFree( GetProcessHeap(), 0, buf0 ); + HeapFree( GetProcessHeap(), 0, buf1 ); + if (SUCCEEDED( init )) CoUninitialize(); + return error; +} + static void add_folder( const WCHAR *folder ) { static const WCHAR lnkW[] = {'\\','*','.','l','n','k',0}; @@ -334,6 +465,8 @@ static void initialize_launchers( HWND hwnd ) add_folder( desktop_folder ); add_folder( desktop_folder_public ); if (SUCCEEDED( init )) CoUninitialize(); + + CreateThread( NULL, 0, watch_desktop_folders, hwnd, 0, NULL ); } }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMTEXTURE3.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 397cc3f42dab9764abbc0be1dbc926d23a3b058d URL: http://source.winehq.org/git/wine.git/?a=commit;h=397cc3f42dab9764abbc0be1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:20 2013 +0200 d3drm: Avoid LPDIRECT3DRMTEXTURE3. --- dlls/d3drm/d3drm.c | 22 +++++++++------------- dlls/d3drm/frame.c | 22 +++++++--------------- dlls/d3drm/meshbuilder.c | 6 +++--- include/d3drm.h | 5 +++-- include/d3drmobj.h | 18 +++++++++--------- 5 files changed, 31 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=397cc3f42dab9764abbc0…

1 0

Marcus Meissner : services: Fix handle leak for service handles (Coverity).
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: d82de9b9a7f32a0d093f615ce61ea8f9ff121813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82de9b9a7f32a0d093f615ce… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 15:31:51 2013 +0200 services: Fix handle leak for service handles (Coverity). --- programs/services/tests/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/services/tests/service.c b/programs/services/tests/service.c index 99d28eb..a2cd0b5 100644 --- a/programs/services/tests/service.c +++ b/programs/services/tests/service.c @@ -328,6 +328,7 @@ static void test_service(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING"); @@ -368,6 +369,7 @@ static inline void test_no_stop(void) ok(res, "StartService failed: %u\n", GetLastError()); if(!res) { DeleteService(service_handle); + CloseServiceHandle(service_handle); return; } expect_event("RUNNING");

1 0

Aric Stewart : gdi32: Fix up glyph metrics for tategaki glyphs.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 72f584aef879fbabc7544d3848337b6bdf7e0787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f584aef879fbabc7544d384… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 24 11:00:41 2013 -0500 gdi32: Fix up glyph metrics for tategaki glyphs. --- dlls/gdi32/freetype.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 459f49a..bf4e4c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5918,6 +5918,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Bitmap ft_bitmap; FT_Error err; INT left, right, top = 0, bottom = 0, adv; + INT origin_x = 0, origin_y = 0; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; double widthRatio = 1.0; @@ -5926,6 +5927,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Matrix transMatTategaki; BOOL needsTransform = FALSE; BOOL tategaki = (font->name[0] == '@'); + BOOL vertical_metrics; UINT original_index; LONG avgAdvance = 0; FT_Fixed em_scale; @@ -6084,7 +6086,14 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, needsTransform = TRUE; } + vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); + /* there is a freetype bug where vertical metrics are only + properly scaled and correct in 2.4.0 or greater */ + if ((vertical_metrics) && (FT_Version.major < 2 || (FT_Version.major == 2 && FT_Version.minor < 4))) + vertical_metrics = FALSE; + if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; + if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); @@ -6135,6 +6144,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = (metrics.horiBearingY - metrics.height) & -64; lpgm->gmCellIncX = adv; lpgm->gmCellIncY = 0; + origin_x = left; + origin_y = top; } else { INT xc, yc; FT_Vector vec; @@ -6163,6 +6174,43 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = bottom & -64; top = (top + 63) & -64; + if (tategaki) + { + for(xc = 0; xc < 2; xc++) + { + for(yc = 0; yc < 2; yc++) + { + if (vertical_metrics) + { + vec.x = metrics.vertBearingY + xc * metrics.height; + vec.y = metrics.horiBearingX - yc * (metrics.vertBearingX * 2); + } + else + { + vec.x = metrics.horiBearingY - xc * metrics.height; + vec.y = metrics.horiBearingX + yc * metrics.width; + } + + TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); + pFT_Vector_Transform(&vec, &transMat); + if(xc == 0 && yc == 0) { + origin_x = vec.x; + origin_y = vec.y; + } else { + if(vec.x < origin_x) origin_x = vec.x; + if(vec.y > origin_y) origin_y = vec.y; + } + } + } + origin_x = origin_x & -64; + origin_y = (origin_y + 63) & -64; + } + else + { + origin_x = left; + origin_y = top; + } + TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); vec.x = metrics.horiAdvance; vec.y = 0; @@ -6177,7 +6225,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } - vec.x = metrics.horiAdvance; + if (vertical_metrics) + vec.x = metrics.vertAdvance; + else + vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); if (!avgAdvance || vec.y) @@ -6192,8 +6243,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmBlackBoxX = (right - left) >> 6; lpgm->gmBlackBoxY = (top - bottom) >> 6; - lpgm->gmptGlyphOrigin.x = left >> 6; - lpgm->gmptGlyphOrigin.y = top >> 6; + lpgm->gmptGlyphOrigin.x = origin_x >> 6; + lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; abc->abcB = (right - left) >> 6; abc->abcC = adv - abc->abcA - abc->abcB;

1 0

Aric Stewart : gdi32: Fix Tategaki rotation.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: cf891b04a087bcbc713e704c1adbf6b88243e996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf891b04a087bcbc713e704c1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 24 11:00:25 2013 -0500 gdi32: Fix Tategaki rotation. Tategaki does not ignore orientation rotation, instead it always rotates affect glyphs by 90 degrees inside their cell. --- dlls/gdi32/freetype.c | 57 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e972c98..459f49a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5923,6 +5923,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, double widthRatio = 1.0; FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; + FT_Matrix transMatTategaki; BOOL needsTransform = FALSE; BOOL tategaki = (font->name[0] == '@'); UINT original_index; @@ -6015,17 +6016,43 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, /* Rotation transform */ transMatUnrotated = transMat; - if(font->orientation && !tategaki) { + transMatTategaki = transMat; + if(font->orientation || tategaki) { FT_Matrix rotationMat; + FT_Matrix taterotationMat; FT_Vector vecAngle; - angle = FT_FixedFromFloat((double)font->orientation / 10.0); - pFT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - - pFT_Matrix_Multiply(&rotationMat, &transMat); + + double orient = font->orientation / 10.0; + double tate_orient = 0.f; + + if (tategaki) + tate_orient = ((font->orientation+900)%3600)/10.0; + else + tate_orient = font->orientation/10.0; + + if (orient) + { + angle = FT_FixedFromFloat(orient); + pFT_Vector_Unit(&vecAngle, angle); + rotationMat.xx = vecAngle.x; + rotationMat.xy = -vecAngle.y; + rotationMat.yx = -rotationMat.xy; + rotationMat.yy = rotationMat.xx; + + pFT_Matrix_Multiply(&rotationMat, &transMat); + } + + if (tate_orient) + { + angle = FT_FixedFromFloat(tate_orient); + pFT_Vector_Unit(&vecAngle, angle); + taterotationMat.xx = vecAngle.x; + taterotationMat.xy = -vecAngle.y; + taterotationMat.yx = -taterotationMat.xy; + taterotationMat.yy = taterotationMat.xx; + pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki); + } + needsTransform = TRUE; } @@ -6039,6 +6066,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); pFT_Matrix_Multiply(&worldMat, &transMat); pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); + pFT_Matrix_Multiply(&worldMat, &transMatTategaki); needsTransform = TRUE; } @@ -6052,6 +6080,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); pFT_Matrix_Multiply(&extraMat, &transMat); pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); + pFT_Matrix_Multiply(&extraMat, &transMatTategaki); needsTransform = TRUE; } @@ -6117,7 +6146,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiBearingX + xc * metrics.width; vec.y = metrics.horiBearingY - yc * metrics.height; TRACE("Vec %ld,%ld\n", vec.x, vec.y); - pFT_Vector_Transform(&vec, &transMat); + pFT_Vector_Transform(&vec, &transMatTategaki); if(xc == 0 && yc == 0) { left = right = vec.x; top = bottom = vec.y; @@ -6224,7 +6253,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); + pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -6280,7 +6309,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMat); + pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -6385,7 +6414,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP); if ( needsTransform ) - pFT_Outline_Transform (&ft_face->glyph->outline, &transMat); + pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); if ( pFT_Library_SetLcdFilter ) pFT_Library_SetLcdFilter( library, lcdfilter ); @@ -6484,7 +6513,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) { - pFT_Outline_Transform(outline, &transMat); + pFT_Outline_Transform(outline, &transMatTategaki); } for(contour = 0; contour < outline->n_contours; contour++) {

1 0

Fabian Müntefering : dwrite: Added missing initialization of stretch value.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 6bab3afc34a5579cfd81092696b955d9caf6d5fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bab3afc34a5579cfd8109269… Author: Fabian Müntefering <Cookiezzz97(a)gmx.de> Date: Mon May 27 18:41:24 2013 +0200 dwrite: Added missing initialization of stretch value. --- dlls/dwrite/layout.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index d9e4a99..b77f29f 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1021,6 +1021,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.weight = weight; This->format.style = style; This->format.size = size; + This->format.stretch = stretch; if (collection) {

1 0

Marcus Meissner : ver: curdirlen and destdirlen are in&out parameters ( Coverity).
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 90a9698f16f3063783305d292dbdff2c31ceaa0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a9698f16f3063783305d292… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 15:49:42 2013 +0200 ver: curdirlen and destdirlen are in&out parameters (Coverity). --- dlls/ver.dll16/version.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 45b9277..5e6692f 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -494,11 +494,23 @@ DWORD WINAPI VerFindFile16( UINT16 flags, LPSTR lpszFilename, LPSTR lpszDestDir, UINT16 *lpuDestDirLen ) { UINT curDirLen, destDirLen; - DWORD retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir, - lpszCurDir, &curDirLen, lpszDestDir, &destDirLen ); + UINT *pcurDirLen = NULL, *pdestDirLen = NULL; + DWORD retv; - *lpuCurDirLen = (UINT16)curDirLen; - *lpuDestDirLen = (UINT16)destDirLen; + if (lpuCurDirLen) { + curDirLen = *lpuCurDirLen; + pcurDirLen = &curDirLen; + } + if (lpuDestDirLen) { + destDirLen = *lpuDestDirLen; + pdestDirLen = &destDirLen; + } + retv = VerFindFileA( flags, lpszFilename, lpszWinDir, lpszAppDir, + lpszCurDir, pcurDirLen, lpszDestDir, pdestDirLen ); + if (lpuCurDirLen) + *lpuCurDirLen = (UINT16)curDirLen; + if (lpuDestDirLen) + *lpuDestDirLen = (UINT16)destDirLen; return retv; }

1 0

Marcus Meissner : ws2_32: Close the dest socket (Coverity).
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: 1a10d4d0cd27ddf4fca1a4dd910fe7498a7b0f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a10d4d0cd27ddf4fca1a4dd9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 26 14:33:25 2013 +0200 ws2_32: Close the dest socket (Coverity). --- dlls/ws2_32/tests/sock.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 804c66b..4612116 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4176,6 +4176,8 @@ static void test_WSARecv(void) todo_wine ok(!bret && (GetLastError() == ERROR_NETNAME_DELETED || broken(GetLastError() == ERROR_IO_INCOMPLETE) /* win9x */), "Did not get disconnect event: %d, error %d\n", bret, GetLastError()); ok(bytesReturned == 0, "Bytes received is %d\n", bytesReturned); + closesocket(dest); + dest = INVALID_SOCKET; src = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, 0); ok(src != INVALID_SOCKET, "failed to create socket %d\n", WSAGetLastError());

1 0

Henri Verbeet : wined3d: Use debug_d3dstate() in compile_state_table() as well.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: b5df8bd4f5a3b71a0ae300066ee1aaaeeefc94d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5df8bd4f5a3b71a0ae300066… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 28 08:55:17 2013 +0200 wined3d: Use debug_d3dstate() in compile_state_table() as well. --- dlls/wined3d/state.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 46ab990..bad4166 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -6021,10 +6021,11 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ cur[i].state, handlers + 1); } - if(StateTable[cur[i].state].representative && - StateTable[cur[i].state].representative != cur[i].content.representative) { - FIXME("State %u has different representatives in different pipeline parts\n", - cur[i].state); + if (StateTable[cur[i].state].representative + && StateTable[cur[i].state].representative != cur[i].content.representative) + { + FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", + debug_d3dstate(cur[i].state), cur[i].state); } StateTable[cur[i].state].representative = cur[i].content.representative; }

1 0

Qian Hong : atl100: Added stub for AtlIPersistPropertyBag_Load.
by Alexandre Julliard May 28, 2013

May 28, 2013

Module: wine Branch: master Commit: af59b20c8000241ed096c0ac964dc37b2ad6c8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af59b20c8000241ed096c0ac9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat May 25 00:43:52 2013 +0800 atl100: Added stub for AtlIPersistPropertyBag_Load. --- dlls/atl/atl.spec | 2 +- dlls/atl100/atl.c | 12 ++++++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 5b31804..4737580 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -43,7 +43,7 @@ 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlModuleUnRegisterTypeLib diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index fc7f460..a8b8208 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -275,6 +275,18 @@ HRESULT WINAPI AtlIPersistStreamInit_Save(LPSTREAM pStm, BOOL fClearDirty, } /*********************************************************************** + * AtlIPersistPropertyBag_Load [atl100.@] + */ +HRESULT WINAPI AtlIPersistPropertyBag_Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog, + ATL_PROPMAP_ENTRY *pMap, void *pThis, + IUnknown *pUnk) +{ + FIXME("(%p, %p, %p, %p, %p)\n", pPropBag, pErrorLog, pMap, pThis, pUnk); + + return S_OK; +} + +/*********************************************************************** * AtlModuleAddTermFunc [atl100.@] */ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 183ab7b..1295f8c 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -35,7 +35,7 @@ 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) 53 stub AtlIPersistPropertyBag_Save 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index f8d409c..5a77629 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -37,7 +37,7 @@ 49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save -52 stub AtlIPersistPropertyBag_Load +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) atl100.AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) atl100.AtlGetObjectSourceInterface 55 stub AtlUnRegisterTypeLib

1 0