March 2008 - Wine-commits - list.winehq.org

Andrew Talbot : msvfw32: Assign to structs instead of using memcpy.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 0d80791371d53b1fa3be998339e90d0fb396e0fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d80791371d53b1fa3be99833… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 6 22:33:56 2008 +0000 msvfw32: Assign to structs instead of using memcpy. --- dlls/msvfw32/msvideo_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index aaf8d0c..baea47b 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -753,7 +753,7 @@ static BOOL enum_compressors(HWND list, COMPVARS *pcv, BOOL enum_all) idx = SendMessageW(list, CB_ADDSTRING, 0, (LPARAM)icinfo.szDescription); ic = HeapAlloc(GetProcessHeap(), 0, sizeof(struct codec_info)); - memcpy(&ic->icinfo, &icinfo, sizeof(ICINFO)); + ic->icinfo = icinfo; ic->hic = hic; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); } @@ -1449,7 +1449,7 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) if (!pc->lpbiIn) return FALSE; - memcpy(pc->lpbiIn, lpbiIn, sizeof(BITMAPINFO)); + *pc->lpbiIn = *lpbiIn; pc->lpBitsPrev = HeapAlloc(GetProcessHeap(), 0, pc->lpbiIn->bmiHeader.biSizeImage); if (!pc->lpBitsPrev) {

1 0

Ove Kaaven : msi: Fix bug in handling of multivolume CAB files.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: be874f1a265d03aeb202c70beb7fdcd856a7128a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be874f1a265d03aeb202c70be… Author: Ove Kaaven <ovek(a)transgaming.com> Date: Tue Mar 4 18:16:27 2008 +0100 msi: Fix bug in handling of multivolume CAB files. --- dlls/msi/files.c | 3 ++ dlls/msi/tests/install.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 33a3a5a..b43337a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -401,10 +401,13 @@ static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) } case fdintCLOSE_FILE_INFO: { + CabData *data = (CabData*) pfdin->pv; FILETIME ft; FILETIME ftLocal; HANDLE handle = (HANDLE) pfdin->hf; + data->mi->is_continuous = FALSE; + if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft)) return -1; if (!LocalFileTimeToFileTime(&ft, &ftLocal)) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 03a7506..99c99d4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -175,6 +175,13 @@ static const CHAR cc_component_dat[] = "Component\tComponentId\tDirectory_\tAttr "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n"; +static const CHAR cc2_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" + "augustus\t\tMSITESTDIR\t0\t0\taugustus\n" + "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n"; + static const CHAR cc_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" "Feature\tFeature\n" @@ -194,6 +201,14 @@ static const CHAR cc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "augustus\taugustus\taugustus\t50000\t\t\t16384\t2\n" "caesar\tcaesar\tcaesar\t500\t\t\t16384\t12"; +static const CHAR cc2_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" + "augustus\taugustus\taugustus\t50000\t\t\t16384\t2\n" + "tiberius\tmaximus\ttiberius\t500\t\t\t16384\t3\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t12"; + static const CHAR cc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" "Media\tDiskId\n" @@ -624,6 +639,18 @@ static const msi_table cc_tables[] = ADD_TABLE(property), }; +static const msi_table cc2_tables[] = +{ + ADD_TABLE(cc2_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(cc_media), + ADD_TABLE(property), +}; + static const msi_table co_tables[] = { ADD_TABLE(cc_component), @@ -1538,6 +1565,49 @@ static void create_cc_test_files(void) DeleteFile("caesar"); } +static void create_cc2_test_files(void) +{ + CCAB cabParams; + HFCI hfci; + ERF erf; + static CHAR cab_context[] = "test%d.cab"; + BOOL res; + + create_file("maximus", 500); + create_file("augustus", 50000); + create_file("tiberius", 500); + create_file("caesar", 500); + + set_cab_parameters(&cabParams, "test1.cab", 40000); + + hfci = FCICreate(&erf, file_placed, mem_alloc, mem_free, fci_open, + fci_read, fci_write, fci_close, fci_seek, fci_delete, + get_temp_file, &cabParams, cab_context); + ok(hfci != NULL, "Failed to create an FCI context\n"); + + res = add_file(hfci, "maximus", tcompTYPE_NONE); + ok(res, "Failed to add file maximus\n"); + + res = add_file(hfci, "augustus", tcompTYPE_NONE); + ok(res, "Failed to add file augustus\n"); + + res = add_file(hfci, "tiberius", tcompTYPE_NONE); + ok(res, "Failed to add file tiberius\n"); + + res = FCIFlushCabinet(hfci, FALSE, get_next_cabinet, progress); + ok(res, "Failed to flush the cabinet\n"); + + res = FCIDestroy(hfci); + ok(res, "Failed to destroy the cabinet\n"); + + create_cab_file("test3.cab", MEDIA_SIZE, "caesar\0"); + + DeleteFile("maximus"); + DeleteFile("augustus"); + DeleteFile("tiberius"); + DeleteFile("caesar"); +} + static void delete_cab_files(void) { SHFILEOPSTRUCT shfl; @@ -1577,6 +1647,22 @@ static void test_continuouscabs(void) delete_cab_files(); DeleteFile(msifile); + + create_cc2_test_files(); + create_database(msifile, cc2_tables, sizeof(cc2_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + delete_cab_files(); + DeleteFile(msifile); } static void test_caborder(void)

1 0

Huw Davies : ole32: Fix CopyTo to work correctly with LARGE_INTEGERs.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 60ee0c3eff0234bc67c054613f6f9899f1426212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ee0c3eff0234bc67c054613… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 6 15:13:24 2008 +0000 ole32: Fix CopyTo to work correctly with LARGE_INTEGERs. --- dlls/ole32/stg_stream.c | 38 +++++++++++--------------------------- 1 files changed, 11 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 1bcb40b..a443fcc 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -689,28 +689,23 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( if ( pstm == 0 ) return STG_E_INVALIDPOINTER; - totalBytesRead.u.LowPart = totalBytesRead.u.HighPart = 0; - totalBytesWritten.u.LowPart = totalBytesWritten.u.HighPart = 0; + totalBytesRead.QuadPart = 0; + totalBytesWritten.QuadPart = 0; - /* - * use stack to store data temporarily - * there is surely a more performant way of doing it, for now this basic - * implementation will do the job - */ - while ( cb.u.LowPart > 0 ) + while ( cb.QuadPart > 0 ) { - if ( cb.u.LowPart >= 128 ) - copySize = 128; + if ( cb.QuadPart >= sizeof(tmpBuffer) ) + copySize = sizeof(tmpBuffer); else copySize = cb.u.LowPart; IStream_Read(iface, tmpBuffer, copySize, &bytesRead); - totalBytesRead.u.LowPart += bytesRead; + totalBytesRead.QuadPart += bytesRead; IStream_Write(pstm, tmpBuffer, bytesRead, &bytesWritten); - totalBytesWritten.u.LowPart += bytesWritten; + totalBytesWritten.QuadPart += bytesWritten; /* * Check that read & write operations were successful @@ -723,25 +718,14 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( } if (bytesRead!=copySize) - cb.u.LowPart = 0; + cb.QuadPart = 0; else - cb.u.LowPart -= bytesRead; + cb.QuadPart -= bytesRead; } - /* - * Update number of bytes read and written - */ - if (pcbRead) - { - pcbRead->u.LowPart = totalBytesRead.u.LowPart; - pcbRead->u.HighPart = totalBytesRead.u.HighPart; - } + if (pcbRead) pcbRead->QuadPart = totalBytesRead.QuadPart; + if (pcbWritten) pcbWritten->QuadPart = totalBytesWritten.QuadPart; - if (pcbWritten) - { - pcbWritten->u.LowPart = totalBytesWritten.u.LowPart; - pcbWritten->u.HighPart = totalBytesWritten.u.HighPart; - } return hr; }

1 0

Paul Vriens : advapi32/tests: Fix a few typos.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 81e0ef44e9c9e9aaa1e9d96d7313805cabafd98a URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e0ef44e9c9e9aaa1e9d96d7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Mar 6 21:10:49 2008 +0100 advapi32/tests: Fix a few typos. --- dlls/advapi32/tests/security.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9ff02e9..027af2e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1685,14 +1685,14 @@ static void test_security_descriptor(void) ok(GetSecurityDescriptorOwner(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); - ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorOwner failed\n"); + ok(GetSecurityDescriptorGroup(&sd, &psid, &isDefault), "GetSecurityDescriptorGroup failed\n"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); - ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + ok(GetSecurityDescriptorDacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorDacl failed\n"); expect_eq(isPresent, TRUE, BOOL, "%d"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d"); - ok(GetSecurityDescriptorSacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorOwner failed\n"); + ok(GetSecurityDescriptorSacl(&sd, &isPresent, &pacl, &isDefault), "GetSecurityDescriptorSacl failed\n"); expect_eq(isPresent, TRUE, BOOL, "%d"); expect_eq(psid, NULL, PSID, "%p"); expect_eq(isDefault, FALSE, BOOL, "%d");

1 0

Dan Kegel : winex11: wintab.c: use atan2 instead of atan.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: 1eba6c7644f801f82c66b109f39d754f0c4e05f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eba6c7644f801f82c66b109f… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Mar 6 12:33:09 2008 -0800 winex11: wintab.c: use atan2 instead of atan. --- dlls/winex11.drv/wintab.c | 33 ++++++--------------------------- 1 files changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index da18ce0..e5d7071 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -742,35 +742,14 @@ void X11DRV_LoadTabletInfo(HWND hwnddefault) static int figure_deg(int x, int y) { - int rc; + float angle; - if (y != 0) - { - rc = (int) 10 * (atan( (FLOAT)abs(y) / (FLOAT)abs(x)) / (3.1415 / 180)); - if (y>0) - { - if (x>0) - rc += 900; - else - rc = 2700 - rc; - } - else - { - if (x>0) - rc = 900 - rc; - else - rc += 2700; - } - } - else - { - if (x >= 0) - rc = 900; - else - rc = 2700; - } + angle = atan2((float)y, (float)x); + angle += M_PI_2; + if (angle <= 0) + angle += 2 * M_PI; - return rc; + return (0.5 + (angle * 1800.0 / M_PI)); } static int get_button_state(int curnum)

1 0

Mikołaj Zalewski : comctl32: rebar: Fix SizeToHeight when no bands visible.
by Alexandre Julliard 07 Mar '08

07 Mar '08

Module: wine Branch: master Commit: d3608cf4b2e08c843f2b914cbd8eeeea8510334e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3608cf4b2e08c843f2b914cb… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Mar 6 22:06:21 2008 +0100 comctl32: rebar: Fix SizeToHeight when no bands visible. --- dlls/comctl32/rebar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 9a3f8d5..f1f823a 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1442,6 +1442,9 @@ REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) UINT uNumRows = infoPtr->uNumRows; int i; + if (uNumRows == 0) /* avoid division by 0 */ + return; + /* That's not exactly what Windows does but should be similar */ /* Pass one: break-up/glue rows */

1 0

Rob Shearman : adsiid: Add static import library for active directory GUIDs .
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: 76e089692e13a07beb06db802a2568cd711f2301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e089692e13a07beb06db802… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:01:34 2008 +0000 adsiid: Add static import library for active directory GUIDs. --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 3 +++ dlls/adsiid/Makefile.in | 12 ++++++++++++ dlls/adsiid/adsiid.c | 27 +++++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 164763b..6b22eb0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,6 +160,7 @@ ALL_MAKEFILES = \ dlls/acledit/Makefile \ dlls/activeds/Makefile \ dlls/actxprxy/Makefile \ + dlls/adsiid/Makefile \ dlls/advapi32/Makefile \ dlls/advapi32/tests/Makefile \ dlls/advpack/Makefile \ @@ -576,6 +577,7 @@ dlls/Makefile: dlls/Makefile.in Make.rules dlls/acledit/Makefile: dlls/acledit/Makefile.in dlls/Makedll.rules dlls/activeds/Makefile: dlls/activeds/Makefile.in dlls/Makedll.rules dlls/actxprxy/Makefile: dlls/actxprxy/Makefile.in dlls/Makedll.rules +dlls/adsiid/Makefile: dlls/adsiid/Makefile.in dlls/Makeimplib.rules dlls/advapi32/Makefile: dlls/advapi32/Makefile.in dlls/Makedll.rules dlls/advapi32/tests/Makefile: dlls/advapi32/tests/Makefile.in dlls/Maketest.rules dlls/advpack/Makefile: dlls/advpack/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 7be6eb1..edcabe9 100755 --- a/configure +++ b/configure @@ -21182,6 +21182,8 @@ ac_config_files="$ac_config_files dlls/activeds/Makefile" ac_config_files="$ac_config_files dlls/actxprxy/Makefile" +ac_config_files="$ac_config_files dlls/adsiid/Makefile" + ac_config_files="$ac_config_files dlls/advapi32/Makefile" ac_config_files="$ac_config_files dlls/advapi32/tests/Makefile" @@ -22548,6 +22550,7 @@ do "dlls/acledit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/acledit/Makefile" ;; "dlls/activeds/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/activeds/Makefile" ;; "dlls/actxprxy/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/actxprxy/Makefile" ;; + "dlls/adsiid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/adsiid/Makefile" ;; "dlls/advapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/Makefile" ;; "dlls/advapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advapi32/tests/Makefile" ;; "dlls/advpack/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/advpack/Makefile" ;; diff --git a/configure.ac b/configure.ac index 3234493..c2d628b 100644 --- a/configure.ac +++ b/configure.ac @@ -1664,6 +1664,7 @@ AC_CONFIG_FILES([dlls/Makefile]) AC_CONFIG_FILES([dlls/acledit/Makefile]) AC_CONFIG_FILES([dlls/activeds/Makefile]) AC_CONFIG_FILES([dlls/actxprxy/Makefile]) +AC_CONFIG_FILES([dlls/adsiid/Makefile]) AC_CONFIG_FILES([dlls/advapi32/Makefile]) AC_CONFIG_FILES([dlls/advapi32/tests/Makefile]) AC_CONFIG_FILES([dlls/advpack/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d294a19..9ed67df 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -271,6 +271,7 @@ BASEDIRS = \ wtsapi32 IMPLIBSUBDIRS = \ + adsiid \ dxerr8 \ dxerr9 \ dxguid \ @@ -523,6 +524,7 @@ IMPORT_SYMLINKS = \ IMPORT_LIBS = \ $(IMPORT_SYMLINKS) \ + adsiid/libadsiid.a \ dxerr8/libdxerr8.a \ dxerr9/libdxerr9.a \ dxguid/libdxguid.a \ @@ -1073,6 +1075,7 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR # Map library name to the corresponding directory +adsiid/libadsiid.a: adsiid dxerr8/libdxerr8.a: dxerr8 dxerr9/libdxerr9.a: dxerr9 dxguid/libdxguid.a: dxguid diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in new file mode 100644 index 0000000..099b811 --- /dev/null +++ b/dlls/adsiid/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = libadsiid.a + +C_SRCS = \ + adsiid.c + +(a)MAKE_IMPLIB_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/adsiid/adsiid.c b/dlls/adsiid/adsiid.c new file mode 100644 index 0000000..e4e85d8 --- /dev/null +++ b/dlls/adsiid/adsiid.c @@ -0,0 +1,27 @@ +/* + * Active Directory GUID definitions + * + * Copyright 2008 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "objbase.h" +#include "initguid.h" + +#include "iads.h"

1 0

Rob Shearman : include: Add defines for GetExceptionCode, GetExceptionInformation and AbnormalTermination to excpt. h for the MS compiler when using compiler exceptions.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: ba29e89870659cb039cfabfa795cd365af1cd217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba29e89870659cb039cfabfa7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 15:03:26 2008 +0000 include: Add defines for GetExceptionCode, GetExceptionInformation and AbnormalTermination to excpt.h for the MS compiler when using compiler exceptions. --- include/excpt.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/excpt.h b/include/excpt.h index 13fa584..3369f3b 100644 --- a/include/excpt.h +++ b/include/excpt.h @@ -38,5 +38,14 @@ typedef enum _EXCEPTION_DISPOSITION #define EXCEPTION_CONTINUE_EXECUTION -1 +#if defined(_MSC_VER) && defined(USE_COMPILER_EXCEPTIONS) +#define GetExceptionCode _exception_code +#define GetExceptionInformation (struct _EXCEPTION_POINTERS *)_exception_info +#define AbnormalTermination _abnormal_termination + +unsigned long __cdecl _exception_code(void); +void * __cdecl _exception_info(void); +int __cdecl _abnormal_termination(void); +#endif /* defined(_MSC_VER) && defined(USE_COMPILER_EXCEPTIONS) */ #endif /* __WINE_EXCPT_H */

1 0

Rob Shearman : rpcrt4: Use closesocket to close sockets and define it to close on Unix platforms to make the code more portable .
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: a1e4bcda1a6c79b672f7c271bab1e3911b3438fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e4bcda1a6c79b672f7c271b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 6 14:59:02 2008 +0000 rpcrt4: Use closesocket to close sockets and define it to close on Unix platforms to make the code more portable. --- dlls/rpcrt4/rpc_transport.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0859537..b02c11d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -64,6 +64,7 @@ # ifdef HAVE_SYS_POLL_H # include <sys/poll.h> # endif +# define closesocket close #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ #include "windef.h" @@ -801,7 +802,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) if (0>connect(sock, ai_cur->ai_addr, ai_cur->ai_addrlen)) { WARN("connect() failed: %s\n", strerror(errno)); - close(sock); + closesocket(sock); continue; } @@ -880,7 +881,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr if (ret < 0) { WARN("bind failed: %s\n", strerror(errno)); - close(sock); + closesocket(sock); if (errno == EADDRINUSE) status = RPC_S_DUPLICATE_ENDPOINT; else @@ -892,7 +893,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr endpoint, NULL, NULL, NULL); if (create_status != RPC_S_OK) { - close(sock); + closesocket(sock); status = create_status; continue; } @@ -1046,7 +1047,7 @@ static int rpcrt4_conn_tcp_close(RpcConnection *Connection) TRACE("%d\n", tcpc->sock); if (tcpc->sock != -1) - close(tcpc->sock); + closesocket(tcpc->sock); tcpc->sock = -1; close(tcpc->cancel_fds[0]); close(tcpc->cancel_fds[1]);

1 0

Francois Gouget : hal: Add a stub for HalGetBusData() to make 3DMark2001SE happy in WinNT mode.
by Alexandre Julliard 06 Mar '08

06 Mar '08

Module: wine Branch: master Commit: a555658ba1cfcfc887b973fa8b7ae260a17e7fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a555658ba1cfcfc887b973fa8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 6 13:28:27 2008 +0100 hal: Add a stub for HalGetBusData() to make 3DMark2001SE happy in WinNT mode. --- dlls/hal/hal.c | 9 ++++++++- dlls/hal/hal.spec | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 10c695b..0b64809 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -31,7 +31,7 @@ #include "windef.h" #include "winternl.h" #include "excpt.h" -#include "ddk/wdm.h" +#include "ddk/ntddk.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -99,3 +99,10 @@ VOID WINAPI KfReleaseSpinLock(PKSPIN_LOCK SpinLock, KIRQL NewIrql) { FIXME( "(%p %u) stub!\n", SpinLock, NewIrql ); } + +ULONG WINAPI HalGetBusData(BUS_DATA_TYPE BusDataType, ULONG BusNumber, ULONG SlotNumber, PVOID Buffer, ULONG Length) +{ + FIXME("(%u %u %u %p %u) stub!\n", BusDataType, BusNumber, SlotNumber, Buffer, Length); + /* Claim that there is no such bus */ + return 0; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 298dc8e..5afbee0 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -33,7 +33,7 @@ @ stub HalFlushCommonBuffer @ stub HalFreeCommonBuffer @ stub HalGetAdapter -@ stub HalGetBusData +@ stdcall HalGetBusData(long long long ptr long) @ stub HalGetBusDataByOffset @ stub HalGetEnvironmentVariable @ stub HalGetInterruptVector

1 0