January 2009 - Wine-Commits

Dmitry Timoshkov : winemine: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 65bc525e05b023506d4ba44a46003f47b2625e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bc525e05b023506d4ba44a4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:30:44 2009 +0800 winemine: Use "-1" as a "don't care value", fix dialog id duplicates. --- programs/winemine/Cs.rc | 16 ++++++++-------- programs/winemine/Da.rc | 16 ++++++++-------- programs/winemine/De.rc | 16 ++++++++-------- programs/winemine/En.rc | 16 ++++++++-------- programs/winemine/Es.rc | 16 ++++++++-------- programs/winemine/Fi.rc | 16 ++++++++-------- programs/winemine/Fr.rc | 16 ++++++++-------- programs/winemine/It.rc | 16 ++++++++-------- programs/winemine/Ja.rc | 16 ++++++++-------- programs/winemine/Ko.rc | 16 ++++++++-------- programs/winemine/Nl.rc | 16 ++++++++-------- programs/winemine/No.rc | 16 ++++++++-------- programs/winemine/Pl.rc | 16 ++++++++-------- programs/winemine/Pt.rc | 18 +++++++++--------- programs/winemine/Ro.rc | 16 ++++++++-------- programs/winemine/Ru.rc | 16 ++++++++-------- programs/winemine/Si.rc | 16 ++++++++-------- programs/winemine/Tr.rc | 16 ++++++++-------- programs/winemine/Zh.rc | 32 ++++++++++++++++---------------- 19 files changed, 161 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65bc525e05b023506d4ba…

1 0

Dmitry Timoshkov : serialui: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 1fb2a50986f3f16151821526185fd1318aee13e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb2a50986f3f161518215261… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:29:44 2009 +0800 serialui: Use "-1" as a "don't care value", fix dialog id duplicates. --- dlls/serialui/Bg.rc | 10 +++++----- dlls/serialui/Cs.rc | 10 +++++----- dlls/serialui/Da.rc | 10 +++++----- dlls/serialui/De.rc | 10 +++++----- dlls/serialui/En.rc | 10 +++++----- dlls/serialui/Eo.rc | 10 +++++----- dlls/serialui/Es.rc | 10 +++++----- dlls/serialui/Fi.rc | 10 +++++----- dlls/serialui/Fr.rc | 10 +++++----- dlls/serialui/Hu.rc | 10 +++++----- dlls/serialui/It.rc | 10 +++++----- dlls/serialui/Ja.rc | 10 +++++----- dlls/serialui/Ko.rc | 10 +++++----- dlls/serialui/Nl.rc | 10 +++++----- dlls/serialui/No.rc | 10 +++++----- dlls/serialui/Pt.rc | 20 ++++++++++---------- dlls/serialui/Ru.rc | 10 +++++----- dlls/serialui/Si.rc | 10 +++++----- dlls/serialui/Sv.rc | 10 +++++----- dlls/serialui/Tr.rc | 10 +++++----- dlls/serialui/Zh.rc | 20 ++++++++++---------- 21 files changed, 115 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fb2a50986f3f16151821…

1 0

Dmitry Timoshkov : progman: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: a21c8d77ef2d2de4d2d880caf651943b5961e9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a21c8d77ef2d2de4d2d880caf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:30:26 2009 +0800 progman: Use "-1" as a "don't care value", fix dialog id duplicates. --- programs/progman/Cs.rc | 18 +++++++++--------- programs/progman/Da.rc | 18 +++++++++--------- programs/progman/De.rc | 18 +++++++++--------- programs/progman/En.rc | 18 +++++++++--------- programs/progman/Es.rc | 18 +++++++++--------- programs/progman/Fr.rc | 18 +++++++++--------- programs/progman/Hu.rc | 18 +++++++++--------- programs/progman/It.rc | 18 +++++++++--------- programs/progman/Ko.rc | 18 +++++++++--------- programs/progman/Nl.rc | 18 +++++++++--------- programs/progman/No.rc | 18 +++++++++--------- programs/progman/Pl.rc | 18 +++++++++--------- programs/progman/Pt.rc | 18 +++++++++--------- programs/progman/Ru.rc | 18 +++++++++--------- programs/progman/Si.rc | 18 +++++++++--------- programs/progman/Tr.rc | 18 +++++++++--------- programs/progman/Zh.rc | 36 ++++++++++++++++++------------------ 17 files changed, 162 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a21c8d77ef2d2de4d2d88…

1 0

Dmitry Timoshkov : oleview: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 1bebaaadbd7e8470f8b9b6052117e3fbada98632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bebaaadbd7e8470f8b9b6052… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:30:05 2009 +0800 oleview: Use "-1" as a "don't care value", fix dialog id duplicates. --- programs/oleview/Da.rc | 18 +++++++++--------- programs/oleview/De.rc | 18 +++++++++--------- programs/oleview/En.rc | 18 +++++++++--------- programs/oleview/Fr.rc | 18 +++++++++--------- programs/oleview/Ja.rc | 18 +++++++++--------- programs/oleview/Ko.rc | 18 +++++++++--------- programs/oleview/Nl.rc | 18 +++++++++--------- programs/oleview/No.rc | 18 +++++++++--------- programs/oleview/Pl.rc | 18 +++++++++--------- programs/oleview/Pt.rc | 18 +++++++++--------- programs/oleview/Ru.rc | 18 +++++++++--------- programs/oleview/Zh.rc | 36 ++++++++++++++++++------------------ 12 files changed, 117 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1bebaaadbd7e8470f8b9b…

1 0

Dmitry Timoshkov : mshtml: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: abbd88d07cd67623bc143a8c27903f631e3e1f19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbd88d07cd67623bc143a8c2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:29:27 2009 +0800 mshtml: Use "-1" as a "don't care value", fix dialog id duplicates. --- dlls/mshtml/Da.rc | 6 +++--- dlls/mshtml/De.rc | 6 +++--- dlls/mshtml/En.rc | 6 +++--- dlls/mshtml/Es.rc | 6 +++--- dlls/mshtml/Fr.rc | 6 +++--- dlls/mshtml/Ja.rc | 6 +++--- dlls/mshtml/Ko.rc | 6 +++--- dlls/mshtml/Nl.rc | 6 +++--- dlls/mshtml/No.rc | 6 +++--- dlls/mshtml/Pl.rc | 6 +++--- dlls/mshtml/Pt.rc | 6 +++--- dlls/mshtml/Ro.rc | 6 +++--- dlls/mshtml/Ru.rc | 6 +++--- dlls/mshtml/Si.rc | 6 +++--- dlls/mshtml/Sv.rc | 6 +++--- dlls/mshtml/Zh.rc | 12 ++++++------ dlls/mshtml/resource.h | 1 - 17 files changed, 51 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abbd88d07cd67623bc143…

1 0

Dmitry Timoshkov : credui: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 8b394c6686934c6c6448bc5ffc08f21a7989b5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b394c6686934c6c6448bc5ff… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:28:46 2009 +0800 credui: Use "-1" as a "don't care value", fix dialog id duplicates. --- dlls/credui/credui_Da.rc | 6 +++--- dlls/credui/credui_De.rc | 6 +++--- dlls/credui/credui_En.rc | 6 +++--- dlls/credui/credui_Es.rc | 6 +++--- dlls/credui/credui_Fr.rc | 6 +++--- dlls/credui/credui_Ko.rc | 6 +++--- dlls/credui/credui_Nl.rc | 6 +++--- dlls/credui/credui_No.rc | 6 +++--- dlls/credui/credui_Pl.rc | 6 +++--- dlls/credui/credui_Pt.rc | 6 +++--- dlls/credui/credui_Ru.rc | 6 +++--- dlls/credui/credui_Si.rc | 6 +++--- dlls/credui/credui_Sv.rc | 6 +++--- dlls/credui/credui_Zh.rc | 12 ++++++------ dlls/credui/credui_resources.h | 3 +-- 15 files changed, 46 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b394c6686934c6c6448b…

1 0

Dmitry Timoshkov : cryptui: Use "-1" as a "don't care value", fix dialog id duplicates.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 267c709341e41e5247be2539f261df7274e4eb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=267c709341e41e5247be2539f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 14 18:29:06 2009 +0800 cryptui: Use "-1" as a "don't care value", fix dialog id duplicates. --- dlls/cryptui/cryptui_En.rc | 52 ++++++++++++++++++++++--------------------- dlls/cryptui/cryptui_Ko.rc | 50 +++++++++++++++++++++--------------------- dlls/cryptui/cryptuires.h | 1 - 3 files changed, 52 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=267c709341e41e5247be2…

1 0

Michael Stefaniuc : include: Change to LONG/ULONG in fci. h for Win64 compatibility.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: 602f42c25f691765aca5412f8ebe8b87edb9f6c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602f42c25f691765aca5412f8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 23:31:29 2009 +0100 include: Change to LONG/ULONG in fci.h for Win64 compatibility. --- dlls/advpack/tests/files.c | 6 +++--- dlls/cabinet/tests/extract.c | 6 +++--- dlls/cabinet/tests/fdi.c | 6 +++--- dlls/msi/tests/install.c | 6 +++--- include/fci.h | 18 +++++++++--------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 611bbc4..d3f7338 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -189,12 +189,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) return TRUE; } -static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, +static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, BOOL fContinuation, void *pv) { return 0; @@ -256,7 +256,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index b6b3cbb..c0a0c92 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -126,12 +126,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) return TRUE; } -static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, +static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, BOOL fContinuation, void *pv) { return 0; @@ -193,7 +193,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index 058172f..c38fee3 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -330,12 +330,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) return TRUE; } -static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, +static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, BOOL fContinuation, void *pv) { return 0; @@ -397,7 +397,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6d1f308..dd5dc29 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1227,12 +1227,12 @@ static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) return TRUE; } -static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static LONG CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, +static int CDECL file_placed(PCCAB pccab, char *pszFile, LONG cbFile, BOOL fContinuation, void *pv) { return 0; @@ -1294,7 +1294,7 @@ static int CDECL fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static LONG CDECL fci_seek(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; diff --git a/include/fci.h b/include/fci.h index 6ac95fa..5ef6c7e 100644 --- a/include/fci.h +++ b/include/fci.h @@ -34,10 +34,10 @@ extern "C" { * Common FCI/TDI declarations */ -typedef unsigned long CHECKSUM; +typedef ULONG CHECKSUM; -typedef unsigned long UOFF; -typedef unsigned long COFF; +typedef ULONG UOFF; +typedef ULONG COFF; /**********************************************************************/ @@ -181,8 +181,8 @@ typedef UINT (__cdecl *PFNFCIWRITE)(INT_PTR hf, void *memory, UINT cb, int *err, typedef int (__cdecl *PFNFCICLOSE)(INT_PTR hf, int *err, void *pv); #define FNFCICLOSE(fn) int __cdecl fn(INT_PTR hf, int *err, void *pv) -typedef long (__cdecl *PFNFCISEEK) (INT_PTR hf, long dist, int seektype, int *err, void *pv); -#define FNFCISEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype, int *err, void *pv) +typedef LONG (__cdecl *PFNFCISEEK) (INT_PTR hf, LONG dist, int seektype, int *err, void *pv); +#define FNFCISEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype, int *err, void *pv) typedef int (__cdecl *PFNFCIDELETE) (char *pszFile, int *err, void *pv); #define FNFCIDELETE(fn) int __cdecl fn(char *pszFile, int *err, void *pv) @@ -194,12 +194,12 @@ typedef BOOL (__cdecl *PFNFCIGETNEXTCABINET)(PCCAB pccab, ULONG cbPrevCab, void typedef int (__cdecl *PFNFCIFILEPLACED)(PCCAB pccab, char *pszFile, - long cbFile, + LONG cbFile, BOOL fContinuation, void *pv); #define FNFCIFILEPLACED(fn) int __cdecl fn(PCCAB pccab, \ char *pszFile, \ - long cbFile, \ + LONG cbFile, \ BOOL fContinuation, \ void *pv) @@ -220,11 +220,11 @@ typedef INT_PTR (__cdecl *PFNFCIGETOPENINFO)(char *pszName, #define statusFolder 1 /* Add Folder to Cabinet callback */ #define statusCabinet 2 /* Write out a completed cabinet callback */ -typedef long (__cdecl *PFNFCISTATUS)(UINT typeStatus, +typedef LONG (__cdecl *PFNFCISTATUS)(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv); -#define FNFCISTATUS(fn) long __cdecl fn(UINT typeStatus, \ +#define FNFCISTATUS(fn) LONG __cdecl fn(UINT typeStatus, \ ULONG cb1, \ ULONG cb2, \ void *pv)

1 0

Michael Stefaniuc : include: Change to LONG/ULONG in fdi. h for Win64 compatibility.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: f516cab0175a9d7e9ab210d8adf06f02d041224b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f516cab0175a9d7e9ab210d8a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 23:31:50 2009 +0100 include: Change to LONG/ULONG in fdi.h for Win64 compatibility. --- dlls/cabinet/cabinet_main.c | 2 +- dlls/cabinet/tests/fdi.c | 8 ++++---- dlls/msi/media.c | 2 +- dlls/setupapi/setupcab.c | 2 +- include/fdi.h | 16 ++++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index fde5d9a..45454f4 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -148,7 +148,7 @@ static int CDECL fdi_close(INT_PTR hf) return CloseHandle(handle) ? 0 : -1; } -static long CDECL fdi_seek(INT_PTR hf, long dist, int seektype) +static LONG CDECL fdi_seek(INT_PTR hf, LONG dist, int seektype) { HANDLE handle = (HANDLE) hf; return SetFilePointer(handle, dist, NULL, seektype); diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index c38fee3..1fa3851 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -81,7 +81,7 @@ static int CDECL fdi_close(INT_PTR hf) return CloseHandle(handle) ? 0 : -1; } -static long CDECL fdi_seek(INT_PTR hf, long dist, int seektype) +static LONG CDECL fdi_seek(INT_PTR hf, LONG dist, int seektype) { HANDLE handle = (HANDLE) hf; return SetFilePointer(handle, dist, NULL, seektype); @@ -548,7 +548,7 @@ static void test_FDIIsCabinet(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - ok(cabinfo.cbCabinet == 0, "Expected 0, got %ld\n", cabinfo.cbCabinet); + ok(cabinfo.cbCabinet == 0, "Expected 0, got %d\n", cabinfo.cbCabinet); ok(cabinfo.cFiles == 0, "Expected 0, got %d\n", cabinfo.cFiles); ok(cabinfo.cFolders == 0, "Expected 0, got %d\n", cabinfo.cFolders); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); @@ -563,7 +563,7 @@ static void test_FDIIsCabinet(void) ret = FDIIsCabinet(hfdi, fd, &cabinfo); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); - ok(cabinfo.cbCabinet == 0, "Expected 0, got %ld\n", cabinfo.cbCabinet); + ok(cabinfo.cbCabinet == 0, "Expected 0, got %d\n", cabinfo.cbCabinet); ok(cabinfo.cFiles == 0, "Expected 0, got %d\n", cabinfo.cFiles); ok(cabinfo.cFolders == 0, "Expected 0, got %d\n", cabinfo.cFolders); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); @@ -584,7 +584,7 @@ static void test_FDIIsCabinet(void) ok(cabinfo.setID == 0xbeef, "Expected 0xbeef, got %d\n", cabinfo.setID); todo_wine { - ok(cabinfo.cbCabinet == 182, "Expected 182, got %ld\n", cabinfo.cbCabinet); + ok(cabinfo.cbCabinet == 182, "Expected 182, got %d\n", cabinfo.cbCabinet); ok(cabinfo.iCabinet == 0, "Expected 0, got %d\n", cabinfo.iCabinet); } diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 89d84c4..d7c19c5 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -219,7 +219,7 @@ static int CDECL cabinet_close(INT_PTR hf) return CloseHandle(handle) ? 0 : -1; } -static long CDECL cabinet_seek(INT_PTR hf, long dist, int seektype) +static LONG CDECL cabinet_seek(INT_PTR hf, LONG dist, int seektype) { HANDLE handle = (HANDLE)hf; /* flags are compatible and so are passed straight through */ diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 765f416..9f7a330 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -250,7 +250,7 @@ static int CDECL sc_cb_close(INT_PTR hf) return -1; } -static long CDECL sc_cb_lseek(INT_PTR hf, long dist, int seektype) +static LONG CDECL sc_cb_lseek(INT_PTR hf, LONG dist, int seektype) { DWORD ret; diff --git a/include/fdi.h b/include/fdi.h index 708642a..ef97958 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -32,10 +32,10 @@ extern "C" { * Common FCI/TDI declarations */ -typedef unsigned long CHECKSUM; +typedef ULONG CHECKSUM; -typedef unsigned long UOFF; -typedef unsigned long COFF; +typedef ULONG UOFF; +typedef ULONG COFF; /**********************************************************************/ @@ -143,7 +143,7 @@ typedef void *HFDI; /**********************************************************************/ typedef struct { - long cbCabinet; /* Total length of cabinet file */ + LONG cbCabinet; /* Total length of cabinet file */ USHORT cFolders; /* Count of folders in cabinet */ USHORT cFiles; /* Count of files in cabinet */ USHORT setID; /* Cabinet set ID */ @@ -217,14 +217,14 @@ typedef UINT (__cdecl *PFNWRITE)(INT_PTR hf, void *pv, UINT cb); typedef int (__cdecl *PFNCLOSE)(INT_PTR hf); #define FNCLOSE(fn) int __cdecl fn(INT_PTR hf) -typedef long (__cdecl *PFNSEEK) (INT_PTR hf, long dist, int seektype); -#define FNSEEK(fn) long __cdecl fn(INT_PTR hf, long dist, int seektype) +typedef LONG (__cdecl *PFNSEEK) (INT_PTR hf, LONG dist, int seektype); +#define FNSEEK(fn) LONG __cdecl fn(INT_PTR hf, LONG dist, int seektype) typedef int (__cdecl *PFNFDIDECRYPT)(PFDIDECRYPT pfdid); #define FNFDIDECRYPT(fn) int __cdecl fn(PFDIDECRYPT pfdid) typedef struct { - long cb; + LONG cb; char *psz1; char *psz2; char *psz3; /* Points to a 256 character buffer */ @@ -261,7 +261,7 @@ typedef INT_PTR (__cdecl *PFNFDINOTIFY)(FDINOTIFICATIONTYPE fdint, typedef struct { char ach[2]; /* Set to { '*', '\0' } */ - long cbFile; /* Required spill file size */ + LONG cbFile; /* Required spill file size */ } FDISPILLFILE, *PFDISPILLFILE; #include <poppack.h>

1 0

Michael Stefaniuc : comdlg32: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 14, 2009

Jan. 14, 2009

Module: wine Branch: master Commit: a04ed94580c50dcc35204008eea3281353593488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04ed94580c50dcc35204008e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 13 23:30:08 2009 +0100 comdlg32: Remove superfluous pointer casts. --- dlls/comdlg32/filedlg.c | 14 +++++++------- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/filedlgbrowser.c | 20 ++++++++++---------- dlls/comdlg32/finddlg32.c | 2 +- dlls/comdlg32/fontdlg.c | 6 +++--- dlls/comdlg32/printdlg.c | 2 +- dlls/comdlg32/tests/filedlg.c | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 386a201..a2826c8 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -292,7 +292,7 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) (LPARAM) fodInfos); else lRes = DialogBoxIndirectParamA(COMDLG32_hInstance, - (LPCDLGTEMPLATEA) template, + template, fodInfos->ofnInfos->hwndOwner, FileOpenDlgProc95, (LPARAM) fodInfos); @@ -998,7 +998,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l /* Adds the FileOpenDlgInfos in the property list of the dialog so it will be easily accessible through a GetPropA(...) */ - SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos); + SetPropA(hwnd, FileOpenDlgInfosStr, fodInfos); FILEDLG95_InitControls(hwnd); @@ -1971,7 +1971,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) DWORD len; /* replace the current filter */ - MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); + MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); len = lstrlenW(lpszTemp)+1; fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR)); lstrcpyW( fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp); @@ -2484,7 +2484,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode) (fodInfos->customfilter == NULL ? 1 : 0); /* Set the current filter with the current selection */ - MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter); + MemFree(fodInfos->ShellInfos.lpstrCurrentFilter); lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, iItem); @@ -2592,7 +2592,7 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) liInfos->iMaxIndentation = 0; - SetPropA(hwndCombo, LookInInfosStr, (HANDLE) liInfos); + SetPropA(hwndCombo, LookInInfosStr, liInfos); /* set item height for both text field and listbox */ CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON)); @@ -2901,7 +2901,7 @@ static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl) } /* Free pidlParent memory */ - COMDLG32_SHFree((LPVOID)pidlParent); + COMDLG32_SHFree(pidlParent); return FILEDLG95_LOOKIN_AddItem(hwnd,pidl,iParentPos + 1); } @@ -3114,7 +3114,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) lstrcpyW( lpstrAllFile, lpstrTemp ); } } - COMDLG32_SHFree( (LPVOID) pidl ); + COMDLG32_SHFree( pidl ); } } SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile ); diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 6b2a379..3e43178 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -822,7 +822,7 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) PFD31_DATA lfs = (PFD31_DATA) lParam; if (!lfs) return FALSE; - SetPropA(hWnd, FD31_OFN_PROP, (HANDLE)lfs); + SetPropA(hWnd, FD31_OFN_PROP, lfs); lfs->hwnd = hWnd; ofn = lfs->ofnW; diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index f933f15..d485d73 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -156,12 +156,12 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC switch (src->uType) { case STRRET_WSTR: - lstrcpynW((LPWSTR)dest, src->u.pOleStr, len); + lstrcpynW(dest, src->u.pOleStr, len); COMDLG32_SHFree(src->u.pOleStr); break; case STRRET_CSTR: - if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, (LPWSTR)dest, len )) + if (len && !MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len )) ((LPWSTR)dest)[len-1] = 0; break; @@ -169,7 +169,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC if (pidl) { if (len && !MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, - -1, (LPWSTR)dest, len )) + -1, dest, len )) ((LPWSTR)dest)[len-1] = 0; } break; @@ -196,7 +196,7 @@ IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner) IShellBrowserImpl *sb; FileOpenDlgInfos *fodInfos = GetPropA(hwndOwner,FileOpenDlgInfosStr); - sb=(IShellBrowserImpl*)COMDLG32_SHAlloc(sizeof(IShellBrowserImpl)); + sb = COMDLG32_SHAlloc(sizeof(IShellBrowserImpl)); /* Initialisation of the member variables */ sb->ref=1; @@ -231,19 +231,19 @@ static HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface, { *ppvObj = This; } else if(IsEqualIID(riid, &IID_IOleWindow)) /*IOleWindow*/ - { *ppvObj = (IOleWindow*)This; + { *ppvObj = This; } else if(IsEqualIID(riid, &IID_IShellBrowser)) /*IShellBrowser*/ - { *ppvObj = (IShellBrowser*)This; + { *ppvObj = This; } else if(IsEqualIID(riid, &IID_ICommDlgBrowser)) /*ICommDlgBrowser*/ - { *ppvObj = (ICommDlgBrowser*) &(This->lpVtblCommDlgBrowser); + { *ppvObj = &(This->lpVtblCommDlgBrowser); } else if(IsEqualIID(riid, &IID_IServiceProvider)) /* IServiceProvider */ - { *ppvObj = (ICommDlgBrowser*) &(This->lpVtblServiceProvider); + { *ppvObj = &(This->lpVtblServiceProvider); } if(*ppvObj) @@ -442,7 +442,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, fodInfos->Shell.FOIShellFolder = psfTmp; /* Release old pidlAbsCurrent and update its value */ - COMDLG32_SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent); + COMDLG32_SHFree(fodInfos->ShellInfos.pidlAbsCurrent); fodInfos->ShellInfos.pidlAbsCurrent = pidlTmp; COMDLG32_UpdateCurrentDir(fodInfos); @@ -795,7 +795,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDl } /* Free memory used by pidl */ - COMDLG32_SHFree((LPVOID)pidl); + COMDLG32_SHFree(pidl); return hRes; } diff --git a/dlls/comdlg32/finddlg32.c b/dlls/comdlg32/finddlg32.c index 80c8e8b..2a7d7e3 100644 --- a/dlls/comdlg32/finddlg32.c +++ b/dlls/comdlg32/finddlg32.c @@ -408,7 +408,7 @@ static HWND COMDLG32_FR_DoFindReplace( } else { - loadrc = (HGLOBAL)pdata->fr.hInstance; + loadrc = pdata->fr.hInstance; } if(!loadrc) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 470b7d3..f61de36 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -182,7 +182,7 @@ BOOL WINAPI ChooseFontW(LPCHOOSEFONTW lpChFont) if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 ) { - template=(LPCVOID)lpChFont->hInstance; + template=lpChFont->hInstance; } else { if ( (lpChFont->Flags&CF_ENABLETEMPLATE)!=0 ) @@ -236,7 +236,7 @@ BOOL WINAPI ChooseFontA(LPCHOOSEFONTA lpChFont) if ( (lpChFont->Flags&CF_ENABLETEMPLATEHANDLE)!=0 ) { - template=(LPCVOID)lpChFont->hInstance; + template=lpChFont->hInstance; } else { if ( (lpChFont->Flags&CF_ENABLETEMPLATE)!=0 ) @@ -601,7 +601,7 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam, HCURSOR hcursor=SetCursor(LoadCursorW(0,(LPWSTR)IDC_WAIT)); static const WCHAR strColorName[] = {'[','c','o','l','o','r',' ','n','a','m','e',']',0}; - SetPropW(hDlg, strWineFontData, (HANDLE)lpcf); + SetPropW(hDlg, strWineFontData, lpcf); lpxx=lpcf->lpLogFont; TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6515700..4a07f04 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -736,7 +736,7 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, fwCapability_Names, Names, dm); NrOfEntries = DeviceCapabilitiesW(PrinterName, PortName, - fwCapability_Words, (LPWSTR)Words, dm); + fwCapability_Words, Words, dm); /* reset any current content in the combobox */ SendDlgItemMessageW(hDlg, nIDComboBox, CB_RESETCONTENT, 0, 0); diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index c3d56ea..9c3487f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -74,7 +74,7 @@ static void test_DialogCancel(void) ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLEHOOK; ofn.lpstrDefExt = "txt"; - ofn.lpfnHook = (LPOFNHOOKPROC) OFNHookProc; + ofn.lpfnHook = OFNHookProc; ofn.lpstrInitialDir = szInitialDir; PrintDlgA(NULL);

1 0