wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Alexander Nicolaysen Sørnes : wordpad: Convert open file dialog to Unicode.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 69c9565e6f6e1f256c87f17cfdbdf2d0cc3bb838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c9565e6f6e1f256c87f17cf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 15:31:44 2007 +0200 wordpad: Convert open file dialog to Unicode. --- programs/wordpad/wordpad.c | 56 +++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 31 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e6bf42a..360f2a3 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -46,29 +46,29 @@ static const WCHAR wszAppTitle[] = {'W','i','n','e',' ','W','o','r','d','p','a', static HWND hMainWnd; static HWND hEditorWnd; -static char szFilter[MAX_STRING_LEN]; +static WCHAR wszFilter[MAX_STRING_LEN]; /* Load string resources */ static void DoLoadStrings(void) { - LPSTR p = szFilter; - char files_rtf[] = "*.rtf"; - char files_txt[] = "*.txt"; - char files_all[] = "*.*"; + LPWSTR p = wszFilter; + static const WCHAR files_rtf[] = {'*','.','r','t','f','\0'}; + static const WCHAR files_txt[] = {'*','.','t','x','t','\0'}; + static const WCHAR files_all[] = {'*','.','*','\0'}; HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hMainWnd, GWLP_HINSTANCE); - LoadString(hInstance, STRING_RICHTEXT_FILES_RTF, p, MAX_STRING_LEN); - p += strlen(p) + 1; - lstrcpy(p, files_rtf); - p += strlen(p) + 1; - LoadString(hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); - p += strlen(p) + 1; - lstrcpy(p, files_txt); - p += strlen(p) + 1; - LoadString(hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); - p += strlen(p) + 1; - lstrcpy(p, files_all); - p += strlen(p) + 1; + LoadStringW(hInstance, STRING_RICHTEXT_FILES_RTF, p, MAX_STRING_LEN); + p += lstrlenW(p) + 1; + lstrcpyW(p, files_rtf); + p += lstrlenW(p) + 1; + LoadStringW(hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN); + p += lstrlenW(p) + 1; + lstrcpyW(p, files_txt); + p += lstrlenW(p) + 1; + LoadStringW(hInstance, STRING_ALL_FILES, p, MAX_STRING_LEN); + p += lstrlenW(p) + 1; + lstrcpyW(p, files_all); + p += lstrlenW(p) + 1; *p = '\0'; } @@ -175,29 +175,23 @@ static void DoOpenFile(LPCWSTR szOpenFileName) static void DialogOpenFile(void) { - OPENFILENAME ofn; + OPENFILENAMEW ofn; - char szFile[MAX_PATH] = ""; - char szDefExt[] = "rtf"; + WCHAR wszFile[MAX_PATH] = {'\0'}; + static const WCHAR wszDefExt[] = {'r','t','f','\0'}; ZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); ofn.Flags = OFN_HIDEREADONLY | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; ofn.hwndOwner = hMainWnd; - ofn.lpstrFilter = szFilter; - ofn.lpstrFile = szFile; + ofn.lpstrFilter = wszFilter; + ofn.lpstrFile = wszFile; ofn.nMaxFile = MAX_PATH; - ofn.lpstrDefExt = szDefExt; + ofn.lpstrDefExt = wszDefExt; - if(GetOpenFileName(&ofn)) - { - WCHAR szOpenFile[MAX_PATH]; - - MultiByteToWideChar(CP_ACP, 0, ofn.lpstrFile, MAX_PATH, szOpenFile, sizeof(szOpenFile)/sizeof(szOpenFile[0])); - - DoOpenFile(szOpenFile); - } + if(GetOpenFileNameW(&ofn)) + DoOpenFile(ofn.lpstrFile); } static void DoSaveFile(LPCWSTR wszSaveFileName)

1 0

Alexander Nicolaysen Sørnes : wordpad: Improve file reading code.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: a747eca83c12909cfe4a41f65a342888c59f515f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a747eca83c12909cfe4a41f65… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Jun 2 00:19:37 2007 +0200 wordpad: Improve file reading code. --- programs/wordpad/wordpad.c | 51 +++++++++---------------------------------- 1 files changed, 11 insertions(+), 40 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 13c33c8..e6bf42a 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -100,17 +100,16 @@ static void AddSeparator(HWND hwndToolBar) SendMessage(hwndToolBar, TB_ADDBUTTONS, 1, (LPARAM)&button); } -static LPSTR stream_buffer; -static LONG stream_buffer_size; - static DWORD CALLBACK stream_in(DWORD_PTR cookie, LPBYTE buffer, LONG cb, LONG *pcb) { - LONG size = min(stream_buffer_size, cb); + HANDLE hFile = (HANDLE)cookie; + DWORD read; + + if(!ReadFile(hFile, buffer, cb, &read, 0)) + return 1; + + *pcb = read; - memcpy(buffer, stream_buffer, size); - stream_buffer_size -= size; - stream_buffer += size; - *pcb = size; return 0; } @@ -152,9 +151,6 @@ static void set_caption(LPCWSTR wszNewFileName) static void DoOpenFile(LPCWSTR szOpenFileName) { HANDLE hFile; - LPSTR pTemp; - DWORD size; - DWORD dwNumRead; EDITSTREAM es; hFile = CreateFileW(szOpenFileName, GENERIC_READ, FILE_SHARE_READ, NULL, @@ -162,38 +158,13 @@ static void DoOpenFile(LPCWSTR szOpenFileName) if (hFile == INVALID_HANDLE_VALUE) return; - size = GetFileSize(hFile, NULL); - if (size == INVALID_FILE_SIZE) - { - CloseHandle(hFile); - return; - } - size++; - - pTemp = HeapAlloc(GetProcessHeap(), 0, size); - if (!pTemp) - { - CloseHandle(hFile); - return; - } - - if (!ReadFile(hFile, pTemp, size, &dwNumRead, NULL)) - { - CloseHandle(hFile); - HeapFree(GetProcessHeap(), 0, pTemp); - return; - } - CloseHandle(hFile); - pTemp[dwNumRead] = 0; - - memset(&es, 0, sizeof(es)); + es.dwCookie = (DWORD_PTR)hFile; es.pfnCallback = stream_in; - stream_buffer = pTemp; - stream_buffer_size = size; + /* FIXME: Handle different file formats */ + SendMessageW(hEditorWnd, EM_STREAMIN, SF_RTF, (LPARAM)&es); - SendMessage(hEditorWnd, EM_STREAMIN, SF_RTF, (LPARAM)&es); - HeapFree(GetProcessHeap(), 0, pTemp); + CloseHandle(hFile); SetFocus(hEditorWnd);

1 0

Alexander Nicolaysen Sørnes : wordpad: Add file saving support.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: a28f91f14864ea802e6ebc044a5364f64bd0bff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a28f91f14864ea802e6ebc044… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Jun 2 00:07:02 2007 +0200 wordpad: Add file saving support. --- programs/wordpad/wordpad.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 524d2d2..13c33c8 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -114,6 +114,22 @@ static DWORD CALLBACK stream_in(DWORD_PTR cookie, LPBYTE buffer, LONG cb, LONG * return 0; } +static DWORD CALLBACK stream_out(DWORD_PTR cookie, LPBYTE buffer, LONG cb, LONG *pcb) +{ + DWORD written; + int ret; + HANDLE hFile = (HANDLE)cookie; + + ret = WriteFile(hFile, buffer, cb, &written, 0); + + if(!ret || (cb != written)) + return 1; + + *pcb = cb; + + return 0; +} + static WCHAR wszFileName[MAX_PATH]; static void set_caption(LPCWSTR wszNewFileName) @@ -213,6 +229,35 @@ static void DialogOpenFile(void) } } +static void DoSaveFile(LPCWSTR wszSaveFileName) +{ + HANDLE hFile; + EDITSTREAM stream; + LRESULT ret; + + hFile = CreateFileW(wszSaveFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + + if(hFile == INVALID_HANDLE_VALUE) + return; + + stream.dwCookie = (DWORD_PTR)hFile; + stream.pfnCallback = stream_out; + + /* FIXME: Handle different formats */ + ret = SendMessageW(hEditorWnd, EM_STREAMOUT, SF_RTF, (LPARAM)&stream); + + CloseHandle(hFile); + + SetFocus(hEditorWnd); + + if(!ret) + return; + + lstrcpyW(wszFileName, wszSaveFileName); + set_caption(wszFileName); +} + static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; @@ -455,6 +500,12 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) break; case ID_FILE_SAVE: + if(wszFileName[0]) + DoSaveFile(wszFileName); + else + MessageBox(hWnd, "Can only save existing for now", "WordPad", MB_OK); + break; + case ID_PRINT: case ID_PREVIEW: case ID_FIND:

1 0

Alexander Nicolaysen Sørnes : wordpad: Store file name globally.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: d072e8b1a9f70aaec4c2790718725da3c692acee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d072e8b1a9f70aaec4c279071… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed May 30 14:56:20 2007 +0200 wordpad: Store file name globally. --- programs/wordpad/wordpad.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index e131527..524d2d2 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -114,6 +114,8 @@ static DWORD CALLBACK stream_in(DWORD_PTR cookie, LPBYTE buffer, LONG cb, LONG * return 0; } +static WCHAR wszFileName[MAX_PATH]; + static void set_caption(LPCWSTR wszNewFileName) { static const WCHAR wszSeparator[] = {' ','-',' ','\0'}; @@ -180,6 +182,8 @@ static void DoOpenFile(LPCWSTR szOpenFileName) SetFocus(hEditorWnd); set_caption(szOpenFileName); + + lstrcpyW(wszFileName, szOpenFileName); } static void DialogOpenFile(void) @@ -442,6 +446,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FILE_NEW: SetWindowTextA(hwndEditor, ""); set_caption(NULL); + wszFileName[0] = '\0'; /* FIXME: set default format too */ break;

1 0

Alexander Nicolaysen Sørnes : wordpad: Split code into set_caption function.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: e173504ccd14f30cfac4662b7594bad34d193e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e173504ccd14f30cfac4662b7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed May 30 14:42:36 2007 +0200 wordpad: Split code into set_caption function. --- programs/wordpad/wordpad.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 4655b2d..e131527 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -114,7 +114,24 @@ static DWORD CALLBACK stream_in(DWORD_PTR cookie, LPBYTE buffer, LONG cb, LONG * return 0; } -static void DoOpenFile(LPCWSTR szFileName) +static void set_caption(LPCWSTR wszNewFileName) +{ + static const WCHAR wszSeparator[] = {' ','-',' ','\0'}; + WCHAR wszCaption[MAX_PATH]; + + if(wszNewFileName) + { + lstrcpyW(wszCaption, wszNewFileName); + lstrcatW(wszCaption, wszSeparator); + lstrcatW(wszCaption, wszAppTitle); + SetWindowTextW(hMainWnd, wszCaption); + } else + { + SetWindowTextW(hMainWnd, wszAppTitle); + } +} + +static void DoOpenFile(LPCWSTR szOpenFileName) { HANDLE hFile; LPSTR pTemp; @@ -122,11 +139,7 @@ static void DoOpenFile(LPCWSTR szFileName) DWORD dwNumRead; EDITSTREAM es; - char szCaption[MAX_PATH]; - char szAppTitle[sizeof(wszAppTitle)]; - char szSeparator[] = " - "; - - hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, + hFile = CreateFileW(szOpenFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) return; @@ -166,14 +179,7 @@ static void DoOpenFile(LPCWSTR szFileName) SetFocus(hEditorWnd); - WideCharToMultiByte(CP_ACP, 0, wszAppTitle, -1, szAppTitle, sizeof(wszAppTitle), NULL, NULL); - - WideCharToMultiByte(CP_ACP, 0, szFileName, -1, szCaption, MAX_PATH, NULL, NULL); - - lstrcat(szCaption, szSeparator); - lstrcat(szCaption, szAppTitle); - - SetWindowText(hMainWnd, szCaption); + set_caption(szOpenFileName); } static void DialogOpenFile(void) @@ -435,7 +441,7 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam) case ID_FILE_NEW: SetWindowTextA(hwndEditor, ""); - SetWindowTextW(hMainWnd, wszAppTitle); + set_caption(NULL); /* FIXME: set default format too */ break;

1 0

Detlef Riekenberg : include/winspool: Add more flags for printer drivers.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 360dee625f12cbcaeb246a2f823cb6743db8b272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360dee625f12cbcaeb246a2f8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jun 2 11:43:30 2007 +0200 include/winspool: Add more flags for printer drivers. --- include/winspool.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index a642eef..47fc113 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -273,6 +273,22 @@ extern "C" { #define JOB_EXECUTE (STANDARD_RIGHTS_EXECUTE | JOB_ACCESS_ADMINISTER) #define JOB_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | JOB_ACCESS_ADMINISTER) + +/* Flags for printer drivers */ +#define DRIVER_KERNELMODE 0x00000001 +#define DRIVER_USERMODE 0x00000002 + +#define APD_STRICT_UPGRADE 0x00000001 +#define APD_STRICT_DOWNGRADE 0x00000002 +#define APD_COPY_ALL_FILES 0x00000004 +#define APD_COPY_NEW_FILES 0x00000008 +#define APD_COPY_FROM_DIRECTORY 0x00000010 + +#define DPD_DELETE_UNUSED_FILES 0x00000001 +#define DPD_DELETE_SPECIFIC_VERSION 0x00000002 +#define DPD_DELETE_ALL_FILES 0x00000004 + + /* TYPES */ typedef struct _PRINTER_DEFAULTSA { LPSTR pDatatype;

1 0

Marcus Meissner : quartz: Added some error checking on failure to CreateClassEnumerator.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: ccad96578d273e672a3492a2a7f2e11663ae4640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccad96578d273e672a3492a2a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 3 12:51:52 2007 +0200 quartz: Added some error checking on failure to CreateClassEnumerator. --- dlls/quartz/filtermapper.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 6adce61..a45f477 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -962,9 +962,14 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters( *ppEnum = NULL; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&pCreateDevEnum); + if (FAILED(hr)) + return hr; - if (SUCCEEDED(hr)) - hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEnumCat, 0); + hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEnumCat, 0); + if (FAILED(hr)) { + ICreateDevEnum_Release(pCreateDevEnum); + return hr; + } while (IEnumMoniker_Next(pEnumCat, 1, &pMonikerCat, NULL) == S_OK) {

1 0

Mikołaj Zalewski : kernel: Fix clearing of memory in LocalReAlloc16(..., LMEM_ZEROMEMORY).
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 2e5a48be43c4fcfea1a5ca1f8dec437b9bad9a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5a48be43c4fcfea1a5ca1f8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jun 2 21:31:28 2007 +0200 kernel: Fix clearing of memory in LocalReAlloc16(..., LMEM_ZEROMEMORY). --- dlls/kernel32/local16.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index 76b2a6d..87f11ed 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -1331,7 +1331,12 @@ HLOCAL16 WINAPI LocalReAlloc16( HLOCAL16 handle, WORD size, UINT16 flags ) TRACE("size increase, making new free block\n"); LOCAL_GrowArenaUpward(ds, arena, nextarena - arena); if (flags & LMEM_ZEROINIT) - memset((char *)pArena + oldsize, 0, size - oldsize); + { + char *oldend = (char *)pArena + ARENA_HEADER_SIZE + oldsize; + char *newend = ptr + pArena->next; + TRACE("Clearing memory from %p to %p (DS -> %p)\n", oldend, newend, ptr); + memset(oldend, 0, newend - oldend); + } TRACE("returning %04x\n", handle ); return handle;

1 0

Francois Gouget : ws2_32: Improve the prototypes Win64 compatibility by replacing long with LONG.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: cfbd3384e2ef9edbfdba3f057944aa93fadbe13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbd3384e2ef9edbfdba3f057… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 1 12:10:32 2007 +0200 ws2_32: Improve the prototypes Win64 compatibility by replacing long with LONG. --- dlls/ws2_32/socket.c | 14 +++++++------- include/winsock.h | 24 ++++++++++++------------ include/winsock2.h | 12 ++++++------ tools/winapi/win32.api | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6f883b4..c0a387d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2285,12 +2285,12 @@ INT WINAPI WSAIoctl(SOCKET s, /*********************************************************************** * ioctlsocket (WS2_32.10) */ -int WINAPI WS_ioctlsocket(SOCKET s, long cmd, WS_u_long *argp) +int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) { int fd; long newcmd = cmd; - TRACE("socket %04lx, cmd %08lx, ptr %p\n", s, cmd, argp); + TRACE("socket %04lx, cmd %08x, ptr %p\n", s, cmd, argp); switch( cmd ) { @@ -2347,7 +2347,7 @@ int WINAPI WS_ioctlsocket(SOCKET s, long cmd, WS_u_long *argp) /* FIXME: 0x667e above is ('f' << 8) | 126, and is a low word of * FIONBIO (_IOW('f', 126, u_long)), how that should be handled? */ - WARN("\tunknown WS_IOCTL cmd (%08lx)\n", cmd); + WARN("\tunknown WS_IOCTL cmd (%08x)\n", cmd); break; } @@ -3538,11 +3538,11 @@ int WINAPI WSAEnumNetworkEvents(SOCKET s, WSAEVENT hEvent, LPWSANETWORKEVENTS lp /*********************************************************************** * WSAEventSelect (WS2_32.39) */ -int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, long lEvent) +int WINAPI WSAEventSelect(SOCKET s, WSAEVENT hEvent, LONG lEvent) { int ret; - TRACE("%08lx, hEvent %p, event %08x\n", s, hEvent, (unsigned)lEvent ); + TRACE("%08lx, hEvent %p, event %08x\n", s, hEvent, lEvent); SERVER_START_REQ( set_socket_event ) { @@ -3622,11 +3622,11 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, /*********************************************************************** * WSAAsyncSelect (WS2_32.101) */ -INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, long lEvent) +INT WINAPI WSAAsyncSelect(SOCKET s, HWND hWnd, UINT uMsg, LONG lEvent) { int ret; - TRACE("%lx, hWnd %p, uMsg %08x, event %08lx\n", s, hWnd, uMsg, lEvent ); + TRACE("%lx, hWnd %p, uMsg %08x, event %08x\n", s, hWnd, uMsg, lEvent); SERVER_START_REQ( set_socket_event ) { diff --git a/include/winsock.h b/include/winsock.h index c096d13..d6f845b 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -441,8 +441,8 @@ typedef struct WS(fd_set) #define _TIMEVAL_DEFINED typedef struct WS(timeval) { - long tv_sec; /* seconds */ - long tv_usec; /* and microseconds */ + LONG tv_sec; /* seconds */ + LONG tv_usec; /* and microseconds */ } TIMEVAL, *PTIMEVAL, *LPTIMEVAL; #endif @@ -549,31 +549,31 @@ static inline u_long __wine_ulong_swap(u_long l) #define IN_CLASSA_MAX 128 #define IN_CLASSA_NET 0xff000000 #define IN_CLASSA_HOST 0x00ffffff -#define IN_CLASSA(i) (((long)(i) & 0x80000000) == 0) +#define IN_CLASSA(i) (((LONG)(i) & 0x80000000) == 0) #define IN_CLASSB_NSHIFT 16 #define IN_CLASSB_MAX 65536 #define IN_CLASSB_NET 0xffff0000 #define IN_CLASSB_HOST 0x0000ffff -#define IN_CLASSB(i) (((long)(i) & 0xc0000000) == 0x80000000) +#define IN_CLASSB(i) (((LONG)(i) & 0xc0000000) == 0x80000000) #define IN_CLASSC_NSHIFT 8 #define IN_CLASSC_NET 0xffffff00 #define IN_CLASSC_HOST 0x000000ff -#define IN_CLASSC(i) (((long)(i) & 0xe0000000) == 0xc0000000) +#define IN_CLASSC(i) (((LONG)(i) & 0xe0000000) == 0xc0000000) #else #define WS_IN_CLASSA_NSHIFT 24 #define WS_IN_CLASSA_MAX 128 #define WS_IN_CLASSA_NET 0xff000000 #define WS_IN_CLASSA_HOST 0x00ffffff -#define WS_IN_CLASSA(i) (((long)(i) & 0x80000000) == 0) +#define WS_IN_CLASSA(i) (((LONG)(i) & 0x80000000) == 0) #define WS_IN_CLASSB_NSHIFT 16 #define WS_IN_CLASSB_MAX 65536 #define WS_IN_CLASSB_NET 0xffff0000 #define WS_IN_CLASSB_HOST 0x0000ffff -#define WS_IN_CLASSB(i) (((long)(i) & 0xc0000000) == 0x80000000) +#define WS_IN_CLASSB(i) (((LONG)(i) & 0xc0000000) == 0x80000000) #define WS_IN_CLASSC_NSHIFT 8 #define WS_IN_CLASSC_NET 0xffffff00 #define WS_IN_CLASSC_HOST 0x000000ff -#define WS_IN_CLASSC(i) (((long)(i) & 0xe0000000) == 0xc0000000) +#define WS_IN_CLASSC(i) (((LONG)(i) & 0xe0000000) == 0xc0000000) #endif /* USE_WS_PREFIX */ #ifndef USE_WS_PREFIX @@ -721,8 +721,8 @@ typedef struct WS(WSAData) #define WS_IOC_INOUT (WS_IOC_IN|WS_IOC_OUT) #define WS__IO(x,y) (WS_IOC_VOID|((x)<<8)|(y)) -#define WS__IOR(x,y,t) (WS_IOC_OUT|(((long)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y)) -#define WS__IOW(x,y,t) (WS_IOC_IN|(((long)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define WS__IOR(x,y,t) (WS_IOC_OUT|(((LONG)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define WS__IOW(x,y,t) (WS_IOC_IN|(((LONG)sizeof(t)&WS_IOCPARM_MASK)<<16)|((x)<<8)|(y)) #endif @@ -1004,7 +1004,7 @@ HANDLE WINAPI WSAAsyncGetProtoByName(HWND,WS(u_int),const char*,char*,int); HANDLE WINAPI WSAAsyncGetProtoByNumber(HWND,WS(u_int),int,char*,int); HANDLE WINAPI WSAAsyncGetServByName(HWND,WS(u_int),const char*,const char*,char*,int); HANDLE WINAPI WSAAsyncGetServByPort(HWND,WS(u_int),int,const char*,char*,int); -int WINAPI WSAAsyncSelect(SOCKET,HWND,WS(u_int),long); +int WINAPI WSAAsyncSelect(SOCKET,HWND,WS(u_int),LONG); int WINAPI WSACancelAsyncRequest(HANDLE); int WINAPI WSACancelBlockingCall(void); int WINAPI WSACleanup(void); @@ -1034,7 +1034,7 @@ int WINAPI WS(getsockname)(SOCKET,struct WS(sockaddr)*,int*); int WINAPI WS(getsockopt)(SOCKET,int,int,char*,int*); WS(u_long) WINAPI WS(inet_addr)(const char*); char* WINAPI WS(inet_ntoa)(struct WS(in_addr)); -int WINAPI WS(ioctlsocket)(SOCKET,long,WS(u_long)*); +int WINAPI WS(ioctlsocket)(SOCKET,LONG,WS(u_long)*); int WINAPI WS(listen)(SOCKET,int); int WINAPI WS(recv)(SOCKET,char*,int,int); int WINAPI WS(recvfrom)(SOCKET,char*,int,int,struct WS(sockaddr)*,int*); diff --git a/include/winsock2.h b/include/winsock2.h index 8b75342..a302331 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -289,7 +289,7 @@ DECL_WINELIB_TYPE_AW(LPWSAPROTOCOL_INFO) typedef struct _WSANETWORKEVENTS { - long lNetworkEvents; + LONG lNetworkEvents; int iErrorCode[FD_MAX_EVENTS]; } WSANETWORKEVENTS, *LPWSANETWORKEVENTS; @@ -538,7 +538,7 @@ typedef HANDLE (WINAPI *LPFN_WSAASYNCGETPROTOBYNAME)(HWND,WS(u_int),const char*, typedef HANDLE (WINAPI *LPFN_WSAASYNCGETPROTOBYNUMBER)(HWND,WS(u_int),int,char*,int); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETSERVBYNAME)(HWND,WS(u_int),const char*,const char*,char*,int); typedef HANDLE (WINAPI *LPFN_WSAASYNCGETSERVBYPORT)(HWND,WS(u_int),int,const char*,char*,int); -typedef int (WINAPI *LPFN_WSAASYNCSELECT)(SOCKET,HWND,WS(u_int),long); +typedef int (WINAPI *LPFN_WSAASYNCSELECT)(SOCKET,HWND,WS(u_int),LONG); typedef int (WINAPI *LPFN_WSACANCELASYNCREQUEST)(HANDLE); typedef int (WINAPI *LPFN_WSACANCELBLOCKINGCALL)(void); typedef int (WINAPI *LPFN_WSACLEANUP)(void); @@ -568,9 +568,9 @@ typedef int (WINAPI *LPFN_GETSOCKNAME)(SOCKET,struct WS(sockaddr)*,int*); typedef int (WINAPI *LPFN_GETSOCKOPT)(SOCKET,int,int,char*,int*); typedef WS(u_long) (WINAPI *LPFN_HTONL)(WS(u_long)); typedef WS(u_short) (WINAPI *LPFN_HTONS)(WS(u_short)); -typedef unsigned long (WINAPI *LPFN_INET_ADDR)(const char*); +typedef ULONG (WINAPI *LPFN_INET_ADDR)(const char*); typedef char* (WINAPI *LPFN_INET_NTOA)(struct WS(in_addr); -typedef int (WINAPI *LPFN_IOCTLSOCKET)(SOCKET,long,WS(u_long)*); +typedef int (WINAPI *LPFN_IOCTLSOCKET)(SOCKET,LONG,WS(u_long)*); typedef int (WINAPI *LPFN_LISTEN)(SOCKET,int); typedef WS(u_long) (WINAPI *LPFN_NTOHL)(WS(u_long)); typedef WS(u_short) (WINAPI *LPFN_NTOHS)(WS(u_short)); @@ -609,7 +609,7 @@ int WINAPI WSAEnumNetworkEvents(SOCKET,WSAEVENT,LPWSANETWORKEVENTS); int WINAPI WSAEnumProtocolsA(LPINT,LPWSAPROTOCOL_INFOA,LPDWORD); int WINAPI WSAEnumProtocolsW(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD); #define WSAEnumProtocols WINELIB_NAME_AW(WSAEnumProtocols) -int WINAPI WSAEventSelect(SOCKET,WSAEVENT,long); +int WINAPI WSAEventSelect(SOCKET,WSAEVENT,LONG); BOOL WINAPI WSAGetOverlappedResult(SOCKET,LPWSAOVERLAPPED,LPDWORD,BOOL,LPDWORD); BOOL WINAPI WSAGetQOSByName(SOCKET,LPWSABUF,LPQOS); INT WINAPI WSAGetServiceClassInfoA(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOA); @@ -682,7 +682,7 @@ typedef int (WINAPI *LPFN_WSAENUMNETWORKEVENT)(SOCKET,WSAEVENT,LPWSANETWORKEVENT typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSA)(LPINT,LPWSAPROTOCOL_INFOA,LPDWORD); typedef int (WINAPI *LPFN_WSAENUMPROTOCOLSW)(LPINT,LPWSAPROTOCOL_INFOW,LPDWORD); #define LPFN_WSAENUMPROTOCOLS WINELIB_NAME_AW(LPFN_WSAENUMPROTOCOLS) -typedef int (WINAPI *LPFN_WSAEVENTSELECT)(SOCKET,WSAEVENT,long); +typedef int (WINAPI *LPFN_WSAEVENTSELECT)(SOCKET,WSAEVENT,LONG); typedef BOOL (WINAPI *LPFN_WSAGETOVERLAPPEDRESULT)(SOCKET,LPWSAOVERLAPPED,LPDWORD,BOOL,LPDWORD); typedef BOOL (WINAPI *LPFNWSAGETQOSBYNAME)(SOCKET,LPWSABUF,LPQOS); typedef INT (WINAPI *LPFNWSAGETSERVICECLASSINFOA)(LPGUID,LPGUID,LPDWORD,LPWSASERVICECLASSINFOA); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 27e232e..f9762d3 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5644,6 +5644,7 @@ GROUP HANDLE HWND INT +LONG SOCKET UINT WORD @@ -5652,7 +5653,6 @@ WS_u_long WSAESETSERVICEOP WSAEVENT int -long %ptr

1 0

Alexandre Julliard : ws2_32: Simplify the async shutdown handling, and remove a bunch of no longer used code.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: f2febca8f6fb049ec53dc641825780a445ad2df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2febca8f6fb049ec53dc6418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 17:51:18 2007 +0200 ws2_32: Simplify the async shutdown handling, and remove a bunch of no longer used code. --- dlls/ws2_32/socket.c | 188 ++++++++++--------------------------------------- 1 files changed, 39 insertions(+), 149 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a72c6b5..6f883b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -185,7 +185,7 @@ static inline const char *debugstr_sockaddr( const struct WS_sockaddr *a ) typedef struct ws2_async { HANDLE hSocket; - enum ws2_mode {ws2m_read, ws2m_write, ws2m_sd_read, ws2m_sd_write} mode; + int type; LPWSAOVERLAPPED user_overlapped; LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; IO_STATUS_BLOCK local_iosb; @@ -198,7 +198,6 @@ typedef struct ws2_async int *ptr; /* for recv operations */ } addrlen; DWORD flags; - HANDLE event; } ws2_async; /****************************************************************/ @@ -1023,115 +1022,6 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws * Functions for handling overlapped I/O **************************************************************************/ -static void ws2_async_terminate(ws2_async* as, IO_STATUS_BLOCK* iosb, NTSTATUS status, ULONG count) -{ - TRACE( "as: %p uovl %p ovl %p\n", as, as->user_overlapped, iosb ); - - iosb->u.Status = status; - iosb->Information = count; - if (as->completion_func) - as->completion_func( NtStatusToWSAError(status), - count, as->user_overlapped, as->flags ); - - HeapFree( GetProcessHeap(), 0, as ); -} - -/*********************************************************************** - * WS2_make_async (INTERNAL) - */ - -static NTSTATUS WS2_async_recv(void*, IO_STATUS_BLOCK*, NTSTATUS); -static NTSTATUS WS2_async_send(void*, IO_STATUS_BLOCK*, NTSTATUS); -static NTSTATUS WS2_async_shutdown( void*, IO_STATUS_BLOCK*, NTSTATUS); - -static inline struct ws2_async* -WS2_make_async(SOCKET s, enum ws2_mode mode, struct iovec *iovec, DWORD dwBufferCount, - LPDWORD lpFlags, struct WS_sockaddr *addr, - LPINT addrlen, LPWSAOVERLAPPED lpOverlapped, - LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, - IO_STATUS_BLOCK **piosb) -{ - struct ws2_async *wsa = HeapAlloc( GetProcessHeap(), 0, sizeof( ws2_async ) ); - - TRACE( "wsa %p\n", wsa ); - - if (!wsa) - return NULL; - - wsa->hSocket = (HANDLE) s; - wsa->mode = mode; - switch (mode) - { - case ws2m_read: - case ws2m_sd_read: - wsa->flags = *lpFlags; - wsa->addrlen.ptr = addrlen; - break; - case ws2m_write: - case ws2m_sd_write: - wsa->flags = 0; - wsa->addrlen.val = *addrlen; - break; - default: - ERR("Invalid async mode: %d\n", mode); - } - wsa->user_overlapped = lpOverlapped; - wsa->completion_func = lpCompletionRoutine; - memcpy( wsa->iovec, iovec, dwBufferCount * sizeof(*iovec) ); - wsa->n_iovecs = dwBufferCount; - wsa->addr = addr; - wsa->event = 0; - - if ( lpOverlapped ) - { - *piosb = (IO_STATUS_BLOCK*)lpOverlapped; - if (!lpCompletionRoutine) - wsa->event = lpOverlapped->hEvent; - } - else - *piosb = &wsa->local_iosb; - - TRACE( "wsa %p, h %p, ev %p, iosb %p, uov %p, cfunc %p\n", - wsa, wsa->hSocket, wsa->event, - *piosb, wsa->user_overlapped, wsa->completion_func ); - - return wsa; -} - -static ULONG ws2_queue_async(struct ws2_async* wsa, IO_STATUS_BLOCK* iosb) -{ - NTSTATUS (*apc)(void *, IO_STATUS_BLOCK *, NTSTATUS); - int type; - NTSTATUS status; - - switch (wsa->mode) - { - case ws2m_read: apc = WS2_async_recv; type = ASYNC_TYPE_READ; break; - case ws2m_write: apc = WS2_async_send; type = ASYNC_TYPE_WRITE; break; - case ws2m_sd_read: apc = WS2_async_shutdown; type = ASYNC_TYPE_READ; break; - case ws2m_sd_write: apc = WS2_async_shutdown; type = ASYNC_TYPE_WRITE; break; - default: FIXME("Unknown internal mode (%d)\n", wsa->mode); return STATUS_INVALID_PARAMETER; - } - - SERVER_START_REQ( register_async ) - { - req->handle = wsa->hSocket; - req->async.callback = apc; - req->async.iosb = iosb; - req->async.arg = wsa; - req->async.event = wsa->event; - req->type = type; - status = wine_server_call( req ); - } - SERVER_END_REQ; - - if (status != STATUS_PENDING) - ws2_async_terminate(wsa, iosb, status, 0); - else - NtCurrentTeb()->num_async_io++; - return status; -} - /* user APC called upon async completion */ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved ) { @@ -1381,24 +1271,23 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS ws2_async* wsa = user; int fd, err = 1; - TRACE( "async %p %d\n", wsa, wsa->mode ); + TRACE( "async %p %d\n", wsa, wsa->type ); switch (status) { case STATUS_ALERTED: if ((status = wine_server_handle_to_fd( wsa->hSocket, 0, &fd, NULL ) )) break; - switch ( wsa->mode ) + switch ( wsa->type ) { - case ws2m_sd_read: err = shutdown( fd, 0 ); break; - case ws2m_sd_write: err = shutdown( fd, 1 ); break; - default: ERR("invalid mode: %d\n", wsa->mode ); + case ASYNC_TYPE_READ: err = shutdown( fd, 0 ); break; + case ASYNC_TYPE_WRITE: err = shutdown( fd, 1 ); break; } wine_server_release_fd( wsa->hSocket, fd ); status = err ? wsaErrno() : STATUS_SUCCESS; break; } - ws2_async_terminate(wsa, iosb, status, 0); + iosb->u.Status = status; return status; } @@ -1407,44 +1296,45 @@ static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS * * Helper function for WS_shutdown() on overlapped sockets. */ -static int WS2_register_async_shutdown( SOCKET s, enum ws2_mode mode ) +static int WS2_register_async_shutdown( SOCKET s, int type ) { struct ws2_async *wsa; - int ret, err = WSAEFAULT; - DWORD dwflags = 0; - int len = 0; - LPWSAOVERLAPPED ovl = HeapAlloc(GetProcessHeap(), 0, sizeof( WSAOVERLAPPED )); - IO_STATUS_BLOCK *iosb = NULL; + NTSTATUS status; - TRACE("s %ld mode %d\n", s, mode); - if (!ovl) - goto out; + TRACE("s %ld type %d\n", s, type); - ovl->hEvent = WSACreateEvent(); - if ( ovl->hEvent == WSA_INVALID_EVENT ) - goto out_free; - - wsa = WS2_make_async( s, mode, NULL, 0, &dwflags, NULL, &len, ovl, NULL, &iosb ); + wsa = HeapAlloc( GetProcessHeap(), 0, sizeof(*wsa) ); if ( !wsa ) - goto out_close; + return WSAEFAULT; + + wsa->hSocket = SOCKET2HANDLE(s); + wsa->type = type; + wsa->completion_func = NULL; - /* Hack: this will cause ws2_async_terminate() to free the overlapped structure */ - wsa->user_overlapped = NULL; - if ((ret = ws2_queue_async( wsa, iosb )) != STATUS_PENDING) + SERVER_START_REQ( register_async ) { - err = NtStatusToWSAError( ret ); - goto out; + req->handle = wsa->hSocket; + req->type = type; + req->async.callback = WS2_async_shutdown; + req->async.iosb = &wsa->local_iosb; + req->async.arg = wsa; + req->async.apc = ws2_async_apc; + req->async.apc_arg = wsa; + status = wine_server_call( req ); } + SERVER_END_REQ; + + if (status != STATUS_PENDING) + { + HeapFree( GetProcessHeap(), 0, wsa ); + return NtStatusToWSAError( status ); + } + else + NtCurrentTeb()->num_async_io++; + /* Try immediate completion */ - while ( WaitForSingleObjectEx( ovl->hEvent, 0, TRUE ) == STATUS_USER_APC ); + Sleep(0); return 0; - -out_close: - WSACloseEvent( ovl->hEvent ); -out_free: - HeapFree( GetProcessHeap(), 0, ovl ); -out: - return err; } /*********************************************************************** @@ -3162,15 +3052,15 @@ int WINAPI WS_shutdown(SOCKET s, int how) switch ( how ) { case SD_RECEIVE: - err = WS2_register_async_shutdown( s, ws2m_sd_read ); + err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); break; case SD_SEND: - err = WS2_register_async_shutdown( s, ws2m_sd_write ); + err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); break; case SD_BOTH: default: - err = WS2_register_async_shutdown( s, ws2m_sd_read ); - if (!err) err = WS2_register_async_shutdown( s, ws2m_sd_write ); + err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); + if (!err) err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); break; } if (err) goto error;

1 0

← Newer
1
...
79
80
81
82
83
84
85
86
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 June 2007