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

Gerald Pfeifer : oleaut32/tests: Remove variable changed which is not really used from test_SysReAllocStringLen .
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: b98f916dae61ff2f99482797e1e6cb77d2de02bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98f916dae61ff2f99482797e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 21:31:09 2010 +0200 oleaut32/tests: Remove variable changed which is not really used from test_SysReAllocStringLen. --- dlls/oleaut32/tests/vartype.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 2ee5fea..c46ad8a 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5444,9 +5444,7 @@ static void test_SysReAllocStringLen(void) ok(str != NULL, "Expected non-NULL\n"); if(str) { - int changed; - - changed = SysReAllocStringLen(&str, str, 1000000); + SysReAllocStringLen(&str, str, 1000000); ok(SysStringLen(str)==1000000, "Incorrect string length\n"); ok(!memcmp(szTest, str, 4*sizeof(WCHAR)), "Incorrect string returned\n");

1 0

Eric Pouech : dbghelp: Protect PE' s COFF table reading against bogus values in NTHEADER.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 516fc78a2b8afd57d5a1ad219c4886b3ea0d60f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516fc78a2b8afd57d5a1ad219… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat May 8 21:47:16 2010 +0200 dbghelp: Protect PE's COFF table reading against bogus values in NTHEADER. --- dlls/dbghelp/pe_module.c | 49 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index baddaeb..cd2f248 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -172,6 +172,25 @@ unsigned pe_get_map_size(const struct image_section_map* ism) } /****************************************************************** + * pe_is_valid_pointer_table + * + * Checks whether the PointerToSymbolTable and NumberOfSymbols in file_header contain + * valid information. + */ +static BOOL pe_is_valid_pointer_table(const IMAGE_NT_HEADERS* nthdr, const void* mapping) +{ + DWORD64 offset; + + /* is the iSym table inside file image ? */ + offset = (DWORD64)nthdr->FileHeader.PointerToSymbolTable; + offset += (DWORD64)nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + if (offset > (DWORD64)nthdr->OptionalHeader.SizeOfImage) return FALSE; + /* is string table (following iSym table) inside file image ? */ + offset += *(DWORD*)((const char*)mapping + offset); + return offset <= (DWORD64)nthdr->OptionalHeader.SizeOfImage; +} + +/****************************************************************** * pe_map_file * * Maps an PE file into memory (and checks it's a real PE file) @@ -209,16 +228,26 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty } if (nthdr->FileHeader.PointerToSymbolTable && nthdr->FileHeader.NumberOfSymbols) { - /* FIXME ugly: should rather map the relevant content instead of copying it */ - const char* src = (const char*)mapping + - nthdr->FileHeader.PointerToSymbolTable + - nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); - char* dst; - DWORD sz = *(DWORD*)src; - - if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) - memcpy(dst, src, sz); - fmap->u.pe.strtable = dst; + if (pe_is_valid_pointer_table(nthdr, mapping)) + { + /* FIXME ugly: should rather map the relevant content instead of copying it */ + const char* src = (const char*)mapping + + nthdr->FileHeader.PointerToSymbolTable + + nthdr->FileHeader.NumberOfSymbols * sizeof(IMAGE_SYMBOL); + char* dst; + DWORD sz = *(DWORD*)src; + + if ((dst = HeapAlloc(GetProcessHeap(), 0, sz))) + memcpy(dst, src, sz); + fmap->u.pe.strtable = dst; + } + else + { + /* we have bad information here, wipe it out */ + fmap->u.pe.ntheader.FileHeader.PointerToSymbolTable = 0; + fmap->u.pe.ntheader.FileHeader.NumberOfSymbols = 0; + fmap->u.pe.strtable = NULL; + } } else fmap->u.pe.strtable = NULL; }

1 0

Huw Davies : oleaut32: Set the font to dirty when loading a new data.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 9d6a10a43aa10e21c53123935d6bd12c654546a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6a10a43aa10e21c53123935… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 10 15:01:03 2010 +0100 oleaut32: Set the font to dirty when loading a new data. --- dlls/oleaut32/olefont.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index df7de87..3c8c91f 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1836,9 +1836,10 @@ static HRESULT WINAPI OLEFontImpl_Load( MultiByteToWideChar( CP_ACP, 0, readBuffer, bStringSize, this->description.lpstrName, len ); this->description.lpstrName[len] = 0; - /* Ensure use of this font causes a new one to be created @@@@ */ + /* Ensure use of this font causes a new one to be created */ dec_int_ref(this->gdiFont); this->gdiFont = 0; + this->dirty = TRUE; return S_OK; }

1 0

Stefan Dösinger : wined3d: Don' t use GL_ARB_map_buffer_range for now.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 481aca47ad649297e5435d0f4c7466fd70aa702f URL: http://source.winehq.org/git/wine.git/?a=commit;h=481aca47ad649297e5435d0f4… Author: Stefan Dösinger <stefan(a)e195-194.eduroam.tuwien.ac.at> Date: Wed May 5 13:02:07 2010 +0200 wined3d: Don't use GL_ARB_map_buffer_range for now. There are numerous problems with this extension, and there are no visible upsides. In the best case dynamic VBOs are just as fast as no VBO at all. --- dlls/wined3d/buffer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b56895b..8372b7a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1474,7 +1474,8 @@ HRESULT buffer_init(struct wined3d_buffer *buffer, IWineD3DDeviceImpl *device, TRACE("size %#x, usage %#x, format %s, memory @ %p, iface @ %p.\n", buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format_desc->format), buffer->resource.allocatedMemory, buffer); - dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] || gl_info->supported[ARB_MAP_BUFFER_RANGE]; + /* GL_ARB_map_buffer_range is disabled for now due to numerous bugs and no gains */ + dynamic_buffer_ok = gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2 and others).

1 0

Wolfram Sang : user32: Honor bfOffBits in BITMAP_Load.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: f76a3b965c5c5440e2302b86e6b705d590cd23d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76a3b965c5c5440e2302b86e… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Mon May 10 03:36:27 2010 +0200 user32: Honor bfOffBits in BITMAP_Load. --- dlls/user32/cursoricon.c | 5 ++- dlls/user32/tests/cursoricon.c | 61 ++++++++++++++++++++++++++++----------- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9d7788d..96827c2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2394,7 +2394,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, char *bits; LONG width, height, new_width, new_height; WORD bpp_dummy; - DWORD compr_dummy; + DWORD compr_dummy, offbits = 0; INT bm_type; HDC screen_mem_dc = NULL; @@ -2424,6 +2424,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, UnmapViewOfFile( ptr ); return 0; } + offbits = bmfh->bfOffBits - sizeof(BITMAPFILEHEADER); } size = bitmap_info_size(info, DIB_RGB_COLORS); @@ -2466,7 +2467,7 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (!(screen_mem_dc = CreateCompatibleDC( screen_dc ))) goto end; - bits = (char *)info + size; + bits = (char *)info + (offbits ? offbits : size); if (loadflags & LR_CREATEDIBSECTION) { diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 21e0dca..e68eaac 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -225,6 +225,14 @@ static void test_child_process(void) SendMessage(child, WM_USER+1, 0, (LPARAM) cursor); } +static BOOL color_match(COLORREF a, COLORREF b) +{ + /* 5-bit accuracy is a sufficient test. This will match as long as + * colors are never truncated to less that 3x5-bit accuracy i.e. + * palettized. */ + return (a & 0x00F8F8F8) == (b & 0x00F8F8F8); +} + static void test_CopyImage_Check(HBITMAP bitmap, UINT flags, INT copyWidth, INT copyHeight, INT expectedWidth, INT expectedHeight, WORD expectedDepth, BOOL dibExpected) { @@ -698,13 +706,14 @@ static const unsigned char pngimage[285] = { 0xe7,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 }; -/* 1x1 pixel bmp */ -static const unsigned char bmpimage[66] = { -0x42,0x4d,0x42,0x00,0x00,0x00,0xDE,0xAD,0xBE,0xEF,0x3e,0x00,0x00,0x00,0x28,0x00, +/* 1x1 pixel bmp with gap between palette and bitmap. Correct bitmap contains only + zeroes, gap is 0xFF. */ +static const unsigned char bmpimage[70] = { +0x42,0x4d,0x46,0x00,0x00,0x00,0xDE,0xAD,0xBE,0xEF,0x42,0x00,0x00,0x00,0x28,0x00, 0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, 0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, -0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, -0x00,0x00 +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0x55,0x55,0x55,0x00,0xFF,0xFF, +0xFF,0xFF,0x00,0x00,0x00,0x00 }; /* 2x2 pixel gif */ @@ -714,6 +723,29 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +static void test_LoadImageBitmap(HBITMAP hbm) +{ + BITMAP bm; + BITMAPINFO bmi; + DWORD ret, pixel = 0; + HDC hdc = GetDC(NULL); + + ret = GetObject(hbm, sizeof(bm), &bm); + ok(ret == sizeof(bm), "GetObject returned %d\n", ret); + + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biWidth = bm.bmWidth; + bmi.bmiHeader.biHeight = bm.bmHeight; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount= 24; + bmi.bmiHeader.biCompression= BI_RGB; + ret = GetDIBits(hdc, hbm, 0, bm.bmHeight, &pixel, &bmi, DIB_RGB_COLORS); + ok(ret == bm.bmHeight, "%d lines were converted, not %d\n", ret, bm.bmHeight); + + ok(color_match(pixel, 0x00ffffff), "Pixel is 0x%08x\n", pixel); +} + static void test_LoadImageFile(const unsigned char * image_data, unsigned int image_size, const char * ext, BOOL expect_success) { @@ -758,15 +790,18 @@ static void test_LoadImageFile(const unsigned char * image_data, /* Load as bitmap. Should succeed if bmp, fail for everything else */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); - if (expect_success) - ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); - else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); error = GetLastError(); ok(error == 0 || error == 0xdeadbeef, /* Win9x, WinMe */ "Last error: %u\n", error); - if (handle != NULL) DeleteObject(handle); + if (expect_success) { + ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); + if (handle != NULL) test_LoadImageBitmap(handle); + } + else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); + + if (handle != NULL) DeleteObject(handle); DeleteFileA(filename); } @@ -994,14 +1029,6 @@ static HICON create_test_icon(HDC hdc, int width, int height, int bpp, return CreateIconIndirect(&iconInfo); } -static BOOL color_match(COLORREF a, COLORREF b) -{ - /* 5-bit accuracy is a sufficient test. This will match, so long as - * colors are never truncated to less that 3x5-bit accuracy i.e. - * paletized. */ - return (a & 0x00F8F8F8) == (b & 0x00F8F8F8); -} - static void check_alpha_draw(HDC hdc, BOOL drawiconex, BOOL alpha, int bpp, int line) { HICON hicon;

1 0

Mike Kaplinskiy : ws2_32: Improve SIO_GET_EXTENSION_FUNCTION_POINTER stub.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: df710826e17e9d49a3943cea9b82b168f5095b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df710826e17e9d49a3943cea9… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 8 15:10:58 2010 -0400 ws2_32: Improve SIO_GET_EXTENSION_FUNCTION_POINTER stub. --- dlls/ws2_32/socket.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e6a6973..63607fe 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2706,9 +2706,54 @@ INT WINAPI WSAIoctl(SOCKET s, break; case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(lpvInBuffer)); - WSASetLastError(WSAEOPNOTSUPP); - return SOCKET_ERROR; + { + static const GUID connectex_guid = WSAID_CONNECTEX; + static const GUID disconnectex_guid = WSAID_DISCONNECTEX; + static const GUID acceptex_guid = WSAID_ACCEPTEX; + static const GUID getaccepexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; + static const GUID transmitfile_guid = WSAID_TRANSMITFILE; + static const GUID transmitpackets_guid = WSAID_TRANSMITPACKETS; + static const GUID wsarecvmsg_guid = WSAID_WSARECVMSG; + static const GUID wsasendmsg_guid = WSAID_WSASENDMSG; + + if ( IsEqualGUID(&connectex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented ConnectEx\n"); + } + else if ( IsEqualGUID(&disconnectex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented DisconnectEx\n"); + } + else if ( IsEqualGUID(&acceptex_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented AcceptEx\n"); + } + else if ( IsEqualGUID(&getaccepexsockaddrs_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented GetAcceptExSockaddrs\n"); + } + else if ( IsEqualGUID(&transmitfile_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitFile\n"); + } + else if ( IsEqualGUID(&transmitpackets_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitPackets\n"); + } + else if ( IsEqualGUID(&wsarecvmsg_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented WSARecvMsg\n"); + } + else if ( IsEqualGUID(&wsasendmsg_guid, lpvInBuffer) ) + { + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented WSASendMsg\n"); + } + else + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(lpvInBuffer)); + + WSASetLastError(WSAEOPNOTSUPP); + return SOCKET_ERROR; + } case WS_SIO_KEEPALIVE_VALS: {

1 0

Alexandre Julliard : winex11: Take into account the cursor show count when setting the initial cursor for a window .
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 1afd0df7de85a4555d738aff0d5f99f5146c19d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1afd0df7de85a4555d738aff0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:33:59 2010 +0200 winex11: Take into account the cursor show count when setting the initial cursor for a window. --- dlls/winex11.drv/window.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8cd3bf3..28d5ae6 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -425,6 +425,25 @@ static void sync_window_style( Display *display, struct x11drv_win_data *data ) /*********************************************************************** + * sync_window_cursor + */ +static void sync_window_cursor( struct x11drv_win_data *data ) +{ + HCURSOR cursor; + + SERVER_START_REQ( set_cursor ) + { + req->flags = 0; + wine_server_call( req ); + cursor = reply->prev_count >= 0 ? wine_server_ptr_handle( reply->prev_handle ) : 0; + } + SERVER_END_REQ; + + set_window_cursor( data->hwnd, cursor ); +} + + +/*********************************************************************** * sync_window_region * * Update the X11 window region. @@ -1053,7 +1072,6 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; char *process_name = get_process_name(); - Cursor cursor; wine_tsx11_lock(); @@ -1086,9 +1104,6 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data XChangeProperty( display, data->whole_window, x11drv_atom(XdndAware), XA_ATOM, 32, PropModeReplace, (unsigned char*)&dndVersion, 1 ); - if ((cursor = get_x11_cursor( data->cursor ))) - XDefineCursor( gdi_display, data->whole_window, cursor ); - data->wm_hints = XAllocWMHints(); wine_tsx11_unlock(); @@ -1681,6 +1696,8 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); + + sync_window_cursor( data ); done: if (win_rgn) DeleteObject( win_rgn ); return data->whole_window;

1 0

Alexandre Julliard : winex11: Select for EnterNotify events on the desktop window in order to update the cursor .
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: f4be1662341111db5ca530124e28fc4b70dac2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4be1662341111db5ca530124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 10 12:34:17 2010 +0200 winex11: Select for EnterNotify events on the desktop window in order to update the cursor. --- dlls/winex11.drv/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a2bc004..4a36e46 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -142,7 +142,7 @@ Window CDECL X11DRV_create_desktop( UINT width, UINT height ) wine_tsx11_lock(); /* Create window */ - win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | + win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask; win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow );

1 0

Mike Kaplinskiy : include: Add WSAID_WSASENDMSG extension guid.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: db1f5d5f75500c44bc3d327afa4b6704daf987f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1f5d5f75500c44bc3d327af… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat May 8 15:23:33 2010 -0400 include: Add WSAID_WSASENDMSG extension guid. --- include/mswsock.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 398572b..5423438 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -118,7 +118,7 @@ extern "C" { #define WSAID_CONNECTEX \ {0x25a207b9,0xddf3,0x4660,{0x8e,0xe9,0x76,0xe5,0x8c,0x74,0x06,0x3e}} #define WSAID_DISCONNECTEX \ - {0x7fda2e11,0x8630,0x436f,{0xa0, 0x31, 0xf5, 0x36, 0xa6, 0xee, 0xc1, 0x57}} + {0x7fda2e11,0x8630,0x436f,{0xa0,0x31,0xf5,0x36,0xa6,0xee,0xc1,0x57}} #define WSAID_GETACCEPTEXSOCKADDRS \ {0xb5367df2,0xcbac,0x11cf,{0x95,0xca,0x00,0x80,0x5f,0x48,0xa1,0x92}} #define WSAID_TRANSMITFILE \ @@ -127,6 +127,8 @@ extern "C" { {0xd9689da0,0x1f90,0x11d3,{0x99,0x71,0x00,0xc0,0x4f,0x68,0xc8,0x76}} #define WSAID_WSARECVMSG \ {0xf689d7c8,0x6f1f,0x436b,{0x8a,0x53,0xe5,0x4f,0xe3,0x51,0xc3,0x22}} +#define WSAID_WSASENDMSG \ + {0xa441e712,0x754f,0x43ca,{0x84,0xa7,0x0d,0xee,0x44,0xcf,0x60,0x6d}} typedef struct _TRANSMIT_FILE_BUFFERS { LPVOID Head; @@ -170,6 +172,7 @@ typedef VOID (WINAPI * LPFN_GETACCEPTEXSOCKADDRS)(PVOID, DWORD, DWORD, DWORD, st typedef BOOL (WINAPI * LPFN_TRANSMITFILE)(SOCKET, HANDLE, DWORD, DWORD, LPOVERLAPPED, LPTRANSMIT_FILE_BUFFERS, DWORD); typedef BOOL (WINAPI * LPFN_TRANSMITPACKETS)(SOCKET, LPTRANSMIT_PACKETS_ELEMENT, DWORD, DWORD, LPOVERLAPPED, DWORD); typedef INT (WINAPI * LPFN_WSARECVMSG)(SOCKET, LPWSAMSG, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); +typedef INT (WINAPI * LPFN_WSASENDMSG)(SOCKET, LPWSAMSG, DWORD, LPDWORD, LPWSAOVERLAPPED, LPWSAOVERLAPPED_COMPLETION_ROUTINE); BOOL WINAPI AcceptEx(SOCKET, SOCKET, PVOID, DWORD, DWORD, DWORD, LPDWORD, LPOVERLAPPED); VOID WINAPI GetAcceptExSockaddrs(PVOID, DWORD, DWORD, DWORD, struct sockaddr **, LPINT, struct sockaddr **, LPINT);

1 0

Gerald Pfeifer : mountmgr.sys: Remove variable result which is not really used from update_symlink.
by Alexandre Julliard May 10, 2010

May 10, 2010

Module: wine Branch: master Commit: 0c2fbbe7f04e774afc56a1e09b81847688b92997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c2fbbe7f04e774afc56a1e09… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat May 8 19:44:22 2010 +0200 mountmgr.sys: Remove variable result which is not really used from update_symlink. --- dlls/mountmgr.sys/device.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index ba5a02b..6c182e8 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -175,7 +175,6 @@ static void update_symlink( const char *path, const char *dest, const char *orig /* send notification about a change to a given drive */ static void send_notify( int drive, int code ) { - DWORD_PTR result; DEV_BROADCAST_VOLUME info; info.dbcv_size = sizeof(info); @@ -183,8 +182,8 @@ static void send_notify( int drive, int code ) info.dbcv_reserved = 0; info.dbcv_unitmask = 1 << drive; info.dbcv_flags = DBTF_MEDIA; - result = BroadcastSystemMessageW( BSF_FORCEIFHUNG|BSF_QUERY, NULL, - WM_DEVICECHANGE, code, (LPARAM)&info ); + BroadcastSystemMessageW( BSF_FORCEIFHUNG|BSF_QUERY, NULL, + WM_DEVICECHANGE, code, (LPARAM)&info ); } /* create the disk device for a given volume */

1 0