October 2006 - Wine-commits

Paul Vriens : shlwapi: Cast-qual warnings fix.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: b5728948d5cc6645c48148251ee2c49c71a037e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5728948d5cc6645c48148251… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Oct 10 14:27:58 2006 +0200 shlwapi: Cast-qual warnings fix. --- dlls/shlwapi/tests/shreg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index cd4cbf6..ff921a3 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -39,8 +39,8 @@ static SHCopyKeyA_func pSHCopyKeyA; typedef DWORD (WINAPI *SHRegGetPathA_func)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); static SHRegGetPathA_func pSHRegGetPathA; -static const char * sTestpath1 = "%LONGSYSTEMVAR%\\subdir1"; -static const char * sTestpath2 = "%FOO%\\subdir1"; +static char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; +static char sTestpath2[] = "%FOO%\\subdir1"; static const char * sEnvvar1 = "bar"; static const char * sEnvvar2 = "ImARatherLongButIndeedNeededString";

1 0

Andrew Talbot : widl: Cast-qual warning fix.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 9c6c8b178a7ef8760aece9666b31235057781fc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6c8b178a7ef8760aece9666… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Oct 10 16:42:19 2006 +0100 widl: Cast-qual warning fix. --- tools/widl/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 17c97b8..a85ed3a 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -337,7 +337,7 @@ #else } #endif if (kwp) { - parser_lval.str = (char*)kwp->kw; + parser_lval.str = xstrdup(kwp->kw); return kwp->token; } parser_lval.str = xstrdup(kw);

1 0

Jesse Allen : ddraw: Fix for DDSURFACEDESC param in CreateSurface.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 52296dbdbf5b2137f19ae0582bab6bcba2317bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=52296dbdbf5b2137f19ae0582… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Tue Oct 10 09:06:28 2006 -0700 ddraw: Fix for DDSURFACEDESC param in CreateSurface. --- dlls/ddraw/ddraw.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 341d936..5b72aa5 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2136,7 +2136,8 @@ IDirectDrawImpl_CreateSurface(IDirectDra } /* According to the msdn this flag is ignored by CreateSurface */ - DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; + if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) + DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; /* Modify some flags */ memset(&desc2, 0, sizeof(desc2)); @@ -2314,7 +2315,7 @@ IDirectDrawImpl_CreateSurface(IDirectDra desc2.ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; } /* Set the DDSCAPS2_MIPMAPSUBLEVEL flag on mipmap sublevels according to the msdn */ - if(DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP) + if((DDSD->ddsCaps.dwCaps & DDSCAPS_MIPMAP)&&(DDSD->dwSize >= sizeof(DDSURFACEDESC2))) { desc2.ddsCaps.dwCaps2 |= DDSCAPS2_MIPMAPSUBLEVEL; }

1 0

Michael Stefaniuc : kernel32/tests: Win64 printf format warning fixes.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 8218440c203ea869db65183b7dc2b72fc63be1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8218440c203ea869db65183b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 10 01:06:48 2006 +0200 kernel32/tests: Win64 printf format warning fixes. --- dlls/kernel32/tests/Makefile.in | 1 dlls/kernel32/tests/alloc.c | 14 +- dlls/kernel32/tests/atom.c | 20 +-- dlls/kernel32/tests/change.c | 68 +++++----- dlls/kernel32/tests/codepage.c | 20 +-- dlls/kernel32/tests/comm.c | 180 +++++++++++++------------ dlls/kernel32/tests/console.c | 16 +- dlls/kernel32/tests/directory.c | 70 +++++----- dlls/kernel32/tests/drive.c | 36 +++-- dlls/kernel32/tests/environ.c | 56 ++++---- dlls/kernel32/tests/file.c | 272 +++++++++++++++++++------------------- dlls/kernel32/tests/format_msg.c | 58 ++++---- dlls/kernel32/tests/heap.c | 58 ++++---- dlls/kernel32/tests/locale.c | 108 ++++++++------- dlls/kernel32/tests/module.c | 20 +-- dlls/kernel32/tests/path.c | 64 ++++----- dlls/kernel32/tests/pipe.c | 58 ++++---- dlls/kernel32/tests/process.c | 14 +- dlls/kernel32/tests/sync.c | 10 + dlls/kernel32/tests/thread.c | 46 +++--- dlls/kernel32/tests/time.c | 18 +-- dlls/kernel32/tests/toolhelp.c | 14 +- dlls/kernel32/tests/version.c | 40 +++--- dlls/kernel32/tests/virtual.c | 52 ++++--- 24 files changed, 656 insertions(+), 657 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8218440c203ea869db651…

1 0

Michael Stefaniuc : dmime: Win64 printf format warning fixes.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 891e0166534b94b5cac6e38f34ad27b0aeef0761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891e0166534b94b5cac6e38f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 10 01:07:26 2006 +0200 dmime: Win64 printf format warning fixes. --- dlls/dmime/Makefile.in | 1 - dlls/dmime/audiopath.c | 30 +++++++++--------- dlls/dmime/dmutils.c | 14 ++++---- dlls/dmime/graph.c | 28 ++++++++-------- dlls/dmime/lyricstrack.c | 18 +++++------ dlls/dmime/markertrack.c | 18 +++++------ dlls/dmime/paramcontroltrack.c | 18 +++++------ dlls/dmime/patterntrack.c | 8 ++--- dlls/dmime/performance.c | 48 ++++++++++++++-------------- dlls/dmime/segment.c | 68 ++++++++++++++++++++-------------------- dlls/dmime/segmentstate.c | 8 ++--- dlls/dmime/segtriggertrack.c | 38 +++++++++++----------- dlls/dmime/seqtrack.c | 18 +++++------ dlls/dmime/sysextrack.c | 18 +++++------ dlls/dmime/tempotrack.c | 26 ++++++++------- dlls/dmime/timesigtrack.c | 18 +++++------ dlls/dmime/tool.c | 6 ++-- dlls/dmime/wavetrack.c | 18 +++++------ 18 files changed, 200 insertions(+), 201 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=891e0166534b94b5cac6e…

1 0

Mike McCormack : msi: Make msi_makestring static.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 175c407bfc7dd565bd4613b98e28711443f1791c URL: http://source.winehq.org/git/wine.git/?a=commit;h=175c407bfc7dd565bd4613b98… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 10 20:03:09 2006 +0900 msi: Make msi_makestring static. --- dlls/msi/msipriv.h | 1 - dlls/msi/table.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8ea81e5..945509f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -325,7 +325,6 @@ extern BOOL msi_addstringW( string_table extern UINT msi_id2stringW( string_table *st, UINT string_no, LPWSTR buffer, UINT *sz ); extern UINT msi_id2stringA( string_table *st, UINT string_no, LPSTR buffer, UINT *sz ); -extern LPWSTR MSI_makestring( MSIDATABASE *db, UINT stringid); extern UINT msi_string2idW( string_table *st, LPCWSTR buffer, UINT *id ); extern UINT msi_string2idA( string_table *st, LPCSTR str, UINT *id ); extern string_table *msi_init_stringtable( int entries, UINT codepage ); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 4c0075a..38697aa 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -917,7 +917,7 @@ static void msi_free_colinfo( MSICOLUMNI } } -LPWSTR MSI_makestring( MSIDATABASE *db, UINT stringid) +static LPWSTR msi_makestring( MSIDATABASE *db, UINT stringid) { return strdupW(msi_string_lookup_id( db->strings, stringid )); } @@ -958,9 +958,9 @@ static UINT get_tablecolumns( MSIDATABAS if( colinfo ) { UINT id = table->data[ i ] [ 2 ]; - colinfo[n].tablename = MSI_makestring( db, table_id ); + colinfo[n].tablename = msi_makestring( db, table_id ); colinfo[n].number = table->data[ i ][ 1 ] - (1<<15); - colinfo[n].colname = MSI_makestring( db, id ); + colinfo[n].colname = msi_makestring( db, id ); colinfo[n].type = table->data[ i ] [ 3 ] ^ 0x8000; colinfo[n].hash_table = NULL; /* this assumes that columns are in order in the table */

1 0

Mike McCormack : msi: Merge action.h into msipriv.h.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 80affb3c2db5b5d941897437351dc1eb8e6adac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80affb3c2db5b5d9418974373… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Oct 10 20:03:52 2006 +0900 msi: Merge action.h into msipriv.h. --- dlls/msi/action.c | 1 dlls/msi/action.h | 315 -------------------------------------------------- dlls/msi/appsearch.c | 1 dlls/msi/classes.c | 1 dlls/msi/cond.y | 1 dlls/msi/custom.c | 1 dlls/msi/dialog.c | 2 dlls/msi/events.c | 1 dlls/msi/files.c | 1 dlls/msi/font.c | 1 dlls/msi/format.c | 1 dlls/msi/helpers.c | 1 dlls/msi/install.c | 1 dlls/msi/msi.c | 1 dlls/msi/msipriv.h | 289 +++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/package.c | 1 dlls/msi/source.c | 1 dlls/msi/upgrade.c | 1 18 files changed, 285 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80affb3c2db5b5d941897…

1 0

Vitaliy Margolen : user: Add test for LL mouse hook and [Get|Set]CursorPos.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: dbd2c6ebae8a25abdb77958d22539bd4b4482bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd2c6ebae8a25abdb77958d2… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Oct 8 22:48:26 2006 -0600 user: Add test for LL mouse hook and [Get|Set]CursorPos. --- dlls/user/tests/input.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/input.c b/dlls/user/tests/input.c index 4fc395d..c024960 100644 --- a/dlls/user/tests/input.c +++ b/dlls/user/tests/input.c @@ -534,9 +534,88 @@ static void test_keynames(void) } } +static POINT pt_old, pt_new; +#define STEP 20 + +static LRESULT CALLBACK hook_proc1( int code, WPARAM wparam, LPARAM lparam ) +{ + MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; + POINT pt, pt1; + + if (code == HC_ACTION) + { + /* This is our new cursor position */ + pt_new = hook->pt; + /* Should return previous position */ + GetCursorPos(&pt); + ok(pt.x == pt_old.x && pt.y == pt_old.y, "GetCursorPos: (%d,%d)\n", pt.x, pt.y); + + /* Should set new position until hook chain is finished. */ + pt.x = pt_old.x + STEP; + pt.y = pt_old.y + STEP; + SetCursorPos(pt.x, pt.y); + GetCursorPos(&pt1); + ok(pt.x == pt1.x && pt.y == pt1.y, "Wrong set pos: (%d,%d)\n", pt1.x, pt1.y); + } + return CallNextHookEx( 0, code, wparam, lparam ); +} + +static LRESULT CALLBACK hook_proc2( int code, WPARAM wparam, LPARAM lparam ) +{ + MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; + POINT pt; + + if (code == HC_ACTION) + { + ok(hook->pt.x == pt_new.x && hook->pt.y == pt_new.y, + "Wrong hook coords: (%d,%d)\n", pt_new.x, pt_new.y); + + /* Should match position set above */ + GetCursorPos(&pt); + ok(pt.x == pt_old.x +STEP && pt.y == pt_old.y +STEP, "GetCursorPos: (%d,%d)\n", + pt.x, pt.y); + } + return CallNextHookEx( 0, code, wparam, lparam ); +} + +static void test_mouse_ll_hook(void) +{ + HWND hwnd; + HHOOK hook1, hook2; + POINT pt_org; + + GetCursorPos(&pt_org); + hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + SetCursorPos(300, 300); + + hook2 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc2, GetModuleHandleA(0), 0); + hook1 = SetWindowsHookExA(WH_MOUSE_LL, hook_proc1, GetModuleHandleA(0), 0); + + GetCursorPos(&pt_old); + mouse_event(MOUSEEVENTF_MOVE, -STEP, 0, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == pt_new.x && pt_old.y == pt_new.y, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, +STEP, 0, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == pt_new.x && pt_old.y == pt_new.y, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, -STEP, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == pt_new.x && pt_old.y == pt_new.y, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + mouse_event(MOUSEEVENTF_MOVE, 0, +STEP, 0, 0); + GetCursorPos(&pt_old); + ok(pt_old.x == pt_new.x && pt_old.y == pt_new.y, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + + UnhookWindowsHookEx(hook1); + UnhookWindowsHookEx(hook2); + DestroyWindow(hwnd); + SetCursorPos(pt_org.x, pt_org.y); +} + START_TEST(input) { test_Input_whitebox(); test_Input_blackbox(); test_keynames(); + test_mouse_ll_hook(); }

1 0

Gerald Pfeifer : programs/regedit: Fix format specifiers for _stscanf and fprintf.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: cc5e910658644371fe62219e15622c08425b496a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc5e910658644371fe62219e1… Author: Gerald Pfeifer <pfeifer(a)dbai.tuwien.ac.at> Date: Mon Oct 9 18:38:30 2006 +0200 programs/regedit: Fix format specifiers for _stscanf and fprintf. --- programs/regedit/edit.c | 4 ++-- programs/regedit/regedit.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 9b1cf27..e71a247 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -107,7 +107,7 @@ static BOOL change_dword_base(HWND hwndD DWORD val; if (!GetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf, COUNT_OF(buf))) return FALSE; - if (!_stscanf(buf, toHex ? "%ld" : "%lx", &val)) return FALSE; + if (!_stscanf(buf, toHex ? "%d" : "%x", &val)) return FALSE; wsprintf(buf, toHex ? "%lx" : "%ld", val); return SetDlgItemText(hwndDlg, IDC_VALUE_DATA, buf); } @@ -308,7 +308,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoo wsprintf(stringValueData, isDecimal ? "%ld" : "%lx", *((DWORD*)stringValueData)); if (DialogBox(0, MAKEINTRESOURCE(IDD_EDIT_DWORD), hwnd, modify_dlgproc) == IDOK) { DWORD val; - if (_stscanf(stringValueData, isDecimal ? "%ld" : "%lx", &val)) { + if (_stscanf(stringValueData, isDecimal ? "%d" : "%x", &val)) { lRet = RegSetValueEx(hKey, valueName, 0, type, (BYTE*)&val, sizeof(val)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, lRet); diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 62558be..1ede60f 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -177,7 +177,7 @@ BOOL PerformRegAction(REGEDIT_ACTION act } if (size==0) { - fprintf(stderr,"%s: File not found \"%s\" (%ld)\n", + fprintf(stderr,"%s: File not found \"%s\" (%d)\n", getAppName(),filename,GetLastError()); exit(1); }

1 0

Ivan Gyurdiev : wined3d: Move D3DSP dest modifier related items into the WINED3D namespace.
by Alexandre Julliard 10 Oct '06

10 Oct '06

Module: wine Branch: master Commit: 82379f22a72f1d77abde6f99d8eebcfe307c5323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82379f22a72f1d77abde6f99d… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Oct 9 19:48:12 2006 -0400 wined3d: Move D3DSP dest modifier related items into the WINED3D namespace. --- dlls/wined3d/arb_program_shader.c | 40 +++++++++++++++++----------------- dlls/wined3d/baseshader.c | 24 ++++++++++---------- dlls/wined3d/glsl_shader.c | 22 +++++++++---------- dlls/wined3d/vertexshader.c | 16 ++++++++------ dlls/wined3d/wined3d_private_types.h | 22 +++++++++++++++++++ 5 files changed, 74 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82379f22a72f1d77abde6…

1 0