May 2007 - Wine-commits - list.winehq.org

Dmitry Timoshkov : winex11.drv: Synchronize debug output between X11DRV_KeyEvent and X11DRV_ToUnicodeEx.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 130278f34a2b14b5dc695ac22418d09b809d546a URL: http://source.winehq.org/git/wine.git/?a=commit;h=130278f34a2b14b5dc695ac22… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 21 17:27:34 2007 +0900 winex11.drv: Synchronize debug output between X11DRV_KeyEvent and X11DRV_ToUnicodeEx. --- dlls/winex11.drv/keyboard.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 8738425..747e467 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1373,7 +1373,7 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) ascii_chars = XLookupString(event, Str, sizeof(Str), &keysym, NULL); wine_tsx11_unlock(); - TRACE_(key)("state = %X nbyte = %d, status 0x%x\n", event->state, ascii_chars, status); + TRACE_(key)("nbyte = %d, status 0x%x\n", ascii_chars, status); if (status == XBufferOverflow) ERR("Buffer Overflow need %i!\n",ascii_chars); @@ -1396,7 +1396,6 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) /* Save also all possible modifier states. */ AltGrMask = event->state & (0x6000 | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); - Str[ascii_chars] = '\0'; if (TRACE_ON(key)){ const char *ksname; @@ -1405,9 +1404,9 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) wine_tsx11_unlock(); if (!ksname) ksname = "No Name"; - TRACE_(key)("%s : keysym=%lX (%s), # of chars=%d / 0x%02x / '%s'\n", + TRACE_(key)("%s : keysym=%lX (%s), # of chars=%d / %s\n", (event->type == KeyPress) ? "KeyPress" : "KeyRelease", - keysym, ksname, ascii_chars, Str[0] & 0xff, Str); + keysym, ksname, ascii_chars, debugstr_an(Str, ascii_chars)); } wine_tsx11_lock(); @@ -2391,7 +2390,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, char lpChar[10]; HWND focus; XIC xic; - Status status; + Status status = 0; if (scanCode & 0x8000) { @@ -2492,6 +2491,24 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, ret = XLookupString(&e, lpChar, sizeof(lpChar), &keysym, NULL); wine_tsx11_unlock(); + TRACE_(key)("nbyte = %d, status 0x%x\n", ret, status); + + if (status == XBufferOverflow) + ERR("Buffer Overflow need %d!\n", ret); + + if (TRACE_ON(key)) + { + const char *ksname; + + wine_tsx11_lock(); + ksname = XKeysymToString(keysym); + wine_tsx11_unlock(); + if (!ksname) ksname = "No Name"; + TRACE_(key)("%s : keysym=%lX (%s), # of chars=%d / %s\n", + (e.type == KeyPress) ? "KeyPress" : "KeyRelease", + keysym, ksname, ret, debugstr_an(lpChar, ret)); + } + if (ret == 0) { char dead_char;

1 0

David Adam : d3drm: Implement D3DRMColorGetRed.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: e1d3e65381eff31d78412bc50709089ea3c489a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d3e65381eff31d78412bc50… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Sun May 20 12:24:30 2007 +0200 d3drm: Implement D3DRMColorGetRed. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 6 ++++++ dlls/d3drm/tests/vector.c | 15 +++++++++++++++ include/d3drmdef.h | 2 ++ 4 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 4499211..1c937b0 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -1,7 +1,7 @@ @ stub D3DRMColorGetAlpha @ stub D3DRMColorGetBlue @ stub D3DRMColorGetGreen -@ stub D3DRMColorGetRed +@ stdcall D3DRMColorGetRed(long) @ stub D3DRMCreateColorRGB @ stub D3DRMCreateColorRGBA @ stdcall D3DRMMatrixFromQuaternion(ptr ptr) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 1e57cf8..7153eaa 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -34,6 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Determine the red part of a color */ +D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR color) +{ + return (RGBA_GETRED(color)/255.0); +} + /* Product of 2 quaternions */ LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 0b8fa33..582c993 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -79,6 +79,7 @@ static LPD3DVECTOR (WINAPI * pD3DRMVectorScale)(LPD3DVECTOR, LPD3DVECTOR, D3DVAL static LPD3DVECTOR (WINAPI * pD3DRMVectorSubtract)(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionFromRotation)(LPD3DRMQUATERNION, LPD3DVECTOR, D3DVALUE); static LPD3DRMQUATERNION (WINAPI * pD3DRMQuaternionSlerp)(LPD3DRMQUATERNION, LPD3DRMQUATERNION, LPD3DRMQUATERNION, D3DVALUE); +static D3DVALUE (WINAPI * pD3DRMColorGetRed)(D3DCOLOR); #define D3DRM_GET_PROC(func) \ p ## func = (void*)GetProcAddress(d3drm_handle, #func); \ @@ -110,6 +111,7 @@ static BOOL InitFunctionPtrs(void) D3DRM_GET_PROC(D3DRMVectorSubtract) D3DRM_GET_PROC(D3DRMQuaternionFromRotation) D3DRM_GET_PROC(D3DRMQuaternionSlerp) + D3DRM_GET_PROC(D3DRMColorGetRed) return TRUE; } @@ -246,6 +248,18 @@ static void QuaternionTest(void) expect_quat(q,r); } +static void ColorTest(void) +{ + D3DCOLOR color; + D3DVALUE expected, got; + +/*___________D3DRMColorGetRed__________________________*/ + color=0xb62d7a1c; + expected=3.0/17.0; + got=pD3DRMColorGetRed(color); + ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); +} + START_TEST(vector) { if(!InitFunctionPtrs()) @@ -254,6 +268,7 @@ START_TEST(vector) VectorTest(); MatrixTest(); QuaternionTest(); + ColorTest(); FreeLibrary(d3drm_handle); } diff --git a/include/d3drmdef.h b/include/d3drmdef.h index 1bd65dd..3bdec69 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -54,6 +54,8 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR, LPD3DVECTOR, D3DVALUE); LPD3DVECTOR WINAPI D3DRMVectorSubtract(LPD3DVECTOR, LPD3DVECTOR, LPD3DVECTOR); +D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR); + #if defined(__cplusplus) } #endif

1 0

Dmitry Timoshkov : widl: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: ccac7d1f1112027b3647ed892212060a22faf963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccac7d1f1112027b3647ed892… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 21 15:55:43 2007 +0900 widl: Fix compilation warnings in 64-bit mode. --- tools/widl/proxy.c | 2 +- tools/widl/typegen.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 933792a..9cc61c2 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -193,7 +193,7 @@ static void proxy_check_pointers( const var_list_t *args ) static void free_variable( const var_t *arg ) { - size_t type_offset = arg->type->typestring_offset; + unsigned int type_offset = arg->type->typestring_offset; var_t *constraint; type_t *type; expr_list_t *expr; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d30ce13..49e95c8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -759,7 +759,7 @@ static size_t type_memsize(const type_t *t, const array_dims_t *array, unsigned return size; } -static size_t write_nonsimple_pointer(FILE *file, const type_t *type, size_t offset) +static unsigned int write_nonsimple_pointer(FILE *file, const type_t *type, size_t offset) { short absoff = type->ref->typestring_offset; short reloff = absoff - (offset + 2); @@ -772,7 +772,7 @@ static size_t write_nonsimple_pointer(FILE *file, const type_t *type, size_t off return 4; } -static size_t write_simple_pointer(FILE *file, const type_t *type) +static unsigned int write_simple_pointer(FILE *file, const type_t *type) { print_file(file, 2, "0x%02x, 0x8,\t/* %s [simple_pointer] */\n", type->type, string_of_type(type->type)); @@ -782,9 +782,9 @@ static size_t write_simple_pointer(FILE *file, const type_t *type) return 4; } -static size_t write_pointer_tfs(FILE *file, type_t *type, size_t *typestring_offset) +static size_t write_pointer_tfs(FILE *file, type_t *type, unsigned int *typestring_offset) { - size_t offset = *typestring_offset; + unsigned int offset = *typestring_offset; print_file(file, 0, "/* %d */\n", offset); type->typestring_offset = offset; @@ -862,7 +862,7 @@ static int write_pointers(FILE *file, const attr_list_t *attrs, static size_t write_pointer_description(FILE *file, const attr_list_t *attrs, type_t *type, size_t mem_offset, const array_dims_t *array, int level, - size_t *typestring_offset) + unsigned int *typestring_offset) { const var_t *v; unsigned int align = 0; @@ -1817,7 +1817,7 @@ static size_t process_tfs(FILE *file, const ifref_list_t *ifaces, int for_object { const var_t *var; const ifref_t *iface; - size_t typeformat_offset = 2; + unsigned int typeformat_offset = 2; if (ifaces) LIST_FOR_EACH_ENTRY( iface, ifaces, const ifref_t, entry ) {

1 0

Dmitry Timoshkov : winebuild: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 2c59a95122eb4f0841987f33dd915d3a120d6d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c59a95122eb4f0841987f33d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 21 15:56:07 2007 +0900 winebuild: Fix compilation warnings in 64-bit mode. --- tools/winebuild/res16.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c index 35ac597..8648190 100644 --- a/tools/winebuild/res16.c +++ b/tools/winebuild/res16.c @@ -293,10 +293,11 @@ void output_res16_directory( DLLSPEC *spec, const char *header_name ) for (j = 0, res = type->res; j < type->nb_names; j++, res++) { - output( "\t%s .L__wine_spec_resource_%u-%s\n", - get_asm_short_keyword(), res - spec->resources, header_name ); - output( "\t%s .L__wine_spec_resource_%u_end-.L__wine_spec_resource_%u\n", - get_asm_short_keyword(), res - spec->resources, res - spec->resources ); + output( "\t%s .L__wine_spec_resource_%lu-%s\n", + get_asm_short_keyword(), (unsigned long)(res - spec->resources), header_name ); + output( "\t%s .L__wine_spec_resource_%lu_end-.L__wine_spec_resource_%lu\n", + get_asm_short_keyword(), (unsigned long)(res - spec->resources), + (unsigned long)(res - spec->resources) ); output( "\t%s 0x%04x\n", get_asm_short_keyword(), res->memopt ); if (res->name.str) output( "\t%s .L__wine_spec_resname_%u_%u-.L__wine_spec_ne_rsrctab\n",

1 0

Dmitry Timoshkov : winedump: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 7472fa441af6426a9a7307cf43f666666bef20a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7472fa441af6426a9a7307cf4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 21 15:56:31 2007 +0900 winedump: Fix compilation warnings in 64-bit mode. --- tools/winedump/pdb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 7ba7122..78a2953 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -266,14 +266,14 @@ static void pdb_dump_symbols(struct pdb_reader* reader) while (imp < (const PDB_SYMBOL_IMPORT*)last) { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); - printf("\tImport: %x\n" + printf("\tImport: %lx\n" "\t\tUnknown1: %08x\n" "\t\tUnknown2: %08x\n" "\t\tTimeDateStamp: %08x\n" "\t\tAge: %08u\n" "\t\tfile1: %s\n" "\t\tfile2: %s\n", - (const char*)imp - (const char*)first, + (ULONG_PTR)((const char*)imp - (const char*)first), imp->unknown1, imp->unknown2, imp->TimeDateStamp, @@ -404,7 +404,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader) } file_name += strlen(file_name) + 1; - file = (char*)((DWORD)(file_name + strlen(file_name) + 1 + 3) & ~3); + file = (char*)((DWORD_PTR)(file_name + strlen(file_name) + 1 + 3) & ~3); } free((char*)symbols); }

1 0

Andrew Talbot : user32: Exclude unused headers.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 93c57794584e8ef73230a7f585c5c334951657b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c57794584e8ef73230a7f58… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 19 23:26:08 2007 +0100 user32: Exclude unused headers. --- dlls/user32/text.c | 1 - dlls/user32/uitools.c | 1 - dlls/user32/user_main.c | 1 - dlls/user32/winproc.c | 1 - 4 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index ab099fc..e6d21ca 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -37,7 +37,6 @@ #include "wingdi.h" #include "wine/winuser16.h" #include "wine/unicode.h" -#include "winerror.h" #include "winnls.h" #include "controls.h" #include "user_private.h" diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 036379c..9e5ca9f 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -22,7 +22,6 @@ #include <stdarg.h> #include "windef.h" -#include "winbase.h" #include "wingdi.h" #include "wine/winuser16.h" #include "winuser.h" diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 8b3d83c..e572220 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "controls.h" #include "user_private.h" diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 5a00e51..c4cf004 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" #include "wownt32.h" #include "wine/winbase16.h" #include "wine/winuser16.h"

1 0

Andrew Talbot : vmm.vxd: Exclude unused headers.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: fc6a7148df58b535feb371fe4e7eae73c66acb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6a7148df58b535feb371fe4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun May 20 16:35:27 2007 +0100 vmm.vxd: Exclude unused headers. --- dlls/vmm.vxd/vmm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 77c81b0..f7a5478 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -27,8 +27,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" -#include "winnls.h" #include "winternl.h" #include "wine/debug.h"

1 0

Andrew Talbot : version: Exclude unused headers.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: dd9af77062be928a0298988da9c85869a556a150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9af77062be928a0298988da… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun May 20 16:35:25 2007 +0100 version: Exclude unused headers. --- dlls/version/info.c | 1 - dlls/version/resource.c | 1 - dlls/version/ver16.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 5472984..72eac8d 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winver.h" #include "winternl.h" #include "wine/winuser16.h" diff --git a/dlls/version/resource.c b/dlls/version/resource.c index e637f6c..6331175 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -40,7 +40,6 @@ #include "wine/unicode.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "winver.h" #include "wine/debug.h" diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c index a581f89..3ffb920 100644 --- a/dlls/version/ver16.c +++ b/dlls/version/ver16.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include "windef.h" -#include "winbase.h" #include "wine/winbase16.h" #include "winver.h" #include "wine/debug.h"

1 0

Andrew Talbot : uxtheme: Exclude unused headers.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 7e989655fa389b0dec678644ecabcf646bd3c56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e989655fa389b0dec678644e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sun May 20 16:35:21 2007 +0100 uxtheme: Exclude unused headers. --- dlls/uxtheme/metric.c | 1 - dlls/uxtheme/msstyles.c | 1 - dlls/uxtheme/property.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index c683a67..1f8b069 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -31,7 +31,6 @@ #include "tmschema.h" #include "msstyles.h" -#include "uxthemedll.h" #include "wine/debug.h" diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index e555eb2..f1577fb 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -32,7 +32,6 @@ #include "uxtheme.h" #include "tmschema.h" -#include "uxthemedll.h" #include "msstyles.h" #include "wine/unicode.h" diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 7e52e6f..146649e 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -31,7 +31,6 @@ #include "tmschema.h" #include "msstyles.h" -#include "uxthemedll.h" #include "wine/debug.h"

1 0

Dan Hipschman : widl: Replace erroneously removed current_func assignment.
by Alexandre Julliard 21 May '07

21 May '07

Module: wine Branch: master Commit: 18724eaeb8534a04f9d530692f2bee42cb87f58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=18724eaeb8534a04f9d530692… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri May 18 16:52:25 2007 -0700 widl: Replace erroneously removed current_func assignment. This accidentally came out and should not have. Thanks to Eric Kohl for pointing this out to me. --- tools/widl/typegen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3d61615..3aca92f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1582,6 +1582,8 @@ static size_t process_tfs(FILE *file, const ifref_list_t *ifaces, int for_object LIST_FOR_EACH_ENTRY( func, iface->iface->funcs, const func_t, entry ) { if (is_local(func->def->attrs)) continue; + + current_func = func; if (func->args) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) var->type->typestring_offset

1 0