January 2009 - Wine-commits

Francois Gouget : winhlp32: Make some functions static in macro.c.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 4967984d94ecf3145fe47507a3f234c81d0b3a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4967984d94ecf3145fe47507a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 14:16:50 2009 +0100 winhlp32: Make some functions static in macro.c. --- programs/winhlp32/macro.c | 146 ++++++++++++++++++++++---------------------- programs/winhlp32/macro.h | 73 ---------------------- 2 files changed, 73 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4967984d94ecf3145fe47…

1 0

Dylan Smith : richedit: Missing condition for inserting newline before table.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 1f6b8c7fd9f599513e2d34c1fd716b61e4e4e1ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6b8c7fd9f599513e2d34c1f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jan 8 09:14:10 2009 -0500 richedit: Missing condition for inserting newline before table. This case occurs when the cursor is at the start of the table, the table is at the start of the text, and there is no selection. --- dlls/riched20/editor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 5bfc0aa..563e12e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2319,7 +2319,8 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, else if (para == ME_GetParagraph(editor->pCursors[1].pRun) && cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) + !para->member.para.prev_para->member.para.nCharOfs && + wstr == '\r') { /* Insert a newline before the table. */ WCHAR endl = '\r';

1 0

Alexandre Julliard : wineconsole: Replace a couple of handle casts by the appropriate server function.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 014e2db49597068a94f81484763e0b694a639283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014e2db49597068a94f814847… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:33:07 2009 +0100 wineconsole: Replace a couple of handle casts by the appropriate server function. --- programs/wineconsole/wineconsole.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 7d10783..3626383 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -301,7 +301,7 @@ int WINECON_GrabChanges(struct inner_data* data) req->access = GENERIC_READ | GENERIC_WRITE; req->attributes = 0; req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; - h = wine_server_call_err( req ) ? 0 : (HANDLE)reply->handle; + h = wine_server_call_err( req ) ? 0 : wine_server_ptr_handle(reply->handle); } SERVER_END_REQ; WINE_TRACE(" active(%p)", h); @@ -635,8 +635,8 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna req->pid = pid; ret = !wine_server_call_err( req ); - data->hConIn = (HANDLE)reply->handle_in; - data->hSynchro = (HANDLE)reply->event; + data->hConIn = wine_server_ptr_handle( reply->handle_in ); + data->hSynchro = wine_server_ptr_handle( reply->event ); } SERVER_END_REQ; if (!ret) goto error; @@ -649,7 +649,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna req->attributes = 0; req->share = FILE_SHARE_READ|FILE_SHARE_WRITE; ret = !wine_server_call_err( req ); - data->hConOut = (HANDLE)reply->handle_out; + data->hConOut = wine_server_ptr_handle( reply->handle_out ); } SERVER_END_REQ; if (!ret) goto error;

1 0

Alexandre Julliard : winhlp32: Use LONG instead of long for data loaded from a file.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: aacdc9accea14e49648281e8a46f96c06a7fd4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacdc9accea14e49648281e8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:33:44 2009 +0100 winhlp32: Use LONG instead of long for data loaded from a file. --- programs/winhlp32/hlpfile.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/programs/winhlp32/hlpfile.c b/programs/winhlp32/hlpfile.c index 99043ac..652ed58 100644 --- a/programs/winhlp32/hlpfile.c +++ b/programs/winhlp32/hlpfile.c @@ -460,36 +460,36 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlpfile, const BYTE *buf, const BYTE *end, return TRUE; } -static long fetch_long(const BYTE** ptr) +static LONG fetch_long(const BYTE** ptr) { - long ret; + LONG ret; if (*(*ptr) & 1) { - ret = (*(const unsigned long*)(*ptr) - 0x80000000L) / 2; + ret = (*(const ULONG*)(*ptr) - 0x80000000) / 2; (*ptr) += 4; } else { - ret = (*(const unsigned short*)(*ptr) - 0x8000) / 2; + ret = (*(const USHORT*)(*ptr) - 0x8000) / 2; (*ptr) += 2; } return ret; } -static unsigned long fetch_ulong(const BYTE** ptr) +static ULONG fetch_ulong(const BYTE** ptr) { - unsigned long ret; + ULONG ret; if (*(*ptr) & 1) { - ret = *(const unsigned long*)(*ptr) / 2; + ret = *(const ULONG*)(*ptr) / 2; (*ptr) += 4; } else { - ret = *(const unsigned short*)(*ptr) / 2; + ret = *(const USHORT*)(*ptr) / 2; (*ptr) += 2; } return ret; @@ -785,7 +785,7 @@ static BOOL HLPFILE_RtfAddBitmap(struct RtfData* rd, const BYTE* beg, BYTE type, const BYTE* pict_beg; BYTE* alloc = NULL; BITMAPINFO* bi; - unsigned long off, csz; + ULONG off, csz; unsigned nc = 0; BOOL clrImportant = FALSE; BOOL ret = FALSE; @@ -880,9 +880,8 @@ done: */ static BOOL HLPFILE_RtfAddMetaFile(struct RtfData* rd, const BYTE* beg, BYTE pack) { + ULONG size, csize, off, hsoff; const BYTE* ptr; - unsigned long size, csize; - unsigned long off, hsoff; const BYTE* bits; BYTE* alloc = NULL; char tmp[256]; @@ -906,8 +905,8 @@ static BOOL HLPFILE_RtfAddMetaFile(struct RtfData* rd, const BYTE* beg, BYTE hsoff = GET_UINT(ptr, 4); ptr += 8; - WINE_TRACE("sz=%lu csz=%lu offs=%lu/%u,%lu\n", - size, csize, off, ptr - beg, hsoff); + WINE_TRACE("sz=%u csz=%u offs=%u/%u,%u\n", + size, csize, off, (ULONG)(ptr - beg), hsoff); bits = HLPFILE_DecompressGfx(beg + off, csize, size, pack, &alloc); if (!bits) return FALSE; @@ -925,7 +924,7 @@ static BOOL HLPFILE_RtfAddMetaFile(struct RtfData* rd, const BYTE* beg, BYTE * */ static BOOL HLPFILE_RtfAddGfxByAddr(struct RtfData* rd, HLPFILE *hlpfile, - const BYTE* ref, unsigned long size) + const BYTE* ref, ULONG size) { unsigned i, numpict; @@ -1047,7 +1046,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, UINT textsize; const BYTE *format, *format_end; char *text, *text_base, *text_end; - long size, blocksize, datalen; + LONG size, blocksize, datalen; unsigned short bits; unsigned nc, ncol = 1; short table_width; @@ -1354,7 +1353,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, case 0x88: { BYTE type = format[1]; - long size; + LONG size; /* FIXME: we don't use 'BYTE pos = (*format - 0x86);' for the image position */ format += 2; @@ -1373,7 +1372,7 @@ static BOOL HLPFILE_BrowseParagraph(HLPFILE_PAGE* page, struct RtfData* rd, rd->char_pos++; break; case 1: - WINE_FIXME("does it work ??? %x<%lu>#%u\n", + WINE_FIXME("does it work ??? %x<%u>#%u\n", GET_SHORT(format, 0), size, GET_SHORT(format, 2)); HLPFILE_RtfAddGfxByAddr(rd, page->file, format + 2, size - 4); @@ -2126,14 +2125,14 @@ static BOOL HLPFILE_Uncompress_Phrases40(HLPFILE* hlpfile) INT dec_size, cpr_size; BYTE *buf_idx, *end_idx; BYTE *buf_phs, *end_phs; - long* ptr, mask = 0; + LONG* ptr, mask = 0; unsigned int i; unsigned short bc, n; if (!HLPFILE_FindSubFile(hlpfile, "|PhrIndex", &buf_idx, &end_idx) || !HLPFILE_FindSubFile(hlpfile, "|PhrImage", &buf_phs, &end_phs)) return FALSE; - ptr = (long*)(buf_idx + 9 + 28); + ptr = (LONG*)(buf_idx + 9 + 28); bc = GET_USHORT(buf_idx, 9 + 24) & 0x0F; num = hlpfile->num_phrases = GET_USHORT(buf_idx, 9 + 4);

1 0

Alexandre Julliard : winhlp32: Use GetWindowLongPtr to retrieve a pointer, and make sure there is enough space for it.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 32484769b840056dd07585b540a6c2a52e700f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32484769b840056dd07585b54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:34:08 2009 +0100 winhlp32: Use GetWindowLongPtr to retrieve a pointer, and make sure there is enough space for it. --- programs/winhlp32/winhelp.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 7cb4a12..15e17f6 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1327,7 +1327,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; case MNID_OPTS_FONTS_NORMAL: case MNID_CTXT_FONTS_NORMAL: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); if (win->font_scale != 1) { win->font_scale = 1; @@ -1336,7 +1336,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; case MNID_OPTS_FONTS_LARGE: case MNID_CTXT_FONTS_LARGE: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); if (win->font_scale != 2) { win->font_scale = 2; @@ -1443,7 +1443,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, HMENU hMenu; POINT pt; - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); hMenu = LoadMenu(Globals.hInstance, (LPSTR)CONTEXT_MENU); switch (win->font_scale) { @@ -1479,7 +1479,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, case EN_REQUESTRESIZE: rc = ((REQRESIZE*)lParam)->rc; - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); AdjustWindowRect(&rc, GetWindowLong(win->hMainWnd, GWL_STYLE), FALSE); SetWindowPos(win->hMainWnd, HWND_TOP, 0, 0, @@ -1492,7 +1492,7 @@ static LRESULT CALLBACK WINHELP_MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, break; case WM_INITMENUPOPUP: - win = (WINHELP_WINDOW*) GetWindowLong(hWnd, 0); + win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_SMALL, MF_BYCOMMAND | (win->font_scale == 0) ? MF_CHECKED : 0); CheckMenuItem((HMENU)wParam, MNID_OPTS_FONTS_NORMAL, @@ -1594,7 +1594,7 @@ static BOOL WINHELP_RegisterWinClasses(void) class_main.style = CS_HREDRAW | CS_VREDRAW; class_main.lpfnWndProc = WINHELP_MainWndProc; class_main.cbClsExtra = 0; - class_main.cbWndExtra = sizeof(LONG); + class_main.cbWndExtra = sizeof(WINHELP_WINDOW *); class_main.hInstance = Globals.hInstance; class_main.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_WINHELP)); class_main.hCursor = LoadCursor(0, IDC_ARROW);

1 0

Alexandre Julliard : ddraw: Fix an uninitialized variable warning on non-i386.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 149259d49f20a07d8ec1411f14cb8c9bf4500926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=149259d49f20a07d8ec1411f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:30:22 2009 +0100 ddraw: Fix an uninitialized variable warning on non-i386. --- dlls/ddraw/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d35a297..819b07b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -85,6 +85,7 @@ static inline WORD d3d_fpu_setup(void) FIXME("FPUPRESERVE not implemented for this platform / compiler\n"); warned = TRUE; } + return 0; #endif set_fpu_control_word(0x37f);

1 0

Alexandre Julliard : quartz: Use SetWindowLongPtr to store a pointer value.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 8c33528372d563315dc1c90b3deb5af6e3e31e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c33528372d563315dc1c90b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:30:57 2009 +0100 quartz: Use SetWindowLongPtr to store a pointer value. --- dlls/quartz/videorenderer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 4d38164..9a2e1c3 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -96,7 +96,7 @@ typedef struct VideoRendererImpl static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - VideoRendererImpl* pVideoRenderer = (VideoRendererImpl*)GetWindowLongA(hwnd, 0); + VideoRendererImpl* pVideoRenderer = (VideoRendererImpl*)GetWindowLongPtrW(hwnd, 0); LPRECT lprect = (LPRECT)lParam; if (pVideoRenderer && pVideoRenderer->hWndMsgDrain) @@ -197,7 +197,7 @@ static BOOL CreateRenderingWindow(VideoRendererImpl* This) return FALSE; } - SetWindowLongA(This->hWnd, 0, (LONG)This); + SetWindowLongPtrW(This->hWnd, 0, (LONG_PTR)This); return TRUE; }

1 0

Alexandre Julliard : msvcrt: Fix an unused function warning on non-i386.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: adad9b668233f490fa951b4cc6d18bcb4faa3ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adad9b668233f490fa951b4cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:29:59 2009 +0100 msvcrt: Fix an unused function warning on non-i386. --- dlls/msvcrt/except.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 7c4ee47..9b254f8 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -96,6 +96,9 @@ static inline int call_unwind_func( int (*func)(void), void *ebp ) #endif + +#ifdef __i386__ + static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD* frame, PCONTEXT context, @@ -111,7 +114,7 @@ static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, /********************************************************************* * _EH_prolog (MSVCRT.@) */ -#ifdef __i386__ + /* Provided for VC++ binary compatibility only */ __ASM_GLOBAL_FUNC(_EH_prolog, "pushl $-1\n\t" @@ -251,7 +254,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, } } #else - FIXME("exception %lx flags=%lx at %p handler=%p %p %p stub\n", + FIXME("exception %x flags=%x at %p handler=%p %p %p stub\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, frame->handler, context, dispatcher); #endif

1 0

Alexandre Julliard : rpcrt4: Fix an unused value warning on non-i386.
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: 9d09985ad1d0046cc2e434afbe4bb1313af9bd61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d09985ad1d0046cc2e434afb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:30:09 2009 +0100 rpcrt4: Fix an unused value warning on non-i386. --- dlls/rpcrt4/ndr_marshall.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 9608f1e..f0a13de 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -58,8 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); (*(pchar) = LOBYTE(LOWORD(uint32)), \ *((pchar)+1) = HIBYTE(LOWORD(uint32)), \ *((pchar)+2) = LOBYTE(HIWORD(uint32)), \ - *((pchar)+3) = HIBYTE(HIWORD(uint32)), \ - (uint32)) /* allow as r-value */ + *((pchar)+3) = HIBYTE(HIWORD(uint32))) # define LITTLE_ENDIAN_UINT32_READ(pchar) \ (MAKELONG( \ @@ -71,8 +70,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); (*((pchar)+3) = LOBYTE(LOWORD(uint32)), \ *((pchar)+2) = HIBYTE(LOWORD(uint32)), \ *((pchar)+1) = LOBYTE(HIWORD(uint32)), \ - *(pchar) = HIBYTE(HIWORD(uint32)), \ - (uint32)) /* allow as r-value */ + *(pchar) = HIBYTE(HIWORD(uint32))) #define BIG_ENDIAN_UINT32_READ(pchar) \ (MAKELONG( \

1 0

Alexandre Julliard : ws2_32: Fix an error return value in bind().
by Alexandre Julliard 09 Jan '09

09 Jan '09

Module: wine Branch: master Commit: a46441bd02e354a070fb43f5f5855c23110559b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46441bd02e354a070fb43f5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 17:29:27 2009 +0100 ws2_32: Fix an error return value in bind(). --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 078c3be..cabe191 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1429,7 +1429,7 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) { release_sock_fd( s, fd ); SetLastError(WSAEAFNOSUPPORT); - return INVALID_SOCKET; + return SOCKET_ERROR; } } #endif

1 0