March 2006 - Wine-Commits - list.winehq.org

Eric Kohl : widl: Fix format string size calculation.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: 1550938a5042f9847eab45d13e2077aa40b8a08f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1550938a5042f9847eab45d… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Thu Mar 23 10:33:08 2006 +0100 widl: Fix format string size calculation. - Move proc format string size calculation from client.c and server.c to typegen.c. - Implement type format string size calculation. --- tools/widl/client.c | 34 ++++----------------------- tools/widl/server.c | 34 ++++----------------------- tools/widl/typegen.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++- tools/widl/typegen.h | 4 ++- 4 files changed, 76 insertions(+), 60 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 3197b73..db8ce7f 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -1,7 +1,7 @@ /* * IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -384,35 +384,11 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - int byte_count = 1; + print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", + get_size_typeformatstring(iface)); - print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ - - /* determine the proc format string size */ - if (iface->funcs) - { - func_t *func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) - { - /* argument list size */ - if (func->args) - { - var_t *var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) - { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); - } - } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); - } - } - print_client("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); + print_client("#define PROC_FORMAT_STRING_SIZE %d\n", + get_size_procformatstring(iface)); fprintf(client, "\n"); write_formatdesc("TYPE"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 3f7b976..1b134f3 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -1,7 +1,7 @@ /* * IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -472,35 +472,11 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - int byte_count = 1; + print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", + get_size_typeformatstring(iface)); - print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ - - /* determine the proc format string size */ - if (iface->funcs) - { - func_t *func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) - { - /* argument list size */ - if (func->args) - { - var_t *var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) - { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); - } - } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); - } - } - print_server("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); + print_server("#define PROC_FORMAT_STRING_SIZE %d\n", + get_size_procformatstring(iface)); fprintf(server, "\n"); write_formatdesc("TYPE"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d9b722c..fd2d040 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1,7 +1,7 @@ /* * Format String Generator for IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * Copyright 2005-2006 Robert Shearman * * This library is free software; you can redistribute it and/or @@ -1591,6 +1591,68 @@ size_t get_size_typeformatstring_var(con return type_offset; } +size_t get_size_procformatstring(const type_t *iface) +{ + size_t size = 1; + func_t *func; + var_t *var; + + if (iface->funcs) + { + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + size += get_size_procformatstring_var(var); + var = PREV_LINK(var); + } + } + + /* return value size */ + size += 2; /* FIXME: determine real size */ + func = PREV_LINK(func); + } + } + return size; +} + +size_t get_size_typeformatstring(const type_t *iface) +{ + size_t size = 3; + func_t *func; + var_t *var; + + if (iface->funcs) + { + func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) + { + /* argument list size */ + if (func->args) + { + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + size += get_size_typeformatstring_var(var); + var = PREV_LINK(var); + } + } + + func = PREV_LINK(func); + } + } + return size; +} + static void write_struct_expr(FILE *h, const expr_t *e, int brackets, const var_t *fields, const char *structvar) { diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 0150429..080bdaf 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -1,7 +1,7 @@ /* * Format String Generator for IDL Compiler * - * Copyright 2005 Eric Kohl + * Copyright 2005-2006 Eric Kohl * Copyright 2005 Robert Shearman * * This library is free software; you can redistribute it and/or @@ -41,5 +41,7 @@ unsigned int get_required_buffer_size(co void write_remoting_arguments(FILE *file, int indent, const func_t *func, unsigned int *type_offset, enum pass pass, enum remoting_phase phase); size_t get_size_procformatstring_var(const var_t *var); size_t get_size_typeformatstring_var(const var_t *var); +size_t get_size_procformatstring(const type_t *iface); +size_t get_size_typeformatstring(const type_t *iface); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface);

1 0

Alexandre Julliard : server: Class and global atoms should not be local to a window station.
by Alexandre Julliard March 23, 2006

March 23, 2006

Module: wine Branch: refs/heads/master Commit: 9873494ced8405113381266b4d99c2a9f3002cb1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9873494ced8405113381266… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 22 22:13:40 2006 +0100 server: Class and global atoms should not be local to a window station. --- dlls/user/tests/winstation.c | 43 +++++++++++++++++++++++++++++++++++++++++- server/atom.c | 27 ++++++++++++++++---------- server/class.c | 24 ++++------------------- 3 files changed, 62 insertions(+), 32 deletions(-) diff --git a/dlls/user/tests/winstation.c b/dlls/user/tests/winstation.c index 4bc1941..a595718 100644 --- a/dlls/user/tests/winstation.c +++ b/dlls/user/tests/winstation.c @@ -42,12 +42,29 @@ static void print_object( HANDLE obj ) trace( "obj %p type '%s'\n", obj, buffer ); } +static void register_class(void) +{ + WNDCLASSA cls; + + cls.style = CS_DBLCLKS; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "WinStationClass"; + RegisterClassA(&cls); +} + static HDESK initial_desktop; static DWORD CALLBACK thread( LPVOID arg ) { HDESK d1, d2; - HWND hwnd = CreateWindowExA(0,"BUTTON","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); + HWND hwnd = CreateWindowExA(0,"WinStationClass","test",WS_POPUP,0,0,100,100,GetDesktopWindow(),0,0,0); ok( hwnd != 0, "CreateWindow failed\n" ); d1 = GetThreadDesktop(GetCurrentThreadId()); trace( "thread %p desktop: %p\n", arg, d1 ); @@ -89,6 +106,8 @@ static void test_handles(void) HDESK d1, d2, d3; HANDLE hthread; DWORD id, flags; + ATOM atom; + char buffer[20]; /* win stations */ @@ -144,6 +163,28 @@ static void test_handles(void) w3 = OpenWindowStation("foobar", TRUE, WINSTA_ALL_ACCESS ); ok( !w3, "open foobar station succeeded\n" ); + w2 = CreateWindowStation("foobar1", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create foobar station failed\n" ); + w3 = CreateWindowStation("foobar2", 0, WINSTA_ALL_ACCESS, NULL ); + ok( w3 != 0, "create foobar station failed\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( GetHandleInformation( w3, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w2 ); + register_class(); + atom = GlobalAddAtomA("foo"); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + + ok( !CloseWindowStation( w2 ), "CloseWindowStation succeeded\n" ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + + SetProcessWindowStation( w3 ); + ok( GetHandleInformation( w2, &flags ), "GetHandleInformation failed\n" ); + ok( CloseWindowStation( w2 ), "CloseWindowStation failed\n" ); + ok( GlobalGetAtomNameA( atom, buffer, sizeof(buffer) ) == 3, "GlobalGetAtomName failed\n" ); + ok( !lstrcmpiA( buffer, "foo" ), "bad atom value %s\n", buffer ); + /* desktops */ d1 = GetThreadDesktop(GetCurrentThreadId()); initial_desktop = d1; diff --git a/server/atom.c b/server/atom.c index 18a59db..f48078b 100644 --- a/server/atom.c +++ b/server/atom.c @@ -88,6 +88,7 @@ static const struct object_ops atom_tabl atom_table_destroy /* destroy */ }; +static struct atom_table *global_table; /* create an atom table */ static struct atom_table *create_table(int entries_count) @@ -292,12 +293,22 @@ static atom_t find_atom( struct atom_tab static struct atom_table *get_global_table( struct winstation *winstation, int create ) { - if (!winstation->atom_table) + struct atom_table *table = winstation ? winstation->atom_table : global_table; + if (!table) { - if (create) winstation->atom_table = create_table( HASH_SIZE ); + if (create) + { + table = create_table( HASH_SIZE ); + if (winstation) winstation->atom_table = table; + else + { + global_table = table; + make_object_static( &global_table->obj ); + } + } else set_error( STATUS_OBJECT_NAME_NOT_FOUND ); } - return winstation->atom_table; + return table; } static struct atom_table *get_table( obj_handle_t h, int create ) @@ -310,14 +321,8 @@ static struct atom_table *get_table( obj } else { - struct winstation *winstation = get_process_winstation( current->process, - WINSTA_ACCESSGLOBALATOMS ); - if (winstation) - { - table = get_global_table( winstation, 1 ); - if (table) grab_object( table ); - release_object( winstation ); - } + table = get_global_table( NULL, 1 ); + if (table) grab_object( table ); } return table; } diff --git a/server/class.c b/server/class.c index 0019e25..5fcd267 100644 --- a/server/class.c +++ b/server/class.c @@ -142,7 +142,6 @@ void *get_class_client_ptr( struct windo DECL_HANDLER(create_class) { struct window_class *class; - struct winstation *winstation; class = find_class( current->process, req->atom, req->instance ); if (class && !class->local == !req->local) @@ -157,18 +156,11 @@ DECL_HANDLER(create_class) return; } - if (!(winstation = get_process_winstation( current->process, WINSTA_ACCESSGLOBALATOMS ))) - return; + if (!grab_global_atom( NULL, req->atom )) return; - if (!grab_global_atom( winstation, req->atom )) - { - release_object( winstation ); - return; - } if (!(class = create_class( current->process, req->extra, req->local ))) { - release_global_atom( winstation, req->atom ); - release_object( winstation ); + release_global_atom( NULL, req->atom ); return; } class->atom = req->atom; @@ -176,7 +168,6 @@ DECL_HANDLER(create_class) class->style = req->style; class->win_extra = req->win_extra; class->client_ptr = req->client_ptr; - release_object( winstation ); } /* destroy a window class */ @@ -239,16 +230,9 @@ DECL_HANDLER(set_class_info) if (req->flags & SET_CLASS_ATOM) { - struct winstation *winstation = get_process_winstation( current->process, - WINSTA_ACCESSGLOBALATOMS ); - if (!grab_global_atom( winstation, req->atom )) - { - release_object( winstation ); - return; - } - release_global_atom( winstation, class->atom ); + if (!grab_global_atom( NULL, req->atom )) return; + release_global_atom( NULL, class->atom ); class->atom = req->atom; - release_object( winstation ); } if (req->flags & SET_CLASS_STYLE) class->style = req->style; if (req->flags & SET_CLASS_WINEXTRA) class->win_extra = req->win_extra;

1 0

docs/en winedev-debugger.sgml
by Dimi Paun March 23, 2006

March 23, 2006

ChangeSet ID: 1143088232144993383511068 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/03/22 20:30:32 Modified files: en : winedev-debugger.sgml Log message: Jeff L <lats(a)yless4u.com.au> Document the "info all_regs" command. Old revision New revision Changes Path 1.4 1.5 +6 -0 docs/en/winedev-debugger.sgml Index: docs/en/winedev-debugger.sgml diff -u -p docs/en/winedev-debugger.sgml:1.4 docs/en/winedev-debugger.sgml:1.5 --- docs/en/winedev-debugger.sgml 23 Mar 2006 4:30:32 -0000 +++ /dev/null 23 Mar 2006 4:30:32 -0000 @@ -2004,6 +2004,12 @@ set $BreakAllThreadsStartup = 1 </entry> </row> <row> + <entry><command>info all-regs</command></entry> + <entry> + prints the value of the CPU and Floating Point registers + </entry> + </row> + <row> <entry> <command>info segment <N></command> </entry>

1 0

docs/en wine-faq.sgml
by Dimi Paun March 23, 2006

March 23, 2006

ChangeSet ID: 1143087469807514907167391 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/03/22 20:17:49 Modified files: en : wine-faq.sgml Log message: Brian Vincent Explicitly address Intel Mac OS X. Old revision New revision Changes Path 1.15 1.16 +31 -3 docs/en/wine-faq.sgml Index: docs/en/wine-faq.sgml diff -u -p docs/en/wine-faq.sgml:1.15 docs/en/wine-faq.sgml:1.16 --- docs/en/wine-faq.sgml 23 Mar 2006 4:17:49 -0000 +++ /dev/null 23 Mar 2006 4:17:49 -0000 @@ -591,9 +591,12 @@ cvs -z3 -d:pserver:anonymous(a)cvs.sourcef <para> Mac OS X / Darwin: The <ulink url="http://darwine.opendarwin.org/">Darwine</ulink> project is - currently working on porting Wine to the Darwin/x86 platform. Their - goal is to eventually make it possible to run x86 Windows + currently working on porting Wine to the Darwin/x86 platform. + Their goal is to eventually make it possible to run x86 Windows applications on Darwin/PPC and then Mac OS X by using Bochs. + In addition, CodeWeavers has focused some of their resources on + Intel Mac OS X as well. With a little luck, Wine will be running on + it by the third quarter of 2006. </para> <para> FreeBSD: This port is well maintained and should work with @@ -606,7 +609,32 @@ cvs -z3 -d:pserver:anonymous(a)cvs.sourcef </para> </answer> </qandaentry> - + <qandaentry> + <question id="Will-wine-run-on-macintel"> + <para> + I want to run Wine on an Intel Mac OS X (MacIntel) system, will it + work? + </para> + </question> + <answer> + <para> + (Also see the previous question.) As of March, 2006, simple + applications are just beginning to to run on Intel Mac OS X. + It's possible in about 6 months we'll see applications running + similarly to how they do on Linux or FreeBSD. + </para> + <para> + There are some complicated issues surrounding Wine on Mac OS X. + Working with low-level features, such as signal handling and system + registers, are quite different on Mac OS X. Further hampering + the issue are some bugs within the operating system. Beyond + that, integration on Mac OS X becomes difficult because it is + vastly different than a traditional *nix desktop. Menuing + and graphics drivers are just two areas that require a complete + reimplementation in order to be functional. + </para> + </answer> + </qanaentry> <qandaentry> <question id="What-minimum-CPU-must-I-have"> <para>

1 0

Marcus Meissner : programs: Move icinfo out of avitools.
by Alexandre Julliard March 22, 2006

March 22, 2006

Module: wine Branch: refs/heads/master Commit: 40af0c8a30e190c7ada7f2c5386fd2743fc8475e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40af0c8a30e190c7ada7f2c… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Mar 22 13:31:54 2006 +0100 programs: Move icinfo out of avitools. --- configure | 4 - configure.ac | 2 programs/Makefile.in | 4 - programs/avitools/.gitignore | 4 - programs/avitools/Makefile.in | 71 ------------ programs/avitools/aviinfo.c | 129 ---------------------- programs/avitools/aviplay.c | 245 ----------------------------------------- programs/avitools/icinfo.c | 78 ------------- programs/icinfo/.gitignore | 2 programs/icinfo/Makefile.in | 13 ++ programs/icinfo/icinfo.c | 78 +++++++++++++ 11 files changed, 98 insertions(+), 532 deletions(-) delete mode 100644 programs/avitools/.gitignore delete mode 100644 programs/avitools/Makefile.in delete mode 100644 programs/avitools/aviinfo.c delete mode 100644 programs/avitools/aviplay.c delete mode 100644 programs/avitools/icinfo.c create mode 100644 programs/icinfo/.gitignore create mode 100644 programs/icinfo/Makefile.in create mode 100644 programs/icinfo/icinfo.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=40af0c8a30e190c7ada…

1 0

H. Verbeet : wined3d: Set vertex attribute pointers defined in vertex declarations properly.
by Alexandre Julliard March 22, 2006

March 22, 2006

Module: wine Branch: refs/heads/master Commit: 1aca53860a4c7549fda3d798a50f0512ac36b4c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1aca53860a4c7549fda3d79… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:47:54 2006 +0000 wined3d: Set vertex attribute pointers defined in vertex declarations properly. --- dlls/wined3d/drawprim.c | 14 ++++++++++++++ dlls/wined3d/vertexshader.c | 10 ---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6f14dff..34241bd 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -325,6 +325,7 @@ void primitiveDeclarationConvertToStride int i; WINED3DVERTEXELEMENT *element; DWORD stride; + int reg; /* Locate the vertex declaration */ if (useVertexShaderFunction && ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration) { @@ -350,8 +351,21 @@ void primitiveDeclarationConvertToStride stride = This->stateBlock->streamStride[element->Stream]; data += (BaseVertexIndex * stride); data += element->Offset; + reg = element->Reg; TRACE("Offset %d Stream %d UsageIndex %d\n", element->Offset, element->Stream, element->UsageIndex); + + if (useVertexShaderFunction && reg != -1 && data) { + WINED3DGLTYPE glType = glTypeLookup[element->Type]; + + TRACE("(%p) : Set vertex attrib pointer: reg 0x%08x, d3d type 0x%08x, stride 0x%08lx, data %p)\n", This, reg, element->Type, stride, data); + + GL_EXTCALL(glVertexAttribPointerARB(reg, glType.size, glType.glType, glType.normalized, stride, data)); + checkGLcall("glVertexAttribPointerARB"); + GL_EXTCALL(glEnableVertexAttribArrayARB(reg)); + checkGLcall("glEnableVertexAttribArrayARB"); + } + switch (element->Usage) { case D3DDECLUSAGE_POSITION: switch (element->UsageIndex) { diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index d3e3801..c4732bc 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1245,16 +1245,6 @@ inline static VOID IWineD3DVertexShaderI /* TODO: renumbering of attributes if the values are higher than the highest supported attribute but the total number of attributes is less than the highest supported attribute */ This->highestConstant = -1; - /* Parse the vertex declaration and store the used elements in arrayUsageMap. */ - if(This->vertexDeclaration) { - for (i = 0 ; i < ((IWineD3DVertexDeclarationImpl*)This->vertexDeclaration)->declarationWNumElements - 1; ++i) { - WINED3DVERTEXELEMENT *element = ((IWineD3DVertexDeclarationImpl*)This->vertexDeclaration)->pDeclarationWine + i; - INT usage = element->Usage | (element->UsageIndex << 16); - BYTE arrayNo = element->Reg; - parse_decl_usage(This, usage, arrayNo); - } - } - /** * First pass to determine what we need to declare: * - Temporary variables

1 0

H. Verbeet : wined3d: Fix slightly misleading ParseVertexDeclarationUsage naming.
by Alexandre Julliard March 22, 2006

March 22, 2006

Module: wine Branch: refs/heads/master Commit: e7b33b0f376080798a90913e829b20f96aa33270 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7b33b0f376080798a90913… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:47:32 2006 +0000 wined3d: Fix slightly misleading ParseVertexDeclarationUsage naming. --- dlls/wined3d/vertexshader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index fd31214..d3e3801 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -1064,7 +1064,7 @@ int ExpandMxMacro(DWORD macro_opcode, co return nComponents; } -static void ParseVertexDeclarationUsage(IWineD3DVertexShaderImpl *This, INT usage, INT arrayNo) +static void parse_decl_usage(IWineD3DVertexShaderImpl *This, INT usage, INT arrayNo) { switch(usage & 0xFFFF) { case D3DDECLUSAGE_POSITION: @@ -1251,7 +1251,7 @@ inline static VOID IWineD3DVertexShaderI WINED3DVERTEXELEMENT *element = ((IWineD3DVertexDeclarationImpl*)This->vertexDeclaration)->pDeclarationWine + i; INT usage = element->Usage | (element->UsageIndex << 16); BYTE arrayNo = element->Reg; - ParseVertexDeclarationUsage(This, usage, arrayNo); + parse_decl_usage(This, usage, arrayNo); } } @@ -1288,7 +1288,7 @@ inline static VOID IWineD3DVertexShaderI if (curOpcode->opcode == D3DSIO_DCL){ INT usage = *pToken++; INT arrayNo = (*pToken++ & 0x00001FFF); - ParseVertexDeclarationUsage(This, usage, arrayNo); + parse_decl_usage(This, usage, arrayNo); } else if(curOpcode->opcode == D3DSIO_DEF) { This->constantsUsedBitmap[*pToken & 0xFF] = VS_CONSTANT_CONSTANT; FIXME("Constant %ld\n", *pToken & 0xFF);

1 0

H. Verbeet : wined3d: Initialise WINED3DVERTEXELEMENT's Reg field in
by Alexandre Julliard March 22, 2006

March 22, 2006

Module: wine Branch: refs/heads/master Commit: f716eea3dfd7713f701b44d29dfd19a1c74e71fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f716eea3dfd7713f701b44d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:47:16 2006 +0000 wined3d: Initialise WINED3DVERTEXELEMENT's Reg field in IWineD3DVertexDeclarationImpl_ParseDeclaration9. --- dlls/wined3d/vertexdeclaration.c | 1 + include/wine/wined3d_types.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 653f2b7..e45f440 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -383,6 +383,7 @@ static HRESULT IWineD3DVertexDeclaration This->pDeclarationWine = HeapAlloc(GetProcessHeap(), 0, This->declaration9NumElements * sizeof(WINED3DVERTEXELEMENT)); for(i = 0; i < This->declaration9NumElements; ++i) { memcpy(This->pDeclarationWine + i, This->pDeclaration9 + i, sizeof(D3DVERTEXELEMENT9)); + This->pDeclarationWine[i].Reg = -1; } This->declarationWNumElements = This->declaration9NumElements; diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index b265c90..3c76715 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -507,7 +507,7 @@ typedef struct _WINED3DVERTEXELEMENT { BYTE Method; BYTE Usage; BYTE UsageIndex; - BYTE Reg; /* DirectX 8 */ + int Reg; /* DirectX 8 */ } WINED3DVERTEXELEMENT, *LPWINED3DVERTEXELEMENT;

1 0

H. Verbeet : wined3d: glTypeLookup cleanup.
by Alexandre Julliard March 22, 2006

March 22, 2006

Module: wine Branch: refs/heads/master Commit: 46b13aaa585ebdd1c418a9df03bf3851190eebfd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=46b13aaa585ebdd1c418a9d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:46:59 2006 +0000 wined3d: glTypeLookup cleanup. Use a struct instead of an UINT array as entries in the glTypeLookup table. --- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 5d216af..653f2b7 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -297,7 +297,7 @@ IWineD3DVertexDeclarationImpl *This = (I convToW[nTokens].Type = type; convToW[nTokens].Offset = offset; convToW[nTokens].Reg = reg; - offset += glTypeLookup[type][1] * glTypeLookup[type][4]; + offset += glTypeLookup[type].size * glTypeLookup[type].typesize; ++nTokens; } else if (D3DVSD_TOKEN_STREAMDATA == tokentype && 0x10000000 & tokentype ) { TRACE(" 0x%08lx SKIP(%lu)\n", tokentype, ((tokentype & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d6e851a..9afa988 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -81,8 +81,16 @@ extern DWORD *stateLookup[MAX_LOOKUPS]; extern DWORD minMipLookup[D3DTEXF_ANISOTROPIC + 1][D3DTEXF_LINEAR + 1]; +typedef struct _WINED3DGLTYPE { + int d3dType; + GLint size; + GLenum glType; + GLboolean normalized; + int typesize; +} WINED3DGLTYPE; + /* NOTE: Make sure these are in the correct numerical order. (see /include/d3d9types.h typedef enum _D3DDECLTYPE) */ -UINT static const glTypeLookup[D3DDECLTYPE_UNUSED][5] = { +WINED3DGLTYPE static const glTypeLookup[D3DDECLTYPE_UNUSED] = { {D3DDECLTYPE_FLOAT1, 1, GL_FLOAT , GL_FALSE ,sizeof(float)}, {D3DDECLTYPE_FLOAT2, 2, GL_FLOAT , GL_FALSE ,sizeof(float)}, {D3DDECLTYPE_FLOAT3, 3, GL_FLOAT , GL_FALSE ,sizeof(float)}, @@ -101,11 +109,11 @@ UINT static const glTypeLookup[D3DDECLTY {D3DDECLTYPE_FLOAT16_2, 2, GL_FLOAT , GL_FALSE ,sizeof(short int)}, {D3DDECLTYPE_FLOAT16_4, 4, GL_FLOAT , GL_FALSE ,sizeof(short int)}}; -#define WINED3D_ATR_TYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][0] -#define WINED3D_ATR_SIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][1] -#define WINED3D_ATR_GLTYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][2] -#define WINED3D_ATR_NORMALIZED(_attribute) glTypeLookup[sd->u.s._attribute.dwType][3] -#define WINED3D_ATR_TYPESIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType][4] +#define WINED3D_ATR_TYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].d3dType +#define WINED3D_ATR_SIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].size +#define WINED3D_ATR_GLTYPE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].glType +#define WINED3D_ATR_NORMALIZED(_attribute) glTypeLookup[sd->u.s._attribute.dwType].normalized +#define WINED3D_ATR_TYPESIZE(_attribute) glTypeLookup[sd->u.s._attribute.dwType].typesize /** * Settings

1 0

H. Verbeet : wined3d: Store the pixelshader version in the pixelshader object.
by Alexandre Julliard March 22, 2006

March 22, 2006

Module: wine Branch: refs/heads/master Commit: bce3da3af7ba7a070306ceb359f0f67fde51f6a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bce3da3af7ba7a070306ceb… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Mar 22 19:46:50 2006 +0000 wined3d: Store the pixelshader version in the pixelshader object. --- dlls/wined3d/pixelshader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 1b24f3d..15815e2 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -752,8 +752,9 @@ static CONST SHADER_OPCODE pshader_ins [ }; -inline static const SHADER_OPCODE* pshader_program_get_opcode(const DWORD code, const int version) { +inline static const SHADER_OPCODE* pshader_program_get_opcode(IWineD3DPixelShaderImpl *This, const DWORD code) { DWORD i = 0; + DWORD version = This->version; DWORD hex_version = D3DPS_VERSION(version/10, version%10); /** TODO: use dichotomic search */ while (NULL != pshader_ins[i].name) { @@ -764,7 +765,7 @@ inline static const SHADER_OPCODE* pshad } ++i; } - FIXME("Unsupported opcode %lx(%ld) masked %lx version %d\n", code, code, code & D3DSI_OPCODE_MASK, version); + FIXME("Unsupported opcode %lx(%ld) masked %lx version %ld\n", code, code, code & D3DSI_OPCODE_MASK, version); return NULL; } @@ -1096,7 +1097,7 @@ inline static VOID IWineD3DPixelShaderIm code = *pToken; #endif pInstr = pToken; - curOpcode = pshader_program_get_opcode(*pToken, version); + curOpcode = pshader_program_get_opcode(This, *pToken); ++pToken; if (NULL == curOpcode) { /* unknown current opcode ... (shouldn't be any!) */ @@ -1666,13 +1667,12 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S const SHADER_OPCODE *curOpcode = NULL; DWORD len = 0; DWORD i; - int version = 0; TRACE("(%p) : Parsing programme\n", This); if (NULL != pToken) { while (D3DPS_END() != *pToken) { if (pshader_is_version_token(*pToken)) { /** version */ - version = (((*pToken >> 8) & 0x0F) * 10) + (*pToken & 0x0F); + This->version = (((*pToken >> 8) & 0x0F) * 10) + (*pToken & 0x0F); TRACE("ps_%lu_%lu\n", (*pToken >> 8) & 0x0F, (*pToken & 0x0F)); ++pToken; ++len; @@ -1686,10 +1686,10 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S len += comment_len + 1; continue; } - if (!version) { + if (!This->version) { WARN("(%p) : pixel shader doesn't have a valid version identifier\n", This); } - curOpcode = pshader_program_get_opcode(*pToken, version); + curOpcode = pshader_program_get_opcode(This, *pToken); ++pToken; ++len; if (NULL == curOpcode) {

1 0