December 2007 - Wine-Commits

Alexander Dorofeyev : ws2_32: Fix timeout check.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: d5a09fdda7d6bdf0bf2d71f337b870d49b54516c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a09fdda7d6bdf0bf2d71f33… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Dec 24 02:24:09 2007 -0800 ws2_32: Fix timeout check. --- 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 f1ea825..98eb2f9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2766,7 +2766,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (timeout != -1) { - timeout -= timeout_start - GetTickCount(); + timeout -= GetTickCount() - timeout_start; if (timeout < 0) timeout = 0; }

1 0

Rob Shearman : oleaut32: Fix copy and paste error in VARIANT_UserUnmarshall with VT_UNKNOWN test.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 0efbce51127a38dc1a349c682b82af9df51af731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efbce51127a38dc1a349c682… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 26 11:03:03 2007 +0000 oleaut32: Fix copy and paste error in VARIANT_UserUnmarshall with VT_UNKNOWN test. The variant type is VT_UNKNOWN so we should be using V_UNKNOWN, not V_VARIANTREF(V_R8) to check the type unmarshalled properly. --- dlls/oleaut32/tests/usrmarshal.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 20fc2f8..70f9fd2 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1043,7 +1043,6 @@ static void test_marshal_VARIANT(void) lpsa = SafeArrayCreate(VT_R8, 1, &sab); *(DWORD *)lpsa->pvData = 0xcafebabe; *((DWORD *)lpsa->pvData + 1) = 0xdeadbeef; - lpsa->cLocks = 7; VariantInit(&v); V_VT(&v) = VT_UI4 | VT_ARRAY; @@ -1127,7 +1126,6 @@ static void test_marshal_VARIANT(void) VARIANT_UserFree(&umcb.Flags, &v2); } HeapFree(GetProcessHeap(), 0, buffer); - lpsa->cLocks = 0; SafeArrayDestroy(lpsa); /*** VARIANT BYREF ***/ @@ -1216,9 +1214,7 @@ static void test_marshal_VARIANT(void) stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v3); ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3)); - ok(V_VT(V_VARIANTREF(&v)) == V_VT(V_VARIANTREF(&v3)), "vts differ %x %x\n", - V_VT(V_VARIANTREF(&v)), V_VT(V_VARIANTREF(&v3))); - ok(V_R8(V_VARIANTREF(&v)) == V_R8(V_VARIANTREF(&v3)), "r8s differ\n"); + ok(V_UNKNOWN(&v) == V_UNKNOWN(&v3), "got %p expect %p\n", V_UNKNOWN(&v), V_UNKNOWN(&v3)); VARIANT_UserFree(&umcb.Flags, &v3); ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1); IUnknown_Release((IUnknown *)heap_unknown);

1 0

Rob Shearman : quartz: Fix memory leak in FilterGraphInner_Release.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: da93bc702f60eaf0e357b61621f298b79d260ab3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da93bc702f60eaf0e357b6162… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 26 11:03:17 2007 +0000 quartz: Fix memory leak in FilterGraphInner_Release. --- dlls/quartz/filtergraph.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fc1aa57..5b4b711 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -289,6 +289,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown * iface) { { IBaseFilter_SetSyncSource(This->ppFiltersInGraph[i], NULL); IBaseFilter_Release(This->ppFiltersInGraph[i]); + CoTaskMemFree(This->pFilterNames[i]); } for (i = 0; i < This->nItfCacheEntries; i++) {

1 0

Andrey Turkin : dbghelp: Treat const addresses as const unsigned.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: a38cd7ac01b694c21f52c565b2c312ceb5820bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38cd7ac01b694c21f52c565b… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Wed Dec 26 11:51:18 2007 +0300 dbghelp: Treat const addresses as const unsigned. This will prevent winedbg from spamming about __wine_dbch__default. --- dlls/dbghelp/dwarf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 66c761c..a03b049 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1329,6 +1329,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, case DW_FORM_data2: case DW_FORM_data4: case DW_FORM_udata: + case DW_FORM_addr: v.n1.n2.vt = VT_UI4; v.n1.n2.n3.lVal = value.u.uvalue; break;

1 0

Rob Shearman : rpcrt4: Re-use existing memory for embedded pointers in NdrConformantVaryingArrayUnmarshall .
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 273766ee6fde333a89ea1c8574272c954916a122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=273766ee6fde333a89ea1c857… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 24 17:01:27 2007 +0000 rpcrt4: Re-use existing memory for embedded pointers in NdrConformantVaryingArrayUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 11 ++++++++--- dlls/rpcrt4/tests/server.c | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 38210f3..b07f8b2 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2864,6 +2864,8 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS ULONG bufsize, memsize; unsigned char alignment = pFormat[1] + 1; DWORD esize = *(const WORD*)(pFormat+2); + unsigned char *saved_buffer; + ULONG offset; TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -2881,13 +2883,16 @@ unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pS bufsize = safe_multiply(esize, pStubMsg->ActualCount); memsize = safe_multiply(esize, pStubMsg->MaxCount); + offset = pStubMsg->Offset; if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, memsize); - pStubMsg->BufferMark = pStubMsg->Buffer; - safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); + saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */); + EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat, fMustAlloc); + + memcpy(*ppMemory + offset, saved_buffer, bufsize); return NULL; } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 2e392dd..eee6ec2 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1143,7 +1143,6 @@ array_tests(void) api[0].pi = pi; get_numbers(1, 1, api); - todo_wine ok(api[0].pi == pi, "RPC conformant varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *pi); HeapFree(GetProcessHeap(), 0, pi);

1 0

Rob Shearman : rpcrt4: Re-use existing memory for embedded pointers in NdrVaryingArrayUnmarshall.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 3e8a032e8bdf0c477233d588834590bb71fea2e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8a032e8bdf0c477233d5888… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 24 17:01:40 2007 +0000 rpcrt4: Re-use existing memory for embedded pointers in NdrVaryingArrayUnmarshall. --- dlls/rpcrt4/ndr_marshall.c | 11 ++++++++--- dlls/rpcrt4/tests/server.c | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index b07f8b2..60e057f 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4479,6 +4479,8 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char alignment; DWORD size, elements, esize; ULONG bufsize; + unsigned char *saved_buffer; + ULONG offset; TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); @@ -4517,13 +4519,16 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, ALIGN_POINTER(pStubMsg->Buffer, alignment); bufsize = safe_multiply(esize, pStubMsg->ActualCount); + offset = pStubMsg->Offset; if (!*ppMemory || fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); - pStubMsg->BufferMark = pStubMsg->Buffer; - safe_copy_from_buffer(pStubMsg, *ppMemory + pStubMsg->Offset, bufsize); + saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, bufsize); - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat, TRUE /* FIXME */); + EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat, fMustAlloc); + + memcpy(*ppMemory + offset, saved_buffer, bufsize); return NULL; } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index eee6ec2..425b20b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1137,7 +1137,6 @@ array_tests(void) *pi = -1; api[0].pi = pi; get_5numbers(1, api); - todo_wine ok(api[0].pi == pi, "RPC varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *pi);

1 0

Rob Shearman : rpcrt4: Add tests for varying and conformant varying arrays.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: a05923e1d303788c9b7bfda61eb2ca9ae48653f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05923e1d303788c9b7bfda61… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Dec 24 17:01:20 2007 +0000 rpcrt4: Add tests for varying and conformant varying arrays. --- dlls/rpcrt4/tests/server.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/tests/server.idl | 2 + 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index c8acab9..2e392dd 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -595,6 +595,32 @@ s_context_handle_test(void) } void +s_get_5numbers(int count, pints_t n[5]) +{ + int i; + for (i = 0; i < count; i++) + { + n[i].pi = midl_user_allocate(sizeof(*n[i].pi)); + *n[i].pi = i; + n[i].ppi = NULL; + n[i].pppi = NULL; + } +} + +void +s_get_numbers(int length, int size, pints_t n[]) +{ + int i; + for (i = 0; i < length; i++) + { + n[i].pi = midl_user_allocate(sizeof(*n[i].pi)); + *n[i].pi = i; + n[i].ppi = NULL; + n[i].pppi = NULL; + } +} + +void s_stop(void) { ok(RPC_S_OK == RpcMgmtStopServerListening(NULL), "RpcMgmtStopServerListening\n"); @@ -1029,6 +1055,8 @@ array_tests(void) int n; int ca[5] = {1, -2, 3, -4, 5}; doub_carr_t *dc; + int *pi; + pints_t api[5]; ok(cstr_length(str1, sizeof str1) == strlen(str1), "RPC cstr_length\n"); @@ -1103,6 +1131,22 @@ array_tests(void) free_pyramid_doub_carr(dc); ok(sum_L1_norms(2, vs) == 21, "RPC sum_L1_norms\n"); + + memset(api, 0, sizeof(api)); + pi = HeapAlloc(GetProcessHeap(), 0, sizeof(*pi)); + *pi = -1; + api[0].pi = pi; + get_5numbers(1, api); + todo_wine + ok(api[0].pi == pi, "RPC varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); + ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *pi); + + api[0].pi = pi; + get_numbers(1, 1, api); + todo_wine + ok(api[0].pi == pi, "RPC conformant varying array [out] pointer changed from %p to %p\n", pi, api[0].pi); + ok(*api[0].pi == 0, "pi unmarshalled incorrectly %d\n", *pi); + HeapFree(GetProcessHeap(), 0, pi); } static void diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 66b0aff..ec51757 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -300,6 +300,8 @@ cpp_quote("#endif") int sum_pcarr2(int n, [size_is(, n)] int **pa); int sum_L1_norms(int n, [size_is(n)] vector_t *vs); + void get_5numbers([in] int count, [out, length_is(count)] pints_t pn[5]); + void get_numbers([in] int length, [in] int size, [out, length_is(length), size_is(size)] pints_t pn[]); str_t get_filename(void); void context_handle_test(void); void stop(void);

1 0

Reece H. Dunn : user32: Added the new Vista messages to spy.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 230ca207ca693d918e23cb38c55890ff6947daf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=230ca207ca693d918e23cb38c… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Tue Dec 25 02:04:43 2007 +0000 user32: Added the new Vista messages to spy. --- dlls/user32/spy.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index c29c6d7..22a4d5c 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -260,7 +260,9 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "BM_CLICK", /* 0x00f5 */ "BM_GETIMAGE", /* 0x00f6 */ "BM_SETIMAGE", /* 0x00f7 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, + "WM_INPUT_DEVICE_CHANGE", /* 0x00fe */ + "WM_INPUT", /* 0x00ff */ "WM_KEYDOWN", /* 0x0100 */ "WM_KEYUP", /* 0x0101 */ @@ -270,11 +272,11 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_SYSKEYUP", /* 0x0105 */ "WM_SYSCHAR", /* 0x0106 */ "WM_SYSDEADCHAR", /* 0x0107 */ - "WM_KEYLAST", /* 0x0108 */ NULL, - "WM_CONVERTREQUEST", - "WM_CONVERTRESULT", - "WM_INTERIM", + "WM_UNICHAR", /* 0x0109 */ + "WM_CONVERTREQUEST", /* 0x010a */ + "WM_CONVERTRESULT", /* 0x010b */ + "WM_INTERIM", /* 0x010c */ "WM_IME_STARTCOMPOSITION", /* 0x010d */ "WM_IME_ENDCOMPOSITION", /* 0x010e */ "WM_IME_COMPOSITION", /* 0x010f */ @@ -450,7 +452,8 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_XBUTTONDOWN", /* 0x020B */ "WM_XBUTTONUP", /* 0x020C */ "WM_XBUTTONDBLCLK", /* 0x020D */ - NULL, NULL, + "WM_MOUSEHWHEEL", /* 0x020E */ + NULL, "WM_PARENTNOTIFY", /* 0x0210 */ "WM_ENTERMENULOOP", /* 0x0211 */ @@ -589,17 +592,24 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_PALETTEISCHANGING", "WM_PALETTECHANGED", "WM_HOTKEY", /* 0x0312 */ - NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, "WM_PRINT", /* 0x0317 */ "WM_PRINTCLIENT", /* 0x0318 */ "WM_APPCOMMAND", /* 0x0319 */ "WM_THEMECHANGED", /* 0x031A */ - NULL, NULL, NULL, NULL, NULL, + NULL, NULL, + "WM_CLIPBOARDUPDATE", /* 0x031D */ + "WM_DWMCOMPOSITIONCHANGED", /* 0x031E */ + "WM_DWMNCRENDERINGCHANGED", /* 0x031F */ + "WM_DWMCOLORIZATIONCOLORCHANGED", /* 0x0320 */ + "WM_DWMWINDOWMAXIMIZEDCHANGE", /* 0x0321 */ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_GETTITLEBARINFOEX", /* 0x033F */ /* 0x0340 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,

1 0

Rob Shearman : msi: Fix several memory leaks after using IEnumSTATSTG_Next.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 5b072fbbeced03e5cdd924a6521a96266b58a464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b072fbbeced03e5cdd924a65… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 26 11:02:55 2007 +0000 msi: Fix several memory leaks after using IEnumSTATSTG_Next. The pwcsName field of STATSTG must be freed, otherwise the memory will be leaked. --- dlls/msi/streams.c | 5 +++++ dlls/msi/table.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index bb86fd0..9828b7f 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -408,17 +408,22 @@ static UINT add_streams_to_table(MSISTREAMSVIEW *sv) /* table streams are not in the _Streams table */ if (*stat.pwcsName == 0x4840) + { + CoTaskMemFree(stat.pwcsName); continue; + } stream = create_stream(sv, stat.pwcsName, TRUE, NULL); if (!stream) { count = -1; + CoTaskMemFree(stat.pwcsName); break; } IStorage_OpenStream(sv->db->storage, stat.pwcsName, 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream->stream); + CoTaskMemFree(stat.pwcsName); if (!add_stream_to_table(sv, stream, count++)) { diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 7824521..ca6fa1b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -265,6 +265,7 @@ void enum_stream_names( IStorage *stg ) decode_streamname( stat.pwcsName, name ); TRACE("stream %2d -> %s %s\n", n, debugstr_w(stat.pwcsName), debugstr_w(name) ); + CoTaskMemFree( stat.pwcsName ); n++; } @@ -2577,6 +2578,7 @@ UINT msi_table_apply_transform( MSIDATABASE *db, IStorage *stg ) break; decode_streamname( stat.pwcsName, name ); + CoTaskMemFree( stat.pwcsName ); if ( name[0] != 0x4840 ) continue;

1 0

Reece H. Dunn : include: Added the new Vista messages.
by Alexandre Julliard Dec. 26, 2007

Dec. 26, 2007

Module: wine Branch: master Commit: 2641f8192ebc7a0e3dc5d6d6014b2c6368626e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2641f8192ebc7a0e3dc5d6d60… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Tue Dec 25 02:00:28 2007 +0000 include: Added the new Vista messages. --- include/winuser.h | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index ddd81c5..3a6a42c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1193,6 +1193,7 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define WM_NCXBUTTONDBLCLK 0x00ad /* Raw input */ +#define WM_INPUT_DEVICE_CHANGE 0x00fe #define WM_INPUT 0x00ff /* Keyboard messages */ @@ -1204,8 +1205,9 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define WM_SYSKEYUP 0x0105 #define WM_SYSCHAR 0x0106 #define WM_SYSDEADCHAR 0x0107 +#define WM_UNICHAR 0x0109 #define WM_KEYFIRST WM_KEYDOWN -#define WM_KEYLAST 0x0108 +#define WM_KEYLAST 0x0109 /* Win32 4.0 messages for IME */ #define WM_IME_STARTCOMPOSITION 0x010d @@ -1278,12 +1280,13 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define WM_XBUTTONDOWN 0x020B #define WM_XBUTTONUP 0x020C #define WM_XBUTTONDBLCLK 0x020D +#define WM_MOUSEHWHEEL 0x020E #define XBUTTON1 0x0001 #define XBUTTON2 0x0002 #define WM_MOUSEFIRST 0x0200 -#define WM_MOUSELAST 0x020D +#define WM_MOUSELAST 0x020E #define WHEEL_DELTA 120 #define WHEEL_PAGESCROLL (UINT_MAX) @@ -1369,6 +1372,11 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define WM_IME_KEYDOWN 0x0290 #define WM_IME_KEYUP 0x0291 +#define WM_NCMOUSEHOVER 0x02A0 +#define WM_MOUSEHOVER 0x02A1 +#define WM_MOUSELEAVE 0x02A3 +#define WM_NCMOUSELEAVE 0x02A2 + #define WM_WTSSESSION_CHANGE 0x02B1 #define WM_TABLET_FIRST 0x02c0 @@ -1404,6 +1412,14 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define WM_PRINTCLIENT 0x0318 #define WM_APPCOMMAND 0x0319 #define WM_THEMECHANGED 0x031A +#define WM_CLIPBOARDUPDATE 0x031D + +#define WM_DWMCOMPOSITIONCHANGED 0x031E +#define WM_DWMNCRENDERINGCHANGED 0x031F +#define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320 +#define WM_DWMWINDOWMAXIMIZEDCHANGE 0x0321 + +#define WM_GETTITLEBARINFOEX 0x033F #define WM_HANDHELDFIRST 0x0358 #define WM_HANDHELDLAST 0x035F @@ -1416,6 +1432,8 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); #define WM_APP 0x8000 +#define UNICODE_NOCHAR 0xFFFF + /* MsgWaitForMultipleObjectsEx flags */ #define MWMO_WAITALL 0x0001 #define MWMO_ALERTABLE 0x0002 @@ -3799,12 +3817,6 @@ typedef struct tagCOMPAREITEMSTRUCT #define MK_XBUTTON2 0x0040 -#define WM_MOUSEHOVER 0x02A1 -#define WM_MOUSELEAVE 0x02A3 -#define WM_NCMOUSEHOVER 0x02A0 -#define WM_NCMOUSELEAVE 0x02A2 - - #define TME_HOVER 0x00000001 #define TME_LEAVE 0x00000002 #define TME_NONCLIENT 0x00000010

1 0