November 2006 - Wine-commits

Francois Gouget : shell32/tests: Don' t use the NONAMELESS* macros in the tests.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 144995b5a545731219d64900338df0e694bb0d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144995b5a545731219d649003… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:35:32 2006 +0100 shell32/tests: Don't use the NONAMELESS* macros in the tests. --- dlls/shell32/tests/string.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index 1481ace..acd3101 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -21,8 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define WINE_NOWINSOCK #include "windef.h" #include "winbase.h" @@ -67,21 +65,21 @@ static void test_StrRetToStringNW(void) trace("StrRetToStringNAW is Unicode\n"); strret.uType = STRRET_WSTR; - strret.u.pOleStr = CoDupStrW("Test"); + U(strret).pOleStr = CoDupStrW("Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL); ok(ret == TRUE && !strcmpW(buff, szTestW), "STRRET_WSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_CSTR; - lstrcpyA(strret.u.cStr, "Test"); + lstrcpyA(U(strret).cStr, "Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, NULL); ok(ret == TRUE && !strcmpW(buff, szTestW), "STRRET_CSTR: dup failed, ret=%d\n", ret); strret.uType = STRRET_OFFSET; - strret.u.uOffset = 1; + U(strret).uOffset = 1; strcpy((char*)&iidl, " Test"); memset(buff, 0xff, sizeof(buff)); ret = pStrRetToStrNAW(buff, sizeof(buff)/sizeof(WCHAR), &strret, iidl); @@ -92,7 +90,7 @@ static void test_StrRetToStringNW(void) #if 0 /* Invalid dest - should return FALSE, except NT4 does not, so we don't check. */ strret.uType = STRRET_WSTR; - strret.u.pOleStr = CoDupStrW("Test"); + U(strret).pOleStr = CoDupStrW("Test"); pStrRetToStrNAW(NULL, sizeof(buff)/sizeof(WCHAR), &strret, NULL); trace("NULL dest: ret=%d\n", ret); #endif

1 0

Francois Gouget : dsound/tests: Remove unneeded NONAMELESS* macros.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: cc1cb0ad8e2393ef31a616055ca46436536aca77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1cb0ad8e2393ef31a616055… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:33:55 2006 +0100 dsound/tests: Remove unneeded NONAMELESS* macros. --- dlls/dsound/tests/capture.c | 2 -- dlls/dsound/tests/ds3d.c | 2 -- dlls/dsound/tests/ds3d8.c | 2 -- dlls/dsound/tests/dsound.c | 2 -- dlls/dsound/tests/dsound8.c | 2 -- dlls/dsound/tests/duplex.c | 2 -- dlls/dsound/tests/propset.c | 2 -- 7 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index e4a7823..391d17f 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <stdio.h> diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 5f7abea..c412dc6 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <math.h> diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 74d56ec..15f8780 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -23,8 +23,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <math.h> diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index b2e072a..ec1a0a2 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -25,8 +25,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include "wine/test.h" diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 08d3623..5391345 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -25,8 +25,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <stdio.h> diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index cfa8582..dda7e47 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <stdio.h> diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index b435c96..e4976a3 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS #include <windows.h>

1 0

Francois Gouget : comctl32/tests: Don' t use the NONAMELESS* macros in the tests.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 9d2f40cf33350053c21f87860ba058ac3c8a64be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d2f40cf33350053c21f87860… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:33:06 2006 +0100 comctl32/tests: Don't use the NONAMELESS* macros in the tests. --- dlls/comctl32/tests/propsheet.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 79be337..db71bfe 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include <windows.h> #include <commctrl.h> @@ -81,8 +78,8 @@ static void test_title(void) psp.dwSize = sizeof(psp); psp.dwFlags = 0; psp.hInstance = GetModuleHandleW(NULL); - psp.u.pszTemplate = "prop_page1"; - psp.u2.pszIcon = NULL; + U(psp).pszTemplate = "prop_page1"; + U2(psp).pszIcon = NULL; psp.pfnDlgProc = page_dlg_proc; psp.lParam = 0; @@ -94,7 +91,7 @@ static void test_title(void) psh.pszCaption = "test caption"; psh.nPages = 1; psh.hwndParent = GetDesktopWindow(); - psh.u3.phpage = hpsp; + U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback; hdlg = (HWND)PropertySheetA(&psh);

1 0

Francois Gouget : dinput/tests: Remove unneeded NONAMELESS* macros.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: dc44dbfa419b54d123ae2e49cb07ff94c3891f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc44dbfa419b54d123ae2e49c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 23 21:33:40 2006 +0100 dinput/tests: Remove unneeded NONAMELESS* macros. --- dlls/dinput/tests/joystick.c | 2 -- dlls/dinput/tests/keyboard.c | 2 -- dlls/dinput/tests/mouse.c | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index ad13bca..42e13b7 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -18,8 +18,6 @@ #define DIRECTINPUT_VERSION 0x0700 -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <math.h> diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 68155a1..c324003 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -19,8 +19,6 @@ #define DIRECTINPUT_VERSION 0x0700 #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <math.h> diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 9da44a7..57a5e2e 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -20,8 +20,6 @@ #define DIRECTINPUT_VERSION 0x0700 #define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #include <windows.h> #include <math.h>

1 0

Francois Gouget : shell32: Remove unused parameters from SHELL_FindExecutableByOperation().
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 9fefaa87a9a55eb6371bc448fd944c149fbe3bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fefaa87a9a55eb6371bc448f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 22 19:29:04 2006 +0100 shell32: Remove unused parameters from SHELL_FindExecutableByOperation(). --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index c618def..44166bb 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -490,7 +490,7 @@ end: return found; } -static UINT SHELL_FindExecutableByOperation(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, LPWSTR key, LPWSTR filetype, LPWSTR command, LONG commandlen) +static UINT SHELL_FindExecutableByOperation(LPCWSTR lpOperation, LPWSTR key, LPWSTR filetype, LPWSTR command, LONG commandlen) { static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; HKEY hkeyClass; @@ -684,7 +684,7 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath { /* pass the operation string to SHELL_FindExecutableByOperation() */ filetype[filetypelen] = '\0'; - retval = SHELL_FindExecutableByOperation(lpPath, lpFile, lpOperation, key, filetype, command, sizeof(command)); + retval = SHELL_FindExecutableByOperation(lpOperation, key, filetype, command, sizeof(command)); if (retval > 32) {

1 0

Andrew Talbot : winmm: Cast-qual warnings fix.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 529aa7de903fcbe6a118ebcf303a417f87017d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529aa7de903fcbe6a118ebcf3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Nov 22 16:15:40 2006 +0000 winmm: Cast-qual warnings fix. --- dlls/winmm/playsound.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 2d423fa..6796ae0 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -220,10 +220,10 @@ static WINE_PLAYSOUND* PlaySound_Alloc( { if (fdwSound & SND_ASYNC) { - wps->pszSound = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(pszSound)+1) * sizeof(WCHAR)); - if (!wps->pszSound) goto oom_error; - lstrcpyW((LPWSTR)wps->pszSound, pszSound); + LPWSTR sound = HeapAlloc(GetProcessHeap(), 0, + (lstrlenW(pszSound)+1) * sizeof(WCHAR)); + if (!sound) goto oom_error; + wps->pszSound = lstrcpyW(sound, pszSound); wps->bAlloc = TRUE; } else

1 0

Hwang YunSong(황윤성) : winecfg: Update Korean resource.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: 2d07cae211b8f5ca72c8bf83ca7f5b87f3be0c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d07cae211b8f5ca72c8bf83c… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Thu Nov 23 09:54:24 2006 +0900 winecfg: Update Korean resource. --- programs/winecfg/Ko.rc | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 7e45ef1..f40fb9d 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -125,7 +125,7 @@ IDD_DRIVECFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN - GROUPBOX " ��̺� �� ",IDC_STATIC,8,4,244,240 + GROUPBOX " ��̺� �� ",IDC_STATIC,8,4,244,240 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "�߰�(&A)...",IDC_BUTTON_ADD,15,98,37,14 @@ -188,14 +188,14 @@ BEGIN COMBOBOX IDC_THEME_COLORCOMBO,15,48,112,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "ũ��:",IDC_THEME_SIZETEXT,135,40,110,8 COMBOBOX IDC_THEME_SIZECOMBO,135,48,110,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Item:",IDC_STATIC,15,64,112,8 + LTEXT "��:",IDC_STATIC,15,64,112,8 COMBOBOX IDC_SYSPARAM_COMBO,15,74,112,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Color:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED + LTEXT "��:",IDC_SYSPARAM_COLOR_TEXT,135,64,25,8,WS_DISABLED PUSHBUTTON "",IDC_SYSPARAM_COLOR,135,74,25,13,WS_DISABLED | BS_OWNERDRAW - LTEXT "Size:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED + LTEXT "ũ��:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "Font",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + PUSHBUTTON "�۲�",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED GROUPBOX " �� ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 @@ -289,3 +289,23 @@ BEGIN IDS_UNAVAILABLE_DRIVER "��Ʈ�� ̹�� ߰ߵǾ��ϴ�!\n\n %s�� Ʈ�� ڽ��ϱ�?" IDS_WARNING "��" END + +STRINGTABLE DISCARDABLE +BEGIN + IDC_SYSPARAMS_BUTTON "��Ʈ�� " + IDC_SYSPARAMS_BUTTON_TEXT "��Ʈ�� " + IDC_SYSPARAMS_DESKTOP "��ȭ��" + IDC_SYSPARAMS_MENU "�޴� ��" + IDC_SYSPARAMS_MENU_TEXT "�޴� ��" + IDC_SYSPARAMS_SCROLLBAR "��Ϲ�" + IDC_SYSPARAMS_SELECTION "��õ� ��" + IDC_SYSPARAMS_SELECTION_TEXT "��õ� ��" + IDC_SYSPARAMS_TOOLTIP "�� " + IDC_SYSPARAMS_TOOLTIP_TEXT "�� " + IDC_SYSPARAMS_WINDOW "â ��" + IDC_SYSPARAMS_WINDOW_TEXT "â ��" + IDC_SYSPARAMS_ACTIVE_TITLE "Ȱ�� " + IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Ȱ�� " + IDC_SYSPARAMS_INACTIVE_TITLE "��Ȱ�� " + IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "��Ȱ�� " +END

1 0

Andrew Talbot : winmm: Cast-qual warnings fix.
by Alexandre Julliard 24 Nov '06

24 Nov '06

Module: wine Branch: master Commit: a8f02b8bb7fc96e36c1b00dad2aeed2357629af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f02b8bb7fc96e36c1b00dad… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Nov 22 16:14:45 2006 +0000 winmm: Cast-qual warnings fix. --- dlls/winmm/mci.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index fb36da6..aa15e00 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -304,14 +304,14 @@ static int MCI_MapMsgAtoW(UINT msg, DWOR if (dwParam1 & MCI_OPEN_TYPE) { if (dwParam1 & MCI_OPEN_TYPE_ID) - mci_openW->lpstrDeviceType = (LPWSTR)mci_openA->lpstrDeviceType; + mci_openW->lpstrDeviceType = (LPCWSTR)mci_openA->lpstrDeviceType; else mci_openW->lpstrDeviceType = MCI_strdupAtoW(mci_openA->lpstrDeviceType); } if (dwParam1 & MCI_OPEN_ELEMENT) { if (dwParam1 & MCI_OPEN_ELEMENT_ID) - mci_openW->lpstrElementName = (LPWSTR)mci_openA->lpstrElementName; + mci_openW->lpstrElementName = (LPCWSTR)mci_openA->lpstrElementName; else mci_openW->lpstrElementName = MCI_strdupAtoW(mci_openA->lpstrElementName); } @@ -980,8 +980,8 @@ static LPCWSTR MCI_FindCommand(UINT uTb */ static DWORD MCI_GetReturnType(LPCWSTR lpCmd) { - lpCmd = (LPCWSTR)((BYTE*)(lpCmd + strlenW(lpCmd) + 1) + sizeof(DWORD) + sizeof(WORD)); - if (*lpCmd == '\0' && *(const WORD*)((BYTE*)(lpCmd + 1) + sizeof(DWORD)) == MCI_RETURN) { + lpCmd = (LPCWSTR)((const BYTE*)(lpCmd + strlenW(lpCmd) + 1) + sizeof(DWORD) + sizeof(WORD)); + if (*lpCmd == '\0' && *(const WORD*)((const BYTE*)(lpCmd + 1) + sizeof(DWORD)) == MCI_RETURN) { return *(const DWORD*)(lpCmd + 1); } return 0L;

1 0

Vitaliy Margolen : winemenubuilder: Use 'start.exe' to launch non . exe files.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 6a6f1f48d6b152fb0d3ec5303faf22989f445ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6f1f48d6b152fb0d3ec5303… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Nov 20 16:26:08 2006 -0700 winemenubuilder: Use 'start.exe' to launch non .exe files. --- programs/winemenubuilder/winemenubuilder.c | 31 +++++++++++++++++++++------ 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 8ada876..738b9b6 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -897,6 +897,8 @@ static HRESULT get_cmdline( IShellLinkW static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bAgain ) { + static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', + '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; char *escaped_path = NULL, *escaped_args = NULL, *escaped_description = NULL; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; @@ -970,9 +972,28 @@ static BOOL InvokeShellLinker( IShellLin WCHAR *p; /* check for .exe extension */ - if (!(p = strrchrW( szPath, '.' ))) return FALSE; - if (strchrW( p, '\\' ) || strchrW( p, '/' )) return FALSE; - if (lstrcmpiW( p, exeW )) return FALSE; + if (!(p = strrchrW( szPath, '.' )) || + strchrW( p, '\\' ) || strchrW( p, '/' ) || + lstrcmpiW( p, exeW )) + { + /* Not .exe - use 'start.exe' to launch this file */ + p = szArgs + lstrlenW(szPath) + 2; + if (szArgs[0]) + { + p[0] = ' '; + memmove( p+1, szArgs, min( (lstrlenW(szArgs) + 1) * sizeof(szArgs[0]), + sizeof(szArgs) - (p + 1 - szArgs) * sizeof(szArgs[0]) ) ); + } + else + p[0] = 0; + + szArgs[0] = '"'; + lstrcpyW(szArgs + 1, szPath); + p[-1] = '"'; + + GetWindowsDirectoryW(szPath, MAX_PATH); + lstrcatW(szPath, startW); + } /* convert app working dir */ if (szWorkDir[0]) @@ -980,10 +1001,6 @@ static BOOL InvokeShellLinker( IShellLin } else { - static const WCHAR startW[] = { - '\\','c','o','m','m','a','n','d', - '\\','s','t','a','r','t','.','e','x','e',0}; - /* if there's no path... try run the link itself */ lstrcpynW(szArgs, link, MAX_PATH); GetWindowsDirectoryW(szPath, MAX_PATH);

1 0

Andrew Talbot : wininet: Cast-qual warnings fix.
by Alexandre Julliard 22 Nov '06

22 Nov '06

Module: wine Branch: master Commit: 4ef6043a57e2599e21d21796762772e6ed6b25fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef6043a57e2599e21d217967… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Nov 21 22:20:41 2006 +0000 wininet: Cast-qual warnings fix. --- dlls/wininet/internet.c | 75 ++++++++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 37 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 607d4d8..b96556e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2060,35 +2060,32 @@ static BOOL INET_QueryOptionHelper(BOOL INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); else { + LPWSTR proxy = (LPWSTR)((LPBYTE)lpBuffer + + sizeof(INTERNET_PROXY_INFOW)); + LPWSTR proxy_bypass = (LPWSTR)((LPBYTE)lpBuffer + + sizeof(INTERNET_PROXY_INFOW) + + proxyBytesRequired); + pPI->dwAccessType = lpwai->dwAccessType; if (lpwai->lpszProxy) { - pPI->lpszProxy = (LPWSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOW)); - lstrcpyW((LPWSTR)pPI->lpszProxy, lpwai->lpszProxy); + lstrcpyW(proxy, lpwai->lpszProxy); } else { - pPI->lpszProxy = (LPWSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOW)); - *((LPWSTR)(pPI->lpszProxy)) = 0; + *proxy = 0; } + pPI->lpszProxy = proxy; if (lpwai->lpszProxyBypass) { - pPI->lpszProxyBypass = (LPWSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOW) + - proxyBytesRequired); - lstrcpyW((LPWSTR)pPI->lpszProxyBypass, - lpwai->lpszProxyBypass); + lstrcpyW(proxy_bypass, lpwai->lpszProxyBypass); } else { - pPI->lpszProxyBypass = (LPWSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOW) + - proxyBytesRequired); - *((LPWSTR)(pPI->lpszProxyBypass)) = 0; + *proxy_bypass = 0; } + pPI->lpszProxyBypass = proxy_bypass; bSuccess = TRUE; } *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOW) + @@ -2110,37 +2107,35 @@ static BOOL INET_QueryOptionHelper(BOOL INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); else { + LPSTR proxy = (LPSTR)((LPBYTE)lpBuffer + + sizeof(INTERNET_PROXY_INFOA)); + LPSTR proxy_bypass = (LPSTR)((LPBYTE)lpBuffer + + sizeof(INTERNET_PROXY_INFOA) + + proxyBytesRequired); + pPI->dwAccessType = lpwai->dwAccessType; if (lpwai->lpszProxy) { - pPI->lpszProxy = (LPSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOA)); WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxy, -1, - (LPSTR)pPI->lpszProxy, proxyBytesRequired, NULL, NULL); + proxy, proxyBytesRequired, NULL, NULL); } else { - pPI->lpszProxy = (LPSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOA)); - *((LPSTR)(pPI->lpszProxy)) = '\0'; + *proxy = '\0'; } - + pPI->lpszProxy = proxy; + if (lpwai->lpszProxyBypass) { - pPI->lpszProxyBypass = (LPSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired); WideCharToMultiByte(CP_ACP, 0, lpwai->lpszProxyBypass, - -1, (LPSTR)pPI->lpszProxyBypass, - proxyBypassBytesRequired, - NULL, NULL); + -1, proxy_bypass, proxyBypassBytesRequired, + NULL, NULL); } else { - pPI->lpszProxyBypass = (LPSTR)((LPBYTE)lpBuffer + - sizeof(INTERNET_PROXY_INFOA) + - proxyBytesRequired); - *((LPSTR)(pPI->lpszProxyBypass)) = '\0'; + *proxy_bypass = '\0'; } + pPI->lpszProxyBypass = proxy_bypass; bSuccess = TRUE; } *lpdwBufferLength = sizeof(INTERNET_PROXY_INFOA) + @@ -2595,7 +2590,8 @@ BOOL WINAPI InternetTimeToSystemTimeA( L BOOL WINAPI InternetTimeToSystemTimeW( LPCWSTR string, SYSTEMTIME* time, DWORD reserved ) { unsigned int i; - WCHAR *s = (LPWSTR)string; + const WCHAR *s = string; + WCHAR *end; TRACE( "%s %p 0x%08x\n", debugstr_w(string), time, reserved ); @@ -2625,7 +2621,8 @@ BOOL WINAPI InternetTimeToSystemTimeW( L if (time->wDayOfWeek > 6) return TRUE; while (*s && !isdigitW( *s )) s++; - time->wDay = strtolW( s, &s, 10 ); + time->wDay = strtolW( s, &end, 10 ); + s = end; while (*s && !isalphaW( *s )) s++; if (s[0] == '\0' || s[1] == '\0' || s[2] == '\0') return TRUE; @@ -2645,19 +2642,23 @@ BOOL WINAPI InternetTimeToSystemTimeW( L while (*s && !isdigitW( *s )) s++; if (*s == '\0') return TRUE; - time->wYear = strtolW( s, &s, 10 ); + time->wYear = strtolW( s, &end, 10 ); + s = end; while (*s && !isdigitW( *s )) s++; if (*s == '\0') return TRUE; - time->wHour = strtolW( s, &s, 10 ); + time->wHour = strtolW( s, &end, 10 ); + s = end; while (*s && !isdigitW( *s )) s++; if (*s == '\0') return TRUE; - time->wMinute = strtolW( s, &s, 10 ); + time->wMinute = strtolW( s, &end, 10 ); + s = end; while (*s && !isdigitW( *s )) s++; if (*s == '\0') return TRUE; - time->wSecond = strtolW( s, &s, 10 ); + time->wSecond = strtolW( s, &end, 10 ); + s = end; time->wMilliseconds = 0; return TRUE;

1 0