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

Mike McCormack : winecfg: Make some pointer casts win64 compliant.
by Alexandre Julliard June 6, 2006

June 6, 2006

Module: wine Branch: refs/heads/master Commit: 71a69dd81756d2b38c9175a575cd2ac0b641a5fa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=71a69dd81756d2b38c9175a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 14:33:34 2006 +0900 winecfg: Make some pointer casts win64 compliant. --- programs/winecfg/audio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 4997f85..b68ab7f 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -118,7 +118,7 @@ static void configureAudioDriver(HWND hD dci.dwDCISize = sizeof (dci); dci.lpszDCISectionName = NULL; dci.lpszDCIAliasName = NULL; - lRes = SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG)&dci); + lRes = SendDriverMessage(hdrvr, DRV_CONFIGURE, 0, (LONG_PTR)&dci); } CloseDriver(hdrvr, 0, 0); } @@ -318,7 +318,7 @@ static void initAudioDeviceTree(HWND hDl WAVEOUTCAPSW caps; char szPname[MAXPNAMELEN]; - wodMessagePtr(j, WODM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + wodMessagePtr(j, WODM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -344,7 +344,7 @@ static void initAudioDeviceTree(HWND hDl WAVEINCAPSW caps; char szPname[MAXPNAMELEN]; - widMessagePtr(j, WIDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + widMessagePtr(j, WIDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -370,7 +370,7 @@ static void initAudioDeviceTree(HWND hDl MIDIOUTCAPSW caps; char szPname[MAXPNAMELEN]; - modMessagePtr(j, MODM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + modMessagePtr(j, MODM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -396,7 +396,7 @@ static void initAudioDeviceTree(HWND hDl MIDIINCAPSW caps; char szPname[MAXPNAMELEN]; - midMessagePtr(j, MIDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + midMessagePtr(j, MIDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -422,7 +422,7 @@ static void initAudioDeviceTree(HWND hDl AUXCAPSW caps; char szPname[MAXPNAMELEN]; - auxMessagePtr(j, AUXDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + auxMessagePtr(j, AUXDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type; @@ -448,7 +448,7 @@ static void initAudioDeviceTree(HWND hDl MIXERCAPSW caps; char szPname[MAXPNAMELEN]; - mxdMessagePtr(j, MXDM_GETDEVCAPS, 0, (DWORD)&caps, sizeof(caps)); + mxdMessagePtr(j, MXDM_GETDEVCAPS, 0, (DWORD_PTR)&caps, sizeof(caps)); WideCharToMultiByte(CP_ACP, 0, caps.szPname, -1, szPname, MAXPNAMELEN, 0, 0); insert.hParent = type;

1 0

Mike McCormack : wcmd: Fix a Win64 warning.
by Alexandre Julliard June 6, 2006

June 6, 2006

Module: wine Branch: refs/heads/master Commit: 8afbf73c3004f48a2b15f060f1a3ce8277417d05 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8afbf73c3004f48a2b15f06… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 14:21:53 2006 +0900 wcmd: Fix a Win64 warning. --- programs/wcmd/wcmdmain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c index 7150584..8b61445 100644 --- a/programs/wcmd/wcmdmain.c +++ b/programs/wcmd/wcmdmain.c @@ -594,7 +594,7 @@ char filetorun[MAX_PATH]; /* No batch file found, assume executable */ hinst = FindExecutable (param1, NULL, filetorun); - if ((int)hinst < 32) + if ((INT_PTR)hinst < 32) console = 0; else console = SHGetFileInfo (filetorun, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE);

1 0

Mike McCormack : taskmgr: Use correct types for Win64.
by Alexandre Julliard June 6, 2006

June 6, 2006

Module: wine Branch: refs/heads/master Commit: 2a7dbd6740102f4eaedfb9f22f094b9a5993f3c0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a7dbd6740102f4eaedfb9f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 14:21:44 2006 +0900 taskmgr: Use correct types for Win64. --- programs/taskmgr/affinity.c | 6 +++--- programs/taskmgr/taskmgr.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/taskmgr/affinity.c b/programs/taskmgr/affinity.c index 586d383..8e94da3 100644 --- a/programs/taskmgr/affinity.c +++ b/programs/taskmgr/affinity.c @@ -38,9 +38,9 @@ HANDLE hProcessAffinityHandle; static INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - DWORD dwProcessAffinityMask = 0; - DWORD dwSystemAffinityMask = 0; - TCHAR strErrorText[260]; + DWORD_PTR dwProcessAffinityMask = 0; + DWORD_PTR dwSystemAffinityMask = 0; + TCHAR strErrorText[260]; switch (message) { case WM_INITDIALOG: diff --git a/programs/taskmgr/taskmgr.c b/programs/taskmgr/taskmgr.c index 53a88ee..af4d54b 100644 --- a/programs/taskmgr/taskmgr.c +++ b/programs/taskmgr/taskmgr.c @@ -649,7 +649,7 @@ static void TaskManager_OnTabWndSelChang if (GetMenuItemCount(hMenu) <= 4) { hSubMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_WINDOWSMENU)); - InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT)hSubMenu, _T("&Windows")); + InsertMenu(hMenu, 3, MF_BYPOSITION|MF_POPUP, (UINT_PTR)hSubMenu, _T("&Windows")); DrawMenuBar(hMainWnd); } if (TaskManagerSettings.View_LargeIcons) @@ -696,7 +696,7 @@ static void TaskManager_OnTabWndSelChang hSubMenu = CreatePopupMenu(); AppendMenu(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHALL, _T("&One Graph, All CPUs")); AppendMenu(hSubMenu, MF_STRING, ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, _T("One Graph &Per CPU")); - AppendMenu(hViewMenu, MF_STRING|MF_POPUP, (UINT)hSubMenu, _T("&CPU History")); + AppendMenu(hViewMenu, MF_STRING|MF_POPUP, (UINT_PTR)hSubMenu, _T("&CPU History")); AppendMenu(hViewMenu, MF_STRING, ID_VIEW_SHOWKERNELTIMES, _T("&Show Kernel Times")); if (TaskManagerSettings.ShowKernelTimes) CheckMenuItem(hViewMenu, ID_VIEW_SHOWKERNELTIMES, MF_BYCOMMAND|MF_CHECKED);

1 0

Mike McCormack : hh: Cast GetProcAddress' s return to supress a Win64 warning.
by Alexandre Julliard June 6, 2006

June 6, 2006

Module: wine Branch: refs/heads/master Commit: 639e8d26f7792bb6041c04b9c3b3ac74918a5692 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=639e8d26f7792bb6041c04b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 14:21:29 2006 +0900 hh: Cast GetProcAddress's return to supress a Win64 warning. --- programs/hh/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/hh/main.c b/programs/hh/main.c index 16bf8ab..9150692 100644 --- a/programs/hh/main.c +++ b/programs/hh/main.c @@ -29,7 +29,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINS DOWINMAIN *doWinMain; hModule = LoadLibrary("hhctrl.ocx"); - doWinMain = GetProcAddress(hModule, "doWinMain"); + doWinMain = (DOWINMAIN*) GetProcAddress(hModule, "doWinMain"); return doWinMain(hInst, cmdline); }

1 0

Mike McCormack : winetest: Fix dialog prototypes.
by Alexandre Julliard June 6, 2006

June 6, 2006

Module: wine Branch: refs/heads/master Commit: 5ea2a17776ea805b51fda3b5e296c1f2f732b6a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ea2a17776ea805b51fda3b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 14:21:13 2006 +0900 winetest: Fix dialog prototypes. --- programs/winetest/gui.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winetest/gui.c b/programs/winetest/gui.c index a75d1e8..b738679 100644 --- a/programs/winetest/gui.c +++ b/programs/winetest/gui.c @@ -323,7 +323,7 @@ EditTagProc (HWND hwnd, UINT msg, WPARAM return CallWindowProcA (DefEditProc, hwnd, msg, wParam, lParam); } -static BOOL CALLBACK +static INT_PTR CALLBACK AskTagProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { int len; @@ -376,7 +376,7 @@ qAsk (va_list ap) return MBdefault (va_arg (ap, int)); } -static BOOL CALLBACK +static INT_PTR CALLBACK AboutProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -390,7 +390,7 @@ AboutProc (HWND hwnd, UINT msg, WPARAM w return FALSE; } -static BOOL CALLBACK +static INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) {

1 0

Mike McCormack : userenv: Add a stub implementation of userenv.dll.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: a6ea0f61d95579f1bd8ed9c45ddfba84d62c3eea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6ea0f61d95579f1bd8ed9c… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jun 5 14:01:10 2006 +0900 userenv: Add a stub implementation of userenv.dll. --- configure | 3 + configure.ac | 1 dlls/Makefile.in | 1 dlls/userenv/.gitignore | 1 dlls/userenv/Makefile.in | 14 ++++++ dlls/userenv/userenv.spec | 9 ++++ dlls/userenv/userenv_main.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 125 insertions(+), 1 deletions(-) create mode 100644 dlls/userenv/.gitignore create mode 100644 dlls/userenv/Makefile.in create mode 100644 dlls/userenv/userenv.spec create mode 100644 dlls/userenv/userenv_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a6ea0f61d95579f1bd8…

1 0

Detlef Riekenberg : kernel/tests: Some tests for WideCharToMultiByte.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: a99c9caa3945827f19238421cc3be4f4d35c5c50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a99c9caa3945827f1923842… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 5 12:30:41 2006 +0200 kernel/tests: Some tests for WideCharToMultiByte. --- dlls/kernel/tests/codepage.c | 67 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/tests/codepage.c b/dlls/kernel/tests/codepage.c index e059c05..45658ba 100644 --- a/dlls/kernel/tests/codepage.c +++ b/dlls/kernel/tests/codepage.c @@ -25,6 +25,71 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; + +static void test_destination_buffer(void) +{ + LPSTR buffer; + INT maxsize; + INT needed; + INT len; + + SetLastError(0xdeadbeef); + needed = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); + ok( (needed > 0), "returned %d with 0x%lx/%ld (expected '> 0')\n", + needed, GetLastError(), GetLastError()); + + maxsize = needed*2; + buffer = HeapAlloc(GetProcessHeap(), 0, maxsize); + if (buffer == NULL) return; + + maxsize--; + memset(buffer, 'x', maxsize); + buffer[maxsize] = '\0'; + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed+1, NULL, NULL); + ok( (len > 0), "returned %d with 0x%lx/%ld and '%s' (expected '> 0')\n", + len, GetLastError(), GetLastError(), buffer); + + memset(buffer, 'x', maxsize); + buffer[maxsize] = '\0'; + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed, NULL, NULL); + ok( (len > 0), "returned %d with 0x%lx/%ld and '%s' (expected '> 0')\n", + len, GetLastError(), GetLastError(), buffer); + + memset(buffer, 'x', maxsize); + buffer[maxsize] = '\0'; + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, needed-1, NULL, NULL); + ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "returned %d with 0x%lx/%ld and '%s' (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer); + + memset(buffer, 'x', maxsize); + buffer[maxsize] = '\0'; + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 1, NULL, NULL); + ok( !len && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "returned %d with 0x%lx/%ld and '%s' (expected '0' with " \ + "ERROR_INSUFFICIENT_BUFFER)\n", len, GetLastError(), GetLastError(), buffer); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, buffer, 0, NULL, NULL); + ok( (len > 0), "returned %d with 0x%lx/%ld (expected '> 0')\n", + len, GetLastError(), GetLastError()); + + SetLastError(0xdeadbeef); + len = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, needed, NULL, NULL); + ok( !len && (GetLastError() == ERROR_INVALID_PARAMETER), + "returned %d with 0x%lx/%ld (expected '0' with " \ + "ERROR_INVALID_PARAMETER)\n", len, GetLastError(), GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); + +} + + static void test_null_source(void) { int len; @@ -53,7 +118,6 @@ static void test_negative_source_length( int len; char buf[10]; WCHAR bufW[10]; - static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; /* Test, whether any negative source length works as strlen() + 1 */ SetLastError( 0xdeadbeef ); @@ -84,6 +148,7 @@ static void test_overlapped_buffers(void START_TEST(codepage) { + test_destination_buffer(); test_null_source(); test_negative_source_length(); test_overlapped_buffers();

1 0

Juan Lang : winedbg: Get rid of unused mode command.
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: b885b761469a528f69c3c68079dc93fdb51451c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b885b761469a528f69c3c68… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jun 5 09:58:00 2006 -0700 winedbg: Get rid of unused mode command. --- programs/winedbg/dbg.y | 4 ++-- programs/winedbg/debug.l | 2 -- programs/winedbg/info.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 166d638..4601f0a 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -50,8 +50,8 @@ int yyerror(const char*); } %token tCONT tPASS tSTEP tLIST tNEXT tQUIT tHELP tBACKTRACE tALL tINFO tUP tDOWN -%token tENABLE tDISABLE tBREAK tHBREAK tWATCH tDELETE tSET tMODE tPRINT tEXAM -%token tABORT tVM86 tECHO +%token tENABLE tDISABLE tBREAK tHBREAK tWATCH tDELETE tSET tPRINT tEXAM +%token tABORT tECHO %token tCLASS tMAPS tSTACK tSEGMENTS tSYMBOL tREGS tALLREGS tWND tQUEUE tLOCAL tEXCEPTION %token tPROCESS tTHREAD tMODREF tEOL tEOF %token tFRAME tSHARE tCOND tDISPLAY tUNDISPLAY tDISASSEMBLE diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 6bdabe0..458c006 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -166,7 +166,6 @@ STRING \"[^\n"]+\" <INITIAL>abort|abor|abo { return tABORT; } <INITIAL>print|prin|pri|pr|p { BEGIN(FORMAT_EXPECTED); return tPRINT; } -<INITIAL>mode { BEGIN(MODE_CMD); return tMODE; } <INITIAL>show|sho|sh { BEGIN(SHOW_CMD); return tSHOW; } <INITIAL,NOPROCESS>source|sourc|sour|src { BEGIN(PATH_EXPECTED); return tSOURCE; } <INITIAL>symbolfile|symbols|symbol|sf { BEGIN(PATH_EXPECTED); return tSYMBOLFILE; } @@ -196,7 +195,6 @@ STRING \"[^\n"]+\" <INFO_CMD>maps|map { return tMAPS; } <INFO_CMD>window|windo|wind|win|wnd { return tWND; } <HELP_CMD>info|inf|in { return tINFO; } -<MODE_CMD>vm86 { return tVM86; } <MAINT_CMD>type { return tTYPE; } <INITIAL,SHOW_CMD>directories|directorie|directori|director|directo|direct|direc|direc|dir { diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index b64a3df..6fc5b3f 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -63,8 +63,8 @@ void print_help(void) " list <lines> disassemble [<addr>][,<addr>]", " show dir dir <path>", " set <reg> = <expr> set *<addr> = <expr>", - " mode [16,32,vm86] pass", - " whatis info (see 'help info' for options)", + " pass whatis", + " info (see 'help info' for options)", "The 'x' command accepts repeat counts and formats (including 'i') in the", "same way that gdb does.\n",

1 0

Mike McCormack : advapi32: Fix comment to match the function ( thanks to Dan Kegel).
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: 3244a3dfc6bd2e68c3be0b8533dab50e68f982ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3244a3dfc6bd2e68c3be0b8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jun 6 01:42:52 2006 +0900 advapi32: Fix comment to match the function (thanks to Dan Kegel). --- dlls/advapi32/crypt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 7a258c4..e6c3988 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1967,7 +1967,7 @@ BOOL WINAPI CryptVerifySignatureA (HCRYP } /****************************************************************************** - * SystemFunction036 (ADVAPI32.@) + * SystemFunction030 (ADVAPI32.@) * * Tests if two blocks of 16 bytes are equal *

1 0

Ulrich Czekalla : x11drv: Improve handling of the case where the clipboard is opened
by Alexandre Julliard June 5, 2006

June 5, 2006

Module: wine Branch: refs/heads/master Commit: 0c468c816ca352c76a3561d76567b587a1ee09e1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c468c816ca352c76a3561d… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Mon Jun 5 11:55:14 2006 -0400 x11drv: Improve handling of the case where the clipboard is opened with a window from another thread or process. --- dlls/user/driver.c | 19 +--- dlls/user/user_private.h | 3 - dlls/user/win.c | 3 - dlls/x11drv/clipboard.c | 200 +++++++++++++++--------------------------- dlls/x11drv/event.c | 3 - dlls/x11drv/winex11.drv.spec | 1 dlls/x11drv/x11drv.h | 3 - dlls/x11drv/x11drv_main.c | 1 8 files changed, 82 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0c468c816ca352c76a3…

1 0