wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Alexander Nicolaysen Sørnes : regedit: Update Norwegian Bokmål resources.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 49437bf88685bd45a326d8f7ded882df0594046e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49437bf88685bd45a326d8f7d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 18:44:40 2007 +0200 regedit: Update Norwegian Bokmål resources. --- programs/regedit/No.rc | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/programs/regedit/No.rc b/programs/regedit/No.rc index 04d6ba6..53265a8 100644 --- a/programs/regedit/No.rc +++ b/programs/regedit/No.rc @@ -1,7 +1,7 @@ /* * Regedit Norwegian Bokm�l resources * - * Copyright 2005-2006 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,9 +58,10 @@ BEGIN BEGIN MENUITEM "N�&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE @@ -97,10 +98,10 @@ BEGIN POPUP "" BEGIN MENUITEM "&Endre", ID_EDIT_MODIFY - MENUITEM "Modify Binary Data", ID_EDIT_MODIFY_BIN + MENUITEM "Endre bin�rdata", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE - MENUITEM "&Gi nytt navn", ID_EDIT_RENAME + MENUITEM "&Gi nytt navn", ID_EDIT_RENAME END POPUP "" BEGIN @@ -108,9 +109,10 @@ BEGIN BEGIN MENUITEM "N�&kkel", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Strengverdi", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Bin�rverdi", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-verdi", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Flerstrengverdi", ID_EDIT_NEW_MULTI_STRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Slett\tDel", ID_EDIT_DELETE @@ -218,6 +220,19 @@ BEGIN PUSHBUTTON "Avbryt",IDCANCEL,175,80,30,11,WS_GROUP END +IDD_EDIT_MULTI_STRING DIALOG DISCARDABLE 22, 17, 210, 175 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Rediger flerstreng" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Verdinavn:",IDC_STATIC,5,5,119,8 + EDITTEXT IDC_VALUE_NAME,5,15,200,12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL| WS_DISABLED + LTEXT "Verdidata:",IDC_STATIC,5,30,119,8 + EDITTEXT IDC_VALUE_DATA,5,40,200,112, WS_BORDER | WS_TABSTOP | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_WANTRETURN + DEFPUSHBUTTON "OK",IDOK,140,160,30,11,WS_GROUP + PUSHBUTTON "Avbryt",IDCANCEL,175,160,30,11,WS_GROUP +END + /* * String Table */ @@ -253,6 +268,7 @@ BEGIN ID_EDIT_NEW_STRINGVALUE "Legger til en ny strengverdi" ID_EDIT_NEW_BINARYVALUE "Legger til en ny bin�rverdis" ID_EDIT_NEW_DWORDVALUE "Legger til en ny dobbeltord-verdi" + ID_EDIT_NEW_MULTI_STRINGVALUE "Legger til en ny flerstrengverdi" ID_REGISTRY_IMPORTREGISTRYFILE "Importerer en tekstfil inn i registeret" ID_REGISTRY_EXPORTREGISTRYFILE "Eksporterer hele eller deler av registeret til en tekstfil"

1 0

Alexander Nicolaysen Sørnes : msi: Update Norwegian Bokmål resources.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 115ead4c732b315085ee1b1ec08aa59ad9c0a1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=115ead4c732b315085ee1b1ec… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 18:40:51 2007 +0200 msi: Update Norwegian Bokmål resources. --- dlls/msi/msi_No.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi_No.rc b/dlls/msi/msi_No.rc index 3d40ba0..3ab58bc 100644 --- a/dlls/msi/msi_No.rc +++ b/dlls/msi/msi_No.rc @@ -1,7 +1,7 @@ /* * Norwegian Bokm�l resources for MSI * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE { - 4 "The specified installation package could not be opened. Please check the file path and try again." + 4 "Klarte ikke �pne den oppgitte installasjonspakken. Kontroller filbanen og pr�v igjen." 5 "Fant ikke stien '%s'." 9 "Sett i disk '%s'" 10 "Gale parametere."

1 0

Alexander Nicolaysen Sørnes : shell32: Update Norwegian Bokmål resources.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 86437f076ed32bfcdd3cc24bd7479ecf60abf3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=86437f076ed32bfcdd3cc24bd… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu May 31 18:41:18 2007 +0200 shell32: Update Norwegian Bokmål resources. --- dlls/shell32/shell32_No.rc | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_No.rc b/dlls/shell32/shell32_No.rc index c7ec269..a8540d7 100644 --- a/dlls/shell32/shell32_No.rc +++ b/dlls/shell32/shell32_No.rc @@ -1,5 +1,5 @@ /* - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2007 Alexander N. S�rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -104,6 +104,19 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Meldings" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "&Ja", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Ja til &alt", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nei", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Avbry&t", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + ICON "", IDD_ICON, 10, 10, 16, 16 + LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} + SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Om %s"

1 0

Damjan Jovanovic : ws2_32: gethostbyname("") should work.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: b23d90a5432750b1a0ce92837624a08791bcb372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23d90a5432750b1a0ce92837… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Jun 1 09:13:19 2007 +0200 ws2_32: gethostbyname("") should work. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a39da4a..2bd4c14 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3222,7 +3222,7 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) int locerr = ENOBUFS; #endif char buf[100]; - if( !name) { + if( !name || !name[0]) { name = buf; if( gethostname( buf, 100) == -1) { SetLastError( WSAENOBUFS); /* appropriate ? */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d0b9750..3403715 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1665,6 +1665,14 @@ static void test_getsockname(void) WSACleanup(); } +static void test_dns(void) +{ + struct hostent *h; + + h = gethostbyname(""); + ok(h != NULL, "gethostbyname(\"\") failed with %d\n", h_errno); +} + static void test_inet_addr(void) { u_long addr; @@ -1850,6 +1858,7 @@ START_TEST( sock ) test_accept(); test_getsockname(); test_inet_addr(); + test_dns(); test_send(); test_write_events();

1 0

Francois Gouget : oleaut32/tests: Improve vtstr() and variantstr().
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: cb029e0b30d7d8732d54a80cf5725bca0b498ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb029e0b30d7d8732d54a80cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 16:39:43 2007 +0200 oleaut32/tests: Improve vtstr() and variantstr(). - Use a CASE() macro to simplify the vtstr() code and eliminate hard-coded variant type values. - Update the list of known variant types. - If a variant type is unknown, print its numerical value. - In variantstr(), hand off all the standard cases to vtstr(), instead of (partially) duplicating its code. --- dlls/oleaut32/tests/vartest.c | 251 +++++++++++++++++------------------------ 1 files changed, 101 insertions(+), 150 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 389ae35..c6c2af2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -124,109 +124,110 @@ static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) } /* return the string text of a given variant type */ +static char vtstr_buffer[16][256]; +static int vtstr_current=0; static const char *vtstr(int x) { - switch(x) { - case 0: - return "VT_EMPTY"; - case 1: - return "VT_NULL"; - case 2: - return "VT_I2"; - case 3: - return "VT_I4"; - case 4: - return "VT_R4"; - case 5: - return "VT_R8"; - case 6: - return "VT_CY"; - case 7: - return "VT_DATE"; - case 8: - return "VT_BSTR"; - case 9: - return "VT_DISPATCH"; - case 10: - return "VT_ERROR"; - case 11: - return "VT_BOOL"; - case 12: - return "VT_VARIANT"; - case 13: - return "VT_UNKNOWN"; - case 14: - return "VT_DECIMAL"; - case 15: - return "notdefined"; - case 16: - return "VT_I1"; - case 17: - return "VT_UI1"; - case 18: - return "VT_UI2"; - case 19: - return "VT_UI4"; - case 20: - return "VT_I8"; - case 21: - return "VT_UI8"; - case 22: - return "VT_INT"; - case 23: - return "VT_UINT"; - case 24: - return "VT_VOID"; - case 25: - return "VT_HRESULT"; - case 26: - return "VT_PTR"; - case 27: - return "VT_SAFEARRAY"; - case 28: - return "VT_CARRAY"; - case 29: - return "VT_USERDEFINED"; - case 30: - return "VT_LPSTR"; - case 31: - return "VT_LPWSTR"; - case 36: - return "VT_RECORD"; - case 64: - return "VT_FILETIME"; - case 65: - return "VT_BLOB"; - case 66: - return "VT_STREAM"; - case 67: - return "VT_STORAGE"; - case 68: - return "VT_STREAMED_OBJECT"; - case 69: - return "VT_STORED_OBJECT"; - case 70: - return "VT_BLOB_OBJECT"; - case 71: - return "VT_CF"; - case 72: - return "VT_CLSID"; - case 0xFFF: - return "VT_BSTR_BLOB/VT_ILLEGALMASKED/VT_TYPEMASK"; - case 0x1000: - return "VT_VECTOR"; - case 0x2000: - return "VT_ARRAY"; - case 0x4000: - return "VT_BYREF"; - case 0x8000: - return "VT_RESERVED"; - case 0xFFFF: - return "VT_ILLEGAL"; + switch(x) { +#define CASE(vt) case VT_##vt: return #vt + CASE(EMPTY); + CASE(NULL); + CASE(I2); + CASE(I4); + CASE(R4); + CASE(R8); + CASE(CY); + CASE(DATE); + CASE(BSTR); + CASE(DISPATCH); + CASE(ERROR); + CASE(BOOL); + CASE(VARIANT); + CASE(UNKNOWN); + CASE(DECIMAL); + CASE(I1); + CASE(UI1); + CASE(UI2); + CASE(UI4); + CASE(I8); + CASE(UI8); + CASE(INT); + CASE(UINT); + CASE(VOID); + CASE(HRESULT); + CASE(PTR); + CASE(SAFEARRAY); + CASE(CARRAY); + CASE(USERDEFINED); + CASE(LPSTR); + CASE(LPWSTR); + CASE(RECORD); + CASE(INT_PTR); + CASE(UINT_PTR); + CASE(FILETIME); + CASE(BLOB); + CASE(STREAM); + CASE(STORAGE); + CASE(STREAMED_OBJECT); + CASE(STORED_OBJECT); + CASE(BLOB_OBJECT); + CASE(CF); + CASE(CLSID); + CASE(VERSIONED_STREAM); + CASE(VECTOR); + CASE(ARRAY); + CASE(BYREF); + CASE(RESERVED); + CASE(ILLEGAL); +#undef CASE - default: - return "defineme"; - } + case 0xfff: + return "VT_BSTR_BLOB/VT_ILLEGALMASKED/VT_TYPEMASK"; + + default: + vtstr_current %= sizeof(vtstr_buffer)/sizeof(*vtstr_buffer); + sprintf(vtstr_buffer[vtstr_current], "unknown variant type %d", x); + return vtstr_buffer[vtstr_current++]; + } +} + +static const char *variantstr( const VARIANT *var ) +{ + vtstr_current %= sizeof(vtstr_buffer)/sizeof(*vtstr_buffer); + switch(V_VT(var)) + { + case VT_I1: + sprintf( vtstr_buffer[vtstr_current], "VT_I1(%d)", V_I1(var) ); break; + case VT_I2: + sprintf( vtstr_buffer[vtstr_current], "VT_I2(%d)", V_I2(var) ); break; + case VT_I4: + sprintf( vtstr_buffer[vtstr_current], "VT_I4(%d)", V_I4(var) ); break; + case VT_INT: + sprintf( vtstr_buffer[vtstr_current], "VT_INT(%d)", V_INT(var) ); break; + case VT_I8: + sprintf( vtstr_buffer[vtstr_current], "VT_I8(%x%08x)", (UINT)(V_I8(var) >> 32), (UINT)V_I8(var) ); break; + case VT_UI8: + sprintf( vtstr_buffer[vtstr_current], "VT_UI8(%x%08x)", (UINT)(V_UI8(var) >> 32), (UINT)V_UI8(var) ); break; + case VT_R4: + sprintf( vtstr_buffer[vtstr_current], "VT_R4(%g)", V_R4(var) ); break; + case VT_R8: + sprintf( vtstr_buffer[vtstr_current], "VT_R8(%g)", V_R8(var) ); break; + case VT_UI1: + sprintf( vtstr_buffer[vtstr_current], "VT_UI1(%u)", V_UI1(var) ); break; + case VT_UI2: + sprintf( vtstr_buffer[vtstr_current], "VT_UI2(%u)", V_UI2(var) ); break; + case VT_UI4: + sprintf( vtstr_buffer[vtstr_current], "VT_UI4(%u)", V_UI4(var) ); break; + case VT_UINT: + sprintf( vtstr_buffer[vtstr_current], "VT_UINT(%d)", V_UINT(var) ); break; + case VT_CY: + sprintf( vtstr_buffer[vtstr_current], "VT_CY(%x%08x)", S(V_CY(var)).Hi, S(V_CY(var)).Lo ); break; + case VT_DATE: + sprintf( vtstr_buffer[vtstr_current], "VT_DATE(%g)", V_DATE(var) ); break; + default: + return vtstr(V_VT(var)); + } + return vtstr_buffer[vtstr_current++]; } static BOOL is_expected_variant( const VARIANT *result, const VARIANT *expected ) @@ -270,56 +271,6 @@ static BOOL is_expected_variant( const VARIANT *result, const VARIANT *expected } } -static const char *variantstr( const VARIANT *var ) -{ - static char buffer[16][256]; - static int current; - - current %= 16; - switch(V_VT(var)) - { - case VT_EMPTY: - return "VT_EMPTY"; - case VT_NULL: - return "VT_NULL"; - case VT_VOID: - return "VT_VOID"; - case VT_UNKNOWN: - return "VT_UNKNOWN"; - case VT_I1: - sprintf( buffer[current], "VT_I1(%d)", V_I1(var) ); break; - case VT_I2: - sprintf( buffer[current], "VT_I2(%d)", V_I2(var) ); break; - case VT_I4: - sprintf( buffer[current], "VT_I4(%d)", V_I4(var) ); break; - case VT_INT: - sprintf( buffer[current], "VT_INT(%d)", V_INT(var) ); break; - case VT_I8: - sprintf( buffer[current], "VT_I8(%x%08x)", (UINT)(V_I8(var) >> 32), (UINT)V_I8(var) ); break; - case VT_UI8: - sprintf( buffer[current], "VT_UI8(%x%08x)", (UINT)(V_UI8(var) >> 32), (UINT)V_UI8(var) ); break; - case VT_R4: - sprintf( buffer[current], "VT_R4(%g)", V_R4(var) ); break; - case VT_R8: - sprintf( buffer[current], "VT_R8(%g)", V_R8(var) ); break; - case VT_UI1: - sprintf( buffer[current], "VT_UI1(%u)", V_UI1(var) ); break; - case VT_UI2: - sprintf( buffer[current], "VT_UI2(%u)", V_UI2(var) ); break; - case VT_UI4: - sprintf( buffer[current], "VT_UI4(%u)", V_UI4(var) ); break; - case VT_UINT: - sprintf( buffer[current], "VT_UINT(%d)", V_UINT(var) ); break; - case VT_CY: - sprintf( buffer[current], "VT_CY(%x%08x)", S(V_CY(var)).Hi, S(V_CY(var)).Lo ); break; - case VT_DATE: - sprintf( buffer[current], "VT_DATE(%g)", V_DATE(var) ); break; - default: - return vtstr(V_VT(var)); - } - return buffer[current++]; -} - static void test_var_call1( int line, HRESULT (WINAPI *func)(LPVARIANT,LPVARIANT), VARIANT *arg, VARIANT *expected ) {

1 0

Jeremy White : wininet: Mark Proxy Authorization header as a request header , so it actually gets sent.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 7ad691a5ee879652c56c15cf637aa4275c045bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad691a5ee879652c56c15cf6… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Thu May 31 10:08:56 2007 -0500 wininet: Mark Proxy Authorization header as a request header, so it actually gets sent. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a48d7ae..97cc54b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1240,7 +1240,7 @@ static BOOL HTTP_InsertProxyAuthorization( LPWININETHTTPREQW lpwhr, TRACE( "Inserting authorization: %s\n", debugstr_w( authorization ) ); HTTP_ProcessHeader(lpwhr, szProxy_Authorization, authorization, - HTTP_ADDHDR_FLAG_REPLACE); + HTTP_ADDHDR_FLAG_REPLACE|HTTP_ADDHDR_FLAG_REQ); HeapFree( GetProcessHeap(), 0, authorization );

1 0

Dmitry Timoshkov : mciavi32: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: d30e453392b23a63b495bf252362d6746d6c6d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30e453392b23a63b495bf252… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:00:52 2007 +0900 mciavi32: Fix compilation warnings in 64-bit mode. --- dlls/mciavi32/mciavi.c | 2 +- dlls/mciavi32/mmoutput.c | 2 +- dlls/mciavi32/wnd.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index a1380f6..dbd2a3b 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -91,7 +91,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); modp->wCustomCommandTable = wma->wCommandTable; modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; - mciSetDriverData(wma->wDevID, (DWORD)wma); + mciSetDriverData(wma->wDevID, (DWORD_PTR)wma); return modp->wDeviceID; } diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index eab8fd5..1be8266 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -476,7 +476,7 @@ BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) } if (ICSendMessage(wma->hic, ICM_DECOMPRESS_BEGIN, - (DWORD)wma->inbih, (DWORD)wma->outbih) != ICERR_OK) { + (DWORD_PTR)wma->inbih, (DWORD_PTR)wma->outbih) != ICERR_OK) { WARN("Can't begin decompression\n"); return FALSE; } diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index c2fbb38..f447798 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -137,9 +137,9 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM dwStyle, rc.left, rc.top, rc.right, rc.bottom, hParent, 0, MCIAVI_hInstance, - (LPVOID)wma->wDevID); + ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd; - return (BOOL)wma->hWnd; + return wma->hWnd != 0; } /***************************************************************************

1 0

Dmitry Timoshkov : midimap: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 29b00e1a8c2d06573027278de53b8f7698a1039d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b00e1a8c2d06573027278de… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:01:53 2007 +0900 midimap: Fix compilation warnings in 64-bit mode. --- dlls/midimap/midimap.c | 24 ++++++++++++------------ dlls/winmm/driver.c | 16 ++++++++-------- include/mmddk.h | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 299bb19..aa569e0 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -258,7 +258,7 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) return ret; } -static DWORD modOpen(LPDWORD lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) +static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); @@ -268,7 +268,7 @@ static DWORD modOpen(LPDWORD lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (MIDIMAP_LoadSettings(mom)) { - *lpdwUser = (DWORD)mom; + *lpdwUser = (DWORD_PTR)mom; mom->self = mom; return MMSYSERR_NOERROR; @@ -304,7 +304,7 @@ static DWORD modClose(MIDIMAPDATA* mom) return ret; } -static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { WORD chn; DWORD ret = MMSYSERR_NOERROR; @@ -328,7 +328,7 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) return ret; } -static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) +static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) { BYTE lb = LOBYTE(LOWORD(dwParam)); WORD chn = lb & 0x0F; @@ -385,13 +385,13 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD dwParam) } break; default: - FIXME("ooch %u\n", dwParam); + FIXME("ooch %lx\n", dwParam); } return ret; } -static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if (lpMidiHdr->dwFlags & (MHDR_ISSTRM|MHDR_PREPARED)) @@ -401,7 +401,7 @@ static DWORD modPrepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) return MMSYSERR_NOERROR; } -static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) +static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwParam2) { if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if ((lpMidiHdr->dwFlags & MHDR_ISSTRM) || !(lpMidiHdr->dwFlags & MHDR_PREPARED)) @@ -411,7 +411,7 @@ static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD dwParam2) return MMSYSERR_NOERROR; } -static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD size) +static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD_PTR size) { static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; lpMidiCaps->wMid = 0x00FF; @@ -449,10 +449,10 @@ static DWORD modReset(MIDIMAPDATA* mom) /************************************************************************** * modMessage (MIDIMAP.@) */ -DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) +DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08X, %08X, %08X);\n", + TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) @@ -464,7 +464,7 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, /* FIXME: Pretend this is supported */ return 0; - case MODM_OPEN: return modOpen ((LPDWORD)dwUser, (LPMIDIOPENDESC)dwParam1,dwParam2); + case MODM_OPEN: return modOpen((DWORD_PTR *)dwUser, (LPMIDIOPENDESC)dwParam1, dwParam2); case MODM_CLOSE: return modClose ((MIDIMAPDATA*)dwUser); case MODM_DATA: return modData ((MIDIMAPDATA*)dwUser, dwParam1); diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index cf1c0ab..87ba8fb 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -569,25 +569,25 @@ LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv, /************************************************************************** * DriverCallback [WINMM.@] */ -BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, - UINT wMsg, DWORD dwUser, DWORD dwParam1, - DWORD dwParam2) +BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, + DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, + DWORD_PTR dwParam2) { - TRACE("(%08X, %04X, %p, %04X, %08X, %08X, %08X); !\n", + TRACE("(%08lX, %04X, %p, %04X, %08lX, %08lX, %08lX)\n", dwCallBack, uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: TRACE("Null !\n"); if (dwCallBack) - WARN("uFlags=%04X has null DCB value, but dwCallBack=%08X is not null !\n", uFlags, dwCallBack); + WARN("uFlags=%04X has null DCB value, but dwCallBack=%08lX is not null !\n", uFlags, dwCallBack); break; case DCB_WINDOW: - TRACE("Window(%04X) handle=%p!\n", dwCallBack, hDev); + TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev); PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_TASK: /* aka DCB_THREAD */ - TRACE("Task(%04x) !\n", dwCallBack); + TRACE("Task(%04lx) !\n", dwCallBack); PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_FUNCTION: @@ -595,7 +595,7 @@ BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); break; case DCB_EVENT: - TRACE("Event(%08x) !\n", dwCallBack); + TRACE("Event(%08lx) !\n", dwCallBack); SetEvent((HANDLE)dwCallBack); break; case 6: /* I would dub it DCB_MMTHREADSIGNAL */ diff --git a/include/mmddk.h b/include/mmddk.h index aa7106a..75840a0 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -446,8 +446,8 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable); #define DCB_TYPEMASK 0x0007 #define DCB_NOSWITCH 0x0008 /* don't switch stacks for callback */ -BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev, - UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2); +BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, + DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); typedef void (*LPTASKCALLBACK)(DWORD dwInst);

1 0

Dmitry Timoshkov : mciwave: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 0028eb555699ce09593320adc51047e68357c6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0028eb555699ce09593320adc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:01:28 2007 +0900 mciwave: Fix compilation warnings in 64-bit mode. --- dlls/mciwave/mciwave.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index d58ca0e..dbbd809 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -65,8 +65,8 @@ typedef struct { struct SCA { UINT wDevID; UINT wMsg; - DWORD dwParam1; - DWORD dwParam2; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; }; /************************************************************************** @@ -77,10 +77,10 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) struct SCA* sca = (struct SCA*)arg; DWORD ret; - TRACE("In thread before async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread before async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread after async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); ExitThread(ret); @@ -92,8 +92,8 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) /************************************************************************** * MCI_SendCommandAsync [internal] */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, - DWORD dwParam2, UINT size) +static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, + DWORD_PTR dwParam2, UINT size) { HANDLE handle; struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); @@ -106,7 +106,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, sca->dwParam1 = dwParam1; if (size && dwParam2) { - sca->dwParam2 = (DWORD)sca + sizeof(struct SCA); + sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); /* copy structure passed by program in dwParam2 to be sure * we can still use it whatever the program does */ @@ -145,7 +145,7 @@ static LRESULT WAVE_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) return 0; wmw->wDevID = modp->wDeviceID; - mciSetDriverData(wmw->wDevID, (DWORD)wmw); + mciSetDriverData(wmw->wDevID, (DWORD_PTR)wmw); modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_WAVEFORM_AUDIO; @@ -736,7 +736,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp if (!(dwFlags & MCI_WAIT)) { return MCI_SendCommandAsync(wmw->openParms.wDeviceID, MCI_PLAY, dwFlags, - (DWORD)lpParms, sizeof(MCI_PLAY_PARMS)); + (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } end = 0xFFFFFFFF; @@ -795,7 +795,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lp */ /* FIXME: how to choose between several output channels ? here mapper is forced */ dwRet = waveOutOpen((HWAVEOUT *)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, - (DWORD)WAVE_mciPlayCallback, (DWORD)wmw, CALLBACK_FUNCTION); + (DWORD_PTR)WAVE_mciPlayCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != 0) { TRACE("Can't open low level audio device %d\n", dwRet); @@ -978,7 +978,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM if (!(dwFlags & MCI_WAIT)) { return MCI_SendCommandAsync(wmw->openParms.wDeviceID, MCI_RECORD, dwFlags, - (DWORD)lpParms, sizeof(MCI_RECORD_PARMS)); + (DWORD_PTR)lpParms, sizeof(MCI_RECORD_PARMS)); } /* FIXME: we only re-create the RIFF structure from an existing file (if any) @@ -1028,7 +1028,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_RECORD_PARM */ /* FIXME: how to choose between several output channels ? here mapper is forced */ dwRet = waveInOpen((HWAVEIN*)&wmw->hWave, WAVE_MAPPER, wmw->lpWaveFormat, - (DWORD)WAVE_mciRecordCallback, (DWORD)wmw, CALLBACK_FUNCTION); + (DWORD_PTR)WAVE_mciRecordCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != MMSYSERR_NOERROR) { TRACE("Can't open low level audio device %d\n", dwRet);

1 0

Dmitry Timoshkov : mciseq: Fix compilation warnings in 64-bit mode.
by Alexandre Julliard 01 Jun '07

01 Jun '07

Module: wine Branch: master Commit: 0067279cd54a364093c579c728178e0c3e9a655d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0067279cd54a364093c579c72… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 31 23:01:16 2007 +0900 mciseq: Fix compilation warnings in 64-bit mode. --- dlls/mciseq/mcimidi.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 2da1fda..7fc8c6a 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -93,8 +93,8 @@ typedef struct tagWINE_MCIMIDI { struct SCA { UINT wDevID; UINT wMsg; - DWORD dwParam1; - DWORD dwParam2; + DWORD_PTR dwParam1; + DWORD_PTR dwParam2; }; /* EPP DWORD WINAPI mciSendCommandA(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2); */ @@ -107,10 +107,10 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) struct SCA* sca = (struct SCA*)arg; DWORD ret; - TRACE("In thread before async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread before async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%u,%08x,%08x)\n", + TRACE("In thread after async command (%08x,%u,%08lx,%08lx)\n", sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); ExitThread(ret); @@ -122,8 +122,8 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) /************************************************************************** * MCI_SendCommandAsync [internal] */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, - DWORD dwParam2, UINT size) +static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, + DWORD_PTR dwParam2, UINT size) { HANDLE handle; struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); @@ -136,7 +136,7 @@ static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD dwParam1, sca->dwParam1 = dwParam1; if (size && dwParam2) { - sca->dwParam2 = (DWORD)sca + sizeof(struct SCA); + sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); /* copy structure passed by program in dwParam2 to be sure * we can still use it whatever the program does */ @@ -175,7 +175,7 @@ static DWORD MIDI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) return 0; wmm->wDevID = modp->wDeviceID; - mciSetDriverData(wmm->wDevID, (DWORD)wmm); + mciSetDriverData(wmm->wDevID, (DWORD_PTR)wmm); modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; modp->wType = MCI_DEVTYPE_SEQUENCER; return modp->wDeviceID; @@ -935,7 +935,7 @@ static DWORD MIDI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) if (!(dwFlags & MCI_WAIT)) { /** FIXME: I'm not 100% sure that wNotifyDeviceID is the right value in all cases ??? */ - return MCI_SendCommandAsync(wmm->wNotifyDeviceID, MCI_PLAY, dwFlags, (DWORD)lpParms, sizeof(LPMCI_PLAY_PARMS)); + return MCI_SendCommandAsync(wmm->wNotifyDeviceID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(LPMCI_PLAY_PARMS)); } if (lpParms && (dwFlags & MCI_FROM)) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007