wine-commits October 2006

wine-commits@winehq.org

3 participants
1032 discussions

James Hawkins : cabinet: Make internal functions static.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: e981278769600d3993ef029603d18d0d9d2c095d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e981278769600d3993ef02960… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 11 11:16:31 2006 -0700 cabinet: Make internal functions static. --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index ed520e8..e3b12c2 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -1125,7 +1125,7 @@ struct Ziphuft **t, cab_LONG *m, fdi_dec /********************************************************* * fdi_Zipinflate_codes (internal) */ -cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, +static cab_LONG fdi_Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, cab_LONG bl, cab_LONG bd, fdi_decomp_state *decomp_state) { register cab_ULONG e; /* table entry flag/number of extra bits */

1 0

James Hawkins : crypt32: Make an internal function static.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: d813d8db1b144266cc6a5b247353c074af0f2644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d813d8db1b144266cc6a5b247… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 11 11:20:16 2006 -0700 crypt32: Make an internal function static. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 147535d..03267db 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -60,7 +60,7 @@ static inline void CRYPT_CloseStores(DWO static const WCHAR rootW[] = { 'R','o','o','t',0 }; -BOOL CRYPT_CheckRestrictedRoot(HCERTSTORE store) +static BOOL CRYPT_CheckRestrictedRoot(HCERTSTORE store) { BOOL ret = TRUE;

1 0

James Hawkins : comctl32: Make internal functions static.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: cd073a66a5ef6904acd0bec4ad43024ecd1655e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd073a66a5ef6904acd0bec4a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 11 11:18:02 2006 -0700 comctl32: Make internal functions static. --- dlls/comctl32/listview.c | 4 ++-- dlls/comctl32/propsheet.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b66d047..8d4fc6d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9921,7 +9921,7 @@ static LRESULT EditLblWndProcT(HWND hwnd * * RETURN: */ -LRESULT CALLBACK EditLblWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK EditLblWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return EditLblWndProcT(hwnd, uMsg, wParam, lParam, TRUE); } @@ -9938,7 +9938,7 @@ LRESULT CALLBACK EditLblWndProcW(HWND hw * * RETURN: */ -LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK EditLblWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return EditLblWndProcT(hwnd, uMsg, wParam, lParam, FALSE); } diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 185b843..6a27d7a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -602,7 +602,7 @@ static BOOL PROPSHEET_CollectPageInfo(LP * * Creates the actual property sheet. */ -INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo) +static INT_PTR PROPSHEET_CreateDialog(PropSheetInfo* psInfo) { LRESULT ret; LPCVOID template;

1 0

James Hawkins : gphoto2.ds: Make an internal function static.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: c9384a20329767b4aaface9c37943e8a71a83802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9384a20329767b4aaface9c3… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 11 11:21:03 2006 -0700 gphoto2.ds: Make an internal function static. --- dlls/gphoto2.ds/gphoto2_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index fcd4b16..83e2eea 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -61,7 +61,7 @@ static TW_UINT16 GPHOTO2_GetIdentity( pT static TW_UINT16 GPHOTO2_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif -TW_UINT16 GPHOTO2_SourceControlHandler ( +static TW_UINT16 GPHOTO2_SourceControlHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, TW_UINT16 MSG,

1 0

James Hawkins : advapi32: Add missing declarations to the public headers.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: cdd717bc1bc0a85b204d880400b37675238877c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd717bc1bc0a85b204d88040… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 11 11:15:02 2006 -0700 advapi32: Add missing declarations to the public headers. --- include/winbase.h | 3 +++ include/winreg.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index b6788f3..62d771f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1819,6 +1819,9 @@ BOOL WINAPI NotifyChangeEventLog( BOOL WINAPI ObjectCloseAuditAlarmA(LPCSTR,LPVOID,BOOL); BOOL WINAPI ObjectCloseAuditAlarmW(LPCWSTR,LPVOID,BOOL); #define ObjectCloseAuditAlarm WINELIB_NAME_AW(ObjectCloseAuditAlarm) +BOOL WINAPI ObjectDeleteAuditAlarmA(LPCSTR,LPVOID,BOOL); +BOOL WINAPI ObjectDeleteAuditAlarmW(LPCWSTR,LPVOID,BOOL); +#define ObjectDeleteAuditAlarm WINELIB_NAME_AW(ObjectDeleteAuditAlarm) BOOL WINAPI ObjectOpenAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY_DESCRIPTOR,HANDLE, DWORD,DWORD,PPRIVILEGE_SET,BOOL,BOOL,LPBOOL); BOOL WINAPI ObjectOpenAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,HANDLE, diff --git a/include/winreg.h b/include/winreg.h index a547c56..c694052 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -94,6 +94,7 @@ LONG WINAPI RegCreateKeyExA(HKEY, LONG WINAPI RegCreateKeyExW(HKEY,LPCWSTR,DWORD,LPWSTR,DWORD,REGSAM, LPSECURITY_ATTRIBUTES,PHKEY,LPDWORD); #define RegCreateKeyEx WINELIB_NAME_AW(RegCreateKeyEx) +LONG WINAPI RegDisablePredefinedCache(void); LONG WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES); LONG WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES); #define RegSaveKey WINELIB_NAME_AW(RegSaveKey)

1 0

James Hawkins : advapi32: Make internal functions static.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 2730fe6d1cdcf91ea5910ef8663d9093b892983a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2730fe6d1cdcf91ea5910ef86… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 11 11:13:04 2006 -0700 advapi32: Make internal functions static. --- dlls/advapi32/crypt_sha.c | 2 +- dlls/advapi32/registry.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/crypt_sha.c b/dlls/advapi32/crypt_sha.c index 0c7f7d0..435c67e 100644 --- a/dlls/advapi32/crypt_sha.c +++ b/dlls/advapi32/crypt_sha.c @@ -49,7 +49,7 @@ #define R3(v,w,x,y,z,i) z+=f3(w,x,y)+blk #define R4(v,w,x,y,z,i) z+=f4(w,x,y)+blk1(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); /* Hash a single 512-bit block. This is the core of the algorithm. */ -void SHA1Transform(ULONG State[5], UCHAR Buffer[64]) +static void SHA1Transform(ULONG State[5], UCHAR Buffer[64]) { ULONG a, b, c, d, e; ULONG *Block; diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 55395c0..26c5ae9 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1373,8 +1373,8 @@ LONG WINAPI RegQueryValueA( HKEY hkey, L * * Helper function for RegGetValueA/W. */ -VOID ADVAPI_ApplyRestrictions( DWORD dwFlags, DWORD dwType, DWORD cbData, - PLONG ret ) +static VOID ADVAPI_ApplyRestrictions( DWORD dwFlags, DWORD dwType, + DWORD cbData, PLONG ret ) { /* Check if the type is restricted by the passed flags */ if (*ret == ERROR_SUCCESS || *ret == ERROR_MORE_DATA)

1 0

Andrew Talbot : winedump: Cast-qual warnings fix ( with thanks to Dmitry Timoshkov and Eric Pouech).
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 89e139e17ff449a572bd8281105fe3e018842903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e139e17ff449a572bd82811… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Oct 11 22:20:10 2006 +0100 winedump: Cast-qual warnings fix (with thanks to Dmitry Timoshkov and Eric Pouech). --- include/winnt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index c067c5c..79740d9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2336,8 +2336,8 @@ typedef struct _IMAGE_SECTION_HEADER { #define IMAGE_SIZEOF_SECTION_HEADER 40 #define IMAGE_FIRST_SECTION(ntheader) \ - ((PIMAGE_SECTION_HEADER)((LPBYTE)&((PIMAGE_NT_HEADERS)(ntheader))->OptionalHeader + \ - ((PIMAGE_NT_HEADERS)(ntheader))->FileHeader.SizeOfOptionalHeader)) + ((PIMAGE_SECTION_HEADER)(ULONG_PTR)((const BYTE *)&((const IMAGE_NT_HEADERS *)(ntheader))->OptionalHeader + \ + ((const IMAGE_NT_HEADERS *)(ntheader))->FileHeader.SizeOfOptionalHeader)) /* These defines are for the Characteristics bitfield. */ /* #define IMAGE_SCN_TYPE_REG 0x00000000 - Reserved */

1 0

Andrew Talbot : winebuild: Cast-qual warning fix.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 80294709c51c04696c569700500b1b8217e52115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80294709c51c04696c5697005… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Oct 11 15:11:04 2006 +0100 winebuild: Cast-qual warning fix. --- tools/winebuild/import.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 634eb07..2241fa5 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -147,10 +147,11 @@ inline static ORDDEF *find_export( const { ORDDEF func, *odp, **res = NULL; - func.name = (char *)name; + func.name = xstrdup(name); func.ordinal = -1; odp = &func; if (table) res = bsearch( &odp, table, size, sizeof(*table), func_cmp ); + free( func.name ); return res ? *res : NULL; }

1 0

Nicolas Delcros : winsock: Add mapping for SO_ACCEPTCONN.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: eda8b9550bc686ebd11e63757e397263a20d79b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda8b9550bc686ebd11e63757… Author: Nicolas Delcros <nicolas(a)dyalog.com> Date: Wed Oct 11 14:16:31 2006 +0100 winsock: Add mapping for SO_ACCEPTCONN. --- dlls/ws2_32/socket.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 59b50b9..73ba3c4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -244,6 +244,7 @@ #define MAP_OPTION(opt) { WS_##opt, opt static const int ws_sock_map[][2] = { MAP_OPTION( SO_DEBUG ), + MAP_OPTION( SO_ACCEPTCONN ), MAP_OPTION( SO_REUSEADDR ), MAP_OPTION( SO_KEEPALIVE ), MAP_OPTION( SO_DONTROUTE ),

1 0

Mike McCormack : msi: Test transforms removing a row in a table.
by Alexandre Julliard 12 Oct '06

12 Oct '06

Module: wine Branch: master Commit: 60ea01a4f235e2967a00cb15bca9a9da1f83f53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ea01a4f235e2967a00cb15b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Oct 12 13:25:31 2006 +0900 msi: Test transforms removing a row in a table. --- dlls/msi/tests/db.c | 50 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3778a7e..5fc33eb 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1730,7 +1730,11 @@ static void generate_transform(void) query = "UPDATE `MOO` SET `OOO` = 'c' WHERE `NOO` = 1"; r = run_query(hdb1, 0, query); - ok(r == ERROR_SUCCESS, "failed to add row 1\n"); + ok(r == ERROR_SUCCESS, "failed to modify row\n"); + + query = "DELETE FROM `MOO` WHERE `NOO` = 3"; + r = run_query(hdb1, 0, query); + ok(r == ERROR_SUCCESS, "failed to delete row\n"); /* database needs to be committed */ MsiDatabaseCommit(hdb1); @@ -1750,7 +1754,7 @@ static const WCHAR name2[] = { 0x4840, 0 static const WCHAR name3[] = { 0x4840, 0x3f7f, 0x4164, 0x422f, 0x4836, 0 }; /* _Tables */ static const WCHAR name4[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3b6a, 0x45e4, 0x4824, 0 }; /* _StringData */ static const WCHAR name5[] = { 0x4840, 0x3f3f, 0x4577, 0x446c, 0x3e6a, 0x44b2, 0x482f, 0 }; /* _StringPool */ -static const WCHAR name6[] = { 0x4840, 0x3e16, 0x4181, 0}; +static const WCHAR name6[] = { 0x4840, 0x3e16, 0x4818, 0}; /* MOO */ /* data in each table */ static const WCHAR data1[] = { /* AAR */ @@ -1778,7 +1782,8 @@ static const WCHAR data5[] = { /* _Strin }; /* update row, 0x0002 is a bitmask of present column data, keys are excluded */ static const WCHAR data6[] = { /* MOO */ - 0x0002, 0x8001, 0x0001, + 0x0002, 0x8001, 0x0001, /* update row */ + 0x0000, 0x8003, /* delete row */ }; static const struct { @@ -1840,7 +1845,7 @@ static void generate_transform_manual(vo static void test_try_transform(void) { - MSIHANDLE hdb; + MSIHANDLE hdb, hrec; LPCSTR query; UINT r; @@ -1858,11 +1863,15 @@ static void test_try_transform(void) query = "INSERT INTO `MOO` ( `NOO`, `OOO` ) VALUES ( 1, 'a' )"; r = run_query(hdb, 0, query); - ok(r == ERROR_SUCCESS, "failed to add row 1\n"); + ok(r == ERROR_SUCCESS, "failed to add row\n"); query = "INSERT INTO `MOO` ( `NOO`, `OOO` ) VALUES ( 2, 'b' )"; r = run_query(hdb, 0, query); - ok(r == ERROR_SUCCESS, "failed to add row 1\n"); + ok(r == ERROR_SUCCESS, "failed to add row\n"); + + query = "INSERT INTO `MOO` ( `NOO`, `OOO` ) VALUES ( 3, 'c' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add row\n"); r = MsiDatabaseCommit( hdb ); ok( r == ERROR_SUCCESS , "Failed to commit database\n" ); @@ -1888,23 +1897,38 @@ static void test_try_transform(void) MsiDatabaseCommit( hdb ); /* check new values */ + hrec = 0; query = "select `BAR`,`CAR` from `AAR` where `BAR` = 1 AND `CAR` = 'vw'"; - r = run_query(hdb, 0, query); + r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "select query failed\n"); + MsiCloseHandle(hrec); query = "select `BAR`,`CAR` from `AAR` where `BAR` = 2 AND `CAR` = 'bmw'"; - r = run_query(hdb, 0, query); + hrec = 0; + r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "select query failed\n"); + MsiCloseHandle(hrec); /* check updated values */ + hrec = 0; query = "select `NOO`,`OOO` from `MOO` where `NOO` = 1 AND `OOO` = 'c'"; - r = run_query(hdb, 0, query); - ok(r == ERROR_SUCCESS, "select query failed\n"); + r = do_query(hdb, query, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "select query failed\n"); + MsiCloseHandle(hrec); - /* check unchanged values */ - query = "select `NOO`,`OOO` from `MOO` where `NOO` = 1 AND `OOO` = 'c'"; - r = run_query(hdb, 0, query); + /* check unchanged value */ + hrec = 0; + query = "select `NOO`,`OOO` from `MOO` where `NOO` = 2 AND `OOO` = 'b'"; + r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "select query failed\n"); + MsiCloseHandle(hrec); + + /* check deleted value */ + hrec = 0; + query = "select * from `MOO` where `NOO` = 3"; + r = do_query(hdb, query, &hrec); + todo_wine ok(r == ERROR_NO_MORE_ITEMS, "select query failed\n"); + if (hrec) MsiCloseHandle(hrec); MsiCloseHandle( hdb );

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 October 2006