June 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : widl: Don' t make the proxy virtual tables const if they use delegation.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: d88f9e3cd9739dd29cd5325cc3b4aae7ff2c2d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88f9e3cd9739dd29cd5325cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:10:20 2009 +0200 widl: Don't make the proxy virtual tables const if they use delegation. --- tools/widl/proxy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index b8ccdac..cc753bb 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -624,7 +624,8 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) count = count_methods(iface); /* proxy vtable */ - print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", count, iface->name); + print_proxy( "static %sCINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", + need_delegation_indirect(iface) ? "" : "const ", count, iface->name); print_proxy( "{\n"); indent++; print_proxy( "{\n");

1 0

Alexandre Julliard : server: Avoid a crash when trying to wait on a disconnected pipe client.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 7a344c14af0d47c4479198bdfe4c8f1923ec5ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a344c14af0d47c4479198bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 12:11:05 2009 +0200 server: Avoid a crash when trying to wait on a disconnected pipe client. --- server/fd.c | 6 ++++++ server/file.h | 1 + server/named_pipe.c | 10 +++++++++- 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/server/fd.c b/server/fd.c index d9688e1..a57001a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1710,6 +1710,12 @@ void set_fd_signaled( struct fd *fd, int signaled ) if (signaled) wake_up( fd->user, 0 ); } +/* set or clear the fd signaled state */ +int is_fd_signaled( struct fd *fd ) +{ + return fd->signaled; +} + /* handler for close_handle that refuses to close fd-associated handles in other processes */ int fd_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { diff --git a/server/file.h b/server/file.h index 1aaa284..aef40f7 100644 --- a/server/file.h +++ b/server/file.h @@ -70,6 +70,7 @@ extern void set_fd_events( struct fd *fd, int events ); extern obj_handle_t lock_fd( struct fd *fd, file_pos_t offset, file_pos_t count, int shared, int wait ); extern void unlock_fd( struct fd *fd, file_pos_t offset, file_pos_t count ); extern void set_fd_signaled( struct fd *fd, int signaled ); +extern int is_fd_signaled( struct fd *fd ); extern int default_fd_signaled( struct object *obj, struct thread *thread ); extern unsigned int default_fd_map_access( struct object *obj, unsigned int access ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 539509e..54ce823 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -176,6 +176,7 @@ static const struct fd_ops pipe_server_fd_ops = /* client end functions */ static void pipe_client_dump( struct object *obj, int verbose ); +static int pipe_client_signaled( struct object *obj, struct thread *thread ); static struct fd *pipe_client_get_fd( struct object *obj ); static void pipe_client_destroy( struct object *obj ); static void pipe_client_flush( struct fd *fd, struct event **event ); @@ -188,7 +189,7 @@ static const struct object_ops pipe_client_ops = no_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - default_fd_signaled, /* signaled */ + pipe_client_signaled, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ pipe_client_get_fd, /* get_fd */ @@ -289,6 +290,13 @@ static void pipe_client_dump( struct object *obj, int verbose ) fprintf( stderr, "Named pipe client server=%p\n", client->server ); } +static int pipe_client_signaled( struct object *obj, struct thread *thread ) +{ + struct pipe_client *client = (struct pipe_client *) obj; + + return client->fd && is_fd_signaled(client->fd); +} + static void named_pipe_destroy( struct object *obj) { struct named_pipe *pipe = (struct named_pipe *) obj;

1 0

Austin English : winex11: Return correct length for GetKeyNameText.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 99069ab61f6b2f2a0b1745f73f80503d0631e3f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99069ab61f6b2f2a0b1745f73… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 8 11:52:48 2009 -0500 winex11: Return correct length for GetKeyNameText. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 05b3b53..8a6dd37 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2352,7 +2352,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) { MultiByteToWideChar(CP_UNIXCP, 0, name, -1, lpBuffer, nSize); lpBuffer[nSize - 1] = 0; - return 1; + return nSize; } }

1 0

Paul Vriens : msi/tests: Make sure we only create one logfile.
by Alexandre Julliard 09 Jun '09

09 Jun '09

Module: wine Branch: master Commit: 9b6cf226077244631fc987373ea99744c6f0a51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6cf226077244631fc987373… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jun 8 21:01:15 2009 +0200 msi/tests: Make sure we only create one logfile. --- dlls/msi/tests/install.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a554e34..de63ba2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5688,7 +5688,7 @@ static void test_propcase(void) START_TEST(install) { DWORD len; - char temp_path[MAX_PATH], prev_path[MAX_PATH]; + char temp_path[MAX_PATH], prev_path[MAX_PATH], log_file[MAX_PATH]; STATEMGRSTATUS status; BOOL ret = FALSE; @@ -5718,9 +5718,13 @@ START_TEST(install) } /* Create only one log file and don't append. We have to pass something - * for the log mode for this to work. + * for the log mode for this to work. The logfile needs to have an absolute + * path otherwise we still end up with some extra logfiles as some tests + * change the current directory. */ - MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, "msitest.log", 0); + lstrcpyA(log_file, temp_path); + lstrcatA(log_file, "\\msitest.log"); + MsiEnableLogA(INSTALLLOGMODE_FATALEXIT, log_file, 0); test_MsiInstallProduct(); test_MsiSetComponentState(); @@ -5761,7 +5765,7 @@ START_TEST(install) test_adminimage(); test_propcase(); - DeleteFileA("msitest.log"); + DeleteFileA(log_file); if (pSRSetRestorePointA && ret) {

1 0

Jeff Zaroyko : website: fix capitalisation of GIT -> Git, consistent with usage on the Git homepage since it's not really an acronym
by Jeremy Newman 08 Jun '09

08 Jun '09

Module: website Branch: master Commit: 86180f8d954647fdc6782fbb92448719d6ec9dcc URL: http://source.winehq.org/git/website.git/?a=commit;h=86180f8d954647fdc6782f… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Mon Jun 8 09:49:48 2009 -0500 website: fix capitalisation of GIT -> Git, consistent with usage on the Git homepage since it's not really an acronym --- templates/de/devel.template | 2 +- templates/en/cvs.template | 4 ++-- templates/en/devel.template | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/de/devel.template b/templates/de/devel.template index 087eba6..4957064 100644 --- a/templates/de/devel.template +++ b/templates/de/devel.template @@ -62,7 +62,7 @@ Hilfsmittel, die wir unseren Entwicklern zur Verfügung stellen.</p> <tr bgcolor="#ffffff"> <td> - <a href="http://wiki.winehq.org/GitWine">GIT</a> + <a href="http://wiki.winehq.org/GitWine">Git</a> </td> <td valign="top"> Wir nutzen Git zur Quellcodeverwaltung. Auf dieser Seite findest Du Informationen über den Umgang damit. diff --git a/templates/en/cvs.template b/templates/en/cvs.template index f742f86..358ba0b 100644 --- a/templates/en/cvs.template +++ b/templates/en/cvs.template @@ -3,8 +3,8 @@ <h1 class="title">The Wine CVS Tree</h1> -<p><strong>Note: We are switching development from CVS to <a href="http://git.or.cz">Git</a>. - Instructions for using the <a href="{$root}/site/git">Wine GIT tree</a> +<p><strong>Note: We have switched development from CVS to <a href="http://git.or.cz">Git</a>. + Instructions for using the <a href="{$root}/site/git">Wine Git tree</a> can be found on the <a href="http://wiki.winehq.org/GitWine">GitWine</a> page on the <a href="http://wiki.winehq.org">Wine Wiki</a>.</strong></p> diff --git a/templates/en/devel.template b/templates/en/devel.template index 82b9f1d..ddb54a8 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -64,7 +64,7 @@ various resources available for our developers.</p> <tr bgcolor="#ffffff"> <td> - <a href="http://wiki.winehq.org/GitWine">GIT</a> + <a href="http://wiki.winehq.org/GitWine">Git</a> </td> <td valign="top"> We use the source management tool Git. More information on how to use it can be found on this page.

1 0

Jeff Zaroyko : website: remove section about bugzilla FIXME keyword indicating a tasklist, this keyword is discouraged/ up for removal since nearly every application outputs fixmes.
by Jeremy Newman 08 Jun '09

08 Jun '09

Module: website Branch: master Commit: 19bf3e2df1bff2c6325a81c40f8f108cbc7e859b URL: http://source.winehq.org/git/website.git/?a=commit;h=19bf3e2df1bff2c6325a81… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Mon Jun 8 09:50:34 2009 -0500 website: remove section about bugzilla FIXME keyword indicating a tasklist, this keyword is discouraged/up for removal since nearly every application outputs fixmes. --- templates/de/contributing.template | 9 --------- templates/en/contributing.template | 8 -------- templates/pt/contributing.template | 7 ------- 3 files changed, 0 insertions(+), 24 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index 7c0ab2e..be57a75 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -165,15 +165,6 @@ verlangen, dass Du mit Lex/Yacc umgehen kannst. Falls du also spezielles Domänenwissen hast, dann guck doch mal über die Liste drüber.</li> - <li id="FIXMEs"><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">FIXMEs (en)</a>: - Diese Liste enthält Aufgaben, deren Komplexität zwischen - den Aufgäbchen und den Aufgaben liegt. Die hier aufgeführten - Probleme sind gut diagnostiziert; mit anderen Worten, wir wissen, - welche Funktion oder Funktionalität fehlt oder fehlerhaft ist. - Und auch wenn der Fehler nicht unbedingt einfach zu beheben ist, - sollte trotzdem weder extensives Wissen über mehrere Bereiche - von Wine noch eine umfängliche Reorganisation des Quellcodes - von Wine vonnöten sein.</li> <li id="tasklist"><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Aufgaben (en)</a>: Hier sind die größeren Entwicklungsaufgaben aufgeführt. Guck hier nach, wenn du an einem der größeren / diff --git a/templates/en/contributing.template b/templates/en/contributing.template index 3aee073..a652f33 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -145,14 +145,6 @@ Some tasks also draw on non-Wine specific knowledge. For instance a task may require being knowledgeable in Lex/Yacc so if you have an expertise in a given domain you may want to scan it.</li> - <li id="FIXMEs"><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">FIXMEs</a>: - This list contains tasks that are intermediate between those found - in the Task list and the Task lets. Issues found in this list are - well diagnosed, that is, we know which function or functionality is - missing / buggy. And while the fix may not be very easy to - implement, it normally is not thought to require extensive - knowledge of multiple areas of Wine, or extensive reorganization - of the Wine code.</li> <li id="tasklist"><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Tasklist</a>: The major development tasks are listed there. This is the place to check out if you want to get involved in one of the larger / diff --git a/templates/pt/contributing.template b/templates/pt/contributing.template index ed61e56..4009d74 100644 --- a/templates/pt/contributing.template +++ b/templates/pt/contributing.template @@ -151,13 +151,6 @@ também se focam em conhecimento não específico do Wine. Por exemplo uma tarefa pode necessitar que seja um conhecedor de Lex/Yacc, portanto se você tem vasta experiência num certo domínio pode querer procurar por ele.</li> - <li id="FIXMEs"><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">FIXMEs</a>: - Esta lista contém tarefas que são intermédias entre a Task List e a Task lets. - Assuntos encontrados nesta lista estão bem diagnosticados, isto é, sabe-se - qual a função ou funcionalidade em falta / incompleta. E enquanto o arranjo - possa não ser muito fácil de implementar, normalmente não é necessário um - conhecimento de múltiplas áreas do Wine ou uma reorganização extensa do - código Wine.</li> <li id="tasklist"><a href="http://bugs.winehq.org/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Tasklist</a>: As maiores tarefas de desenvolvimento estão listadas aqui. Este é o lugar a visitar se se quer envolver num dos projectos maiores, a longo prazo. Bugs

1 0

Jeff Zaroyko : website: mention bugzilla registration on sending_patches
by Jeremy Newman 08 Jun '09

08 Jun '09

Module: website Branch: master Commit: 690d5fb3489022ac5a4405a1d4784fb39cdaeb76 URL: http://source.winehq.org/git/website.git/?a=commit;h=690d5fb3489022ac5a4405… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Mon Jun 8 09:49:18 2009 -0500 website: mention bugzilla registration on sending_patches --- templates/en/sending_patches.template | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/templates/en/sending_patches.template b/templates/en/sending_patches.template index f185117..d4b2ac6 100644 --- a/templates/en/sending_patches.template +++ b/templates/en/sending_patches.template @@ -38,6 +38,8 @@ or anywhere else to the Git tree.) <li>Use standard C, avoid C++ comments and inline variable declarations. <li>Read the diff and make sure it contains only what you want in it. + + <li>Register an account on the Wine bugzilla with the email address you use to send patches. </ul> <p>Accepted patches will appear in the <a href="{$root}/site/forums">wine-cvs</a> mailing list.

1 0

Huw Davies : widl: Add support for the lcid parameter attribute.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: 81b2c9eb85464bcdb77d333cfe224ac7b3e62378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b2c9eb85464bcdb77d333cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 5 15:48:24 2009 +0100 widl: Add support for the lcid parameter attribute. --- tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + tools/widl/write_msft.c | 13 ++++++++++++- 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7fe373c..c2f1abc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -509,6 +509,7 @@ attribute: { $$ = NULL; } | tINPUTSYNC { $$ = make_attr(ATTR_INPUTSYNC); } | tLENGTHIS '(' m_exprs ')' { $$ = make_attrp(ATTR_LENGTHIS, $3); } | tLCID '(' expr_int_const ')' { $$ = make_attrp(ATTR_LIBLCID, $3); } + | tLCID { $$ = make_attr(ATTR_PARAMLCID); } | tLOCAL { $$ = make_attr(ATTR_LOCAL); } | tNONBROWSABLE { $$ = make_attr(ATTR_NONBROWSABLE); } | tNONCREATABLE { $$ = make_attr(ATTR_NONCREATABLE); } @@ -1919,6 +1920,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_OLEAUTOMATION */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "optional" }, /* ATTR_OUT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "out" }, + /* ATTR_PARAMLCID */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "lcid" }, /* ATTR_POINTERDEFAULT */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, "ref, unique or ptr" }, /* ATTR_PROPGET */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index f5466bf..c1c07ea 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -120,6 +120,7 @@ enum attr_type ATTR_OLEAUTOMATION, ATTR_OPTIONAL, ATTR_OUT, + ATTR_PARAMLCID, ATTR_POINTERDEFAULT, ATTR_POINTERTYPE, ATTR_PROPGET, diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index bff61fd..a22b8b3 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1267,6 +1267,7 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) unsigned int funckind, invokekind = 1 /* INVOKE_FUNC */; int help_context = 0, help_string_context = 0, help_string_offset = -1; int entry = -1, entry_is_ord = 0; + int lcid_retval_count = 0; chat("add_func_desc(%p,%d)\n", typeinfo, index); @@ -1497,9 +1498,13 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case ATTR_OUT: paramflags |= 0x02; /* PARAMFLAG_FOUT */ break; + case ATTR_PARAMLCID: + paramflags |= 0x04; /* PARAMFLAG_LCID */ + lcid_retval_count++; + break; case ATTR_RETVAL: paramflags |= 0x08; /* PARAMFLAG_FRETVAL */ - typedata[4] |= 0x4000; + lcid_retval_count++; break; default: chat("unhandled param attr %d\n", attr->type); @@ -1509,6 +1514,12 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) paramdata[1] = -1; paramdata[2] = paramflags; typedata[3] += decoded_size << 16; + + if(lcid_retval_count == 1) + typedata[4] |= 0x4000; + else if(lcid_retval_count == 2) + typedata[4] |= 0x8000; + i++; } }

1 0

Frank Richter : d3d9: Fix bitmask for A2R10G10B10 format.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: 6136884120621fa078e1d90d5edf906060e0436a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6136884120621fa078e1d90d5… Author: Frank Richter <frank.richter(a)gmail.com> Date: Sun Jun 7 18:47:48 2009 +0200 d3d9: Fix bitmask for A2R10G10B10 format. --- dlls/wined3d/utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c7b734a..93c65fb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -91,14 +91,14 @@ static const struct StaticPixelFormatDesc formats[] = {WINED3DFMT_A8_UNORM, 0x000000ff, 0x0, 0x0, 0x0, 1, 0, 0, FALSE}, {WINED3DFMT_A8R3G3B2, 0x0000ff00, 0x000000e0, 0x0000001c, 0x00000003, 2, 0, 0, FALSE}, {WINED3DFMT_X4R4G4B4, 0x0, 0x00000f00, 0x000000f0, 0x0000000f, 2, 0, 0, FALSE}, - {WINED3DFMT_R10G10B10A2_UNORM, 0xb0000000, 0x000003ff, 0x000ffc00, 0x3ff00000, 4, 0, 0, FALSE}, - {WINED3DFMT_R10G10B10A2_UINT, 0xb0000000, 0x000003ff, 0x000ffc00, 0x3ff00000, 4, 0, 0, FALSE}, - {WINED3DFMT_R10G10B10A2_SNORM, 0xb0000000, 0x000003ff, 0x000ffc00, 0x3ff00000, 4, 0, 0, FALSE}, + {WINED3DFMT_R10G10B10A2_UNORM, 0xc0000000, 0x000003ff, 0x000ffc00, 0x3ff00000, 4, 0, 0, FALSE}, + {WINED3DFMT_R10G10B10A2_UINT, 0xc0000000, 0x000003ff, 0x000ffc00, 0x3ff00000, 4, 0, 0, FALSE}, + {WINED3DFMT_R10G10B10A2_SNORM, 0xc0000000, 0x000003ff, 0x000ffc00, 0x3ff00000, 4, 0, 0, FALSE}, {WINED3DFMT_R8G8B8A8_UNORM, 0xff000000, 0x000000ff, 0x0000ff00, 0x00ff0000, 4, 0, 0, FALSE}, {WINED3DFMT_R8G8B8A8_UINT, 0xff000000, 0x000000ff, 0x0000ff00, 0x00ff0000, 4, 0, 0, FALSE}, {WINED3DFMT_X8B8G8R8, 0x0, 0x000000ff, 0x0000ff00, 0x00ff0000, 4, 0, 0, FALSE}, {WINED3DFMT_R16G16_UNORM, 0x0, 0x0000ffff, 0xffff0000, 0x0, 4, 0, 0, FALSE}, - {WINED3DFMT_A2R10G10B10, 0xb0000000, 0x3ff00000, 0x000ffc00, 0x000003ff, 4, 0, 0, FALSE}, + {WINED3DFMT_A2R10G10B10, 0xc0000000, 0x3ff00000, 0x000ffc00, 0x000003ff, 4, 0, 0, FALSE}, {WINED3DFMT_R16G16B16A16_UNORM, 0x1, 0x0000ffff, 0xffff0000, 0x0, 8, 0, 0, FALSE}, /* Luminance */ {WINED3DFMT_L8, 0x0, 0x0, 0x0, 0x0, 1, 0, 0, FALSE},

1 0

Vincent Povirk : include: Extend TVITEMEX and add NMTVDISPINFOEX.
by Alexandre Julliard 08 Jun '09

08 Jun '09

Module: wine Branch: master Commit: 715928301182dfc8bc38a00201a463f45368043b URL: http://source.winehq.org/git/wine.git/?a=commit;h=715928301182dfc8bc38a0020… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 26 14:33:18 2009 -0500 include: Extend TVITEMEX and add NMTVDISPINFOEX. --- include/commctrl.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index e39f4a2..7d77faa 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2506,6 +2506,9 @@ typedef struct { INT cChildren; LPARAM lParam; INT iIntegral; + UINT uStateEx; /* _WIN32_IE >= 0x600 */ + HWND hwnd; /* _WIN32_IE >= 0x600 */ + INT iExpandedImage; /* _WIN32_IE >= 0x600 */ } TVITEMEXA, *LPTVITEMEXA; typedef struct { @@ -2520,6 +2523,9 @@ typedef struct { INT cChildren; LPARAM lParam; INT iIntegral; + UINT uStateEx; /* _WIN32_IE >= 0x600 */ + HWND hwnd; /* _WIN32_IE >= 0x600 */ + INT iExpandedImage; /* _WIN32_IE >= 0x600 */ } TVITEMEXW, *LPTVITEMEXW; #define TVITEMEX WINELIB_NAME_AW(TVITEMEX) @@ -2595,8 +2601,20 @@ typedef struct tagTVDISPINFOW { TVITEMW item; } NMTVDISPINFOW, *LPNMTVDISPINFOW; +typedef struct tagTVDISPINFOEXA { + NMHDR hdr; + TVITEMEXA item; +} NMTVDISPINFOEXA, *LPNMTVDISPINFOEXA; + +typedef struct tagTVDISPINFOEXW { + NMHDR hdr; + TVITEMEXW item; +} NMTVDISPINFOEXW, *LPNMTVDISPINFOEXW; + #define NMTVDISPINFO WINELIB_NAME_AW(NMTVDISPINFO) #define LPNMTVDISPINFO WINELIB_NAME_AW(LPNMTVDISPINFO) +#define NMTVDISPINFOEX WINELIB_NAME_AW(NMTVDISPINFOEX) +#define LPNMTVDISPINFOEX WINELIB_NAME_AW(LPNMTVDISPINFOEX) #define TV_DISPINFOA NMTVDISPINFOA #define TV_DISPINFOW NMTVDISPINFOW #define TV_DISPINFO NMTVDISPINFO

1 0