August 2006 - Wine-commits - list.winehq.org

Robert Reif : advapi32: LookupAccountSid buffer size query fixes.
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 39b77ec560f2e2d8fd2c89d33e3ba384c7757a15 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39b77ec560f2e2d8fd2c89d… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 19 09:16:05 2006 -0400 advapi32: LookupAccountSid buffer size query fixes. --- dlls/advapi32/security.c | 58 +++++++++++++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4c55f56..2ac1758 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1827,8 +1827,8 @@ LookupAccountSidA( LPWSTR systemW = NULL; LPWSTR accountW = NULL; LPWSTR domainW = NULL; - DWORD accountSizeW = *accountSize * sizeof(WCHAR); - DWORD domainSizeW = *domainSize * sizeof(WCHAR); + DWORD accountSizeW = *accountSize; + DWORD domainSizeW = *domainSize; TRACE("(%s,sid=%s,%p,%p(%lu),%p,%p(%lu),%p)\n", debugstr_a(system),debugstr_sid(sid), @@ -1838,22 +1838,30 @@ LookupAccountSidA( if (system) { len = MultiByteToWideChar( CP_ACP, 0, system, -1, NULL, 0 ); - systemW = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(WCHAR) ); + systemW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, system, -1, systemW, len ); } - accountW = HeapAlloc( GetProcessHeap(), 0, accountSizeW ); - domainW = HeapAlloc( GetProcessHeap(), 0, domainSizeW ); + if (account) + accountW = HeapAlloc( GetProcessHeap(), 0, accountSizeW * sizeof(WCHAR) ); + if (domain) + domainW = HeapAlloc( GetProcessHeap(), 0, domainSizeW * sizeof(WCHAR) ); - r = LookupAccountSidW(systemW, sid, accountW, &accountSizeW, domainW, &domainSizeW, name_use ); + r = LookupAccountSidW( systemW, sid, accountW, &accountSizeW, domainW, &domainSizeW, name_use ); if (r) { - len = WideCharToMultiByte( CP_ACP, 0, accountW, -1, NULL, 0, NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, accountW, -1, account, len, NULL, NULL ); - *accountSize = len; + if (accountW && *accountSize) { + len = WideCharToMultiByte( CP_ACP, 0, accountW, -1, NULL, 0, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, accountW, -1, account, len, NULL, NULL ); + *accountSize = len; + } else + *accountSize = accountSizeW; - len = WideCharToMultiByte( CP_ACP, 0, domainW, -1, NULL, 0, NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, domainW, -1, domain, len, NULL, NULL ); - *domainSize = len; + if (domainW && *domainSize) { + len = WideCharToMultiByte( CP_ACP, 0, domainW, -1, NULL, 0, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, domainW, -1, domain, len, NULL, NULL ); + *domainSize = len; + } else + *domainSize = domainSizeW; } HeapFree( GetProcessHeap(), 0, systemW ); @@ -1988,17 +1996,25 @@ LookupAccountSidW( } if (dm) { - *accountSize = strlenW(ac)+1; - if (account && (*accountSize > strlenW(ac))) - strcpyW(account, ac); - - *domainSize = strlenW(dm)+1; - if (domain && (*domainSize > strlenW(dm))) - strcpyW(domain,dm); - + BOOL status = TRUE; + if (*accountSize > lstrlenW(ac)) { + if (account) + lstrcpyW(account, ac); + } + if (*domainSize > lstrlenW(dm)) { + if (domain) + lstrcpyW(domain, dm); + } + if (((*accountSize != 0) && (*accountSize < strlenW(ac))) || + ((*domainSize != 0) && (*domainSize < strlenW(dm)))) { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + status = FALSE; + } + *domainSize = strlenW(dm) + 1; + *accountSize = strlenW(ac) + 1; *name_use = use; HeapFree(GetProcessHeap(), 0, computer_name); - return TRUE; + return status; } HeapFree(GetProcessHeap(), 0, computer_name);

1 0

Robert Reif : advapi32: LookupAccountSid buffer size query tests.
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: ca80c55ae89aa3ae049af86e6de0754b1b4d89a0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca80c55ae89aa3ae049af86… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 19 09:17:30 2006 -0400 advapi32: LookupAccountSid buffer size query tests. --- dlls/advapi32/tests/security.c | 56 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9cf2af6..0a6a193 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -880,6 +880,7 @@ static void test_LookupAccountSid(void) SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; char account[MAX_PATH], domain[MAX_PATH]; DWORD acc_size, dom_size; + DWORD real_acc_size, real_dom_size; PSID pUsersSid = NULL; SID_NAME_USE use; BOOL ret; @@ -899,18 +900,69 @@ static void test_LookupAccountSid(void) if (!ret && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) return; + real_acc_size = MAX_PATH; + real_dom_size = MAX_PATH; + ret = LookupAccountSidA(NULL, pUsersSid, account, &real_acc_size, domain, &real_dom_size, &use); + ok(ret, "LookupAccountSid() Expected TRUE, got FALSE\n"); + /* try NULL account */ acc_size = MAX_PATH; dom_size = MAX_PATH; - ret = LookupAccountSid(NULL, pUsersSid, NULL, &acc_size, domain, &dom_size, &use); + ret = LookupAccountSidA(NULL, pUsersSid, NULL, &acc_size, domain, &dom_size, &use); ok(ret, "LookupAccountSid() Expected TRUE, got FALSE\n"); /* try NULL domain */ acc_size = MAX_PATH; dom_size = MAX_PATH; - ret = LookupAccountSid(NULL, pUsersSid, account, &acc_size, NULL, &dom_size, &use); + ret = LookupAccountSidA(NULL, pUsersSid, account, &acc_size, NULL, &dom_size, &use); ok(ret, "LookupAccountSid() Expected TRUE, got FALSE\n"); + /* try a small account buffer */ + acc_size = 1; + dom_size = MAX_PATH; + account[0] = 0; + ret = LookupAccountSidA(NULL, pUsersSid, account, &acc_size, domain, &dom_size, &use); + ok(!ret, "LookupAccountSid() Expected FALSE got TRUE\n"); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "LookupAccountSid() Expected ERROR_NOT_ENOUGH_MEMORY, got %lu\n", GetLastError()); + + /* try a 0 sized account buffer */ + acc_size = 0; + dom_size = MAX_PATH; + account[0] = 0; + ret = LookupAccountSidA(NULL, pUsersSid, account, &acc_size, domain, &dom_size, &use); + /* this can fail or succeed depending on OS version but the size will always be returned */ + ok(acc_size == real_acc_size, "LookupAccountSid() Expected acc_size = %lu, got %lu\n", real_acc_size, acc_size); + + /* try a 0 sized account buffer */ + acc_size = 0; + dom_size = MAX_PATH; + ret = LookupAccountSidA(NULL, pUsersSid, NULL, &acc_size, domain, &dom_size, &use); + /* this can fail or succeed depending on OS version but the size will always be returned */ + ok(acc_size == real_acc_size, "LookupAccountSid() Expected acc_size = %lu, got %lu\n", real_acc_size, acc_size); + + /* try a small domain buffer */ + dom_size = 1; + acc_size = MAX_PATH; + account[0] = 0; + ret = LookupAccountSidA(NULL, pUsersSid, account, &acc_size, domain, &dom_size, &use); + ok(!ret, "LookupAccountSid() Expected FALSE got TRUE\n"); + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "LookupAccountSid() Expected ERROR_NOT_ENOUGH_MEMORY, got %lu\n", GetLastError()); + + /* try a 0 sized domain buffer */ + dom_size = 0; + acc_size = MAX_PATH; + account[0] = 0; + ret = LookupAccountSidA(NULL, pUsersSid, account, &acc_size, domain, &dom_size, &use); + /* this can fail or succeed depending on OS version but the size will always be returned */ + ok(dom_size == real_dom_size, "LookupAccountSid() Expected dom_size = %lu, got %lu\n", real_dom_size, dom_size); + + /* try a 0 sized domain buffer */ + dom_size = 0; + acc_size = MAX_PATH; + ret = LookupAccountSidA(NULL, pUsersSid, account, &acc_size, NULL, &dom_size, &use); + /* this can fail or succeed depending on OS version but the size will always be returned */ + ok(acc_size == real_acc_size, "LookupAccountSid() Expected dom_size = %lu, got %lu\n", real_dom_size, dom_size); + pCreateWellKnownSid = (fnCreateWellKnownSid)GetProcAddress( hmod, "CreateWellKnownSid" ); if (pCreateWellKnownSid && pConvertSidToStringSidA)

1 0

Robert Reif : kernel32: Fix ExpandEnvironmentStrings to not overflow UNICODE_STRING buffer size ( with test).
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 63d4bb7bae81db3113388d97204b3a894c1691f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63d4bb7bae81db3113388d9… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 19 13:27:01 2006 -0400 kernel32: Fix ExpandEnvironmentStrings to not overflow UNICODE_STRING buffer size (with test). --- dlls/kernel/environ.c | 5 +++++ dlls/kernel/tests/environ.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/environ.c b/dlls/kernel/environ.c index 4887525..2de9b92 100644 --- a/dlls/kernel/environ.c +++ b/dlls/kernel/environ.c @@ -345,6 +345,11 @@ DWORD WINAPI ExpandEnvironmentStringsW( TRACE("(%s %p %lu)\n", debugstr_w(src), dst, len); RtlInitUnicodeString(&us_src, src); + + /* make sure we don't overflow maximum UNICODE_STRING size */ + if (len > 0x7fff) + len = 0x7fff; + us_dst.Length = 0; us_dst.MaximumLength = len * sizeof(WCHAR); us_dst.Buffer = dst; diff --git a/dlls/kernel/tests/environ.c b/dlls/kernel/tests/environ.c index 9c04162..c9b8cd9 100644 --- a/dlls/kernel/tests/environ.c +++ b/dlls/kernel/tests/environ.c @@ -213,9 +213,14 @@ static void test_GetSetEnvironmentVariab static void test_ExpandEnvironmentStringsA(void) { - char buf[256], buf1[256]; + char buf[256], buf1[256], buf2[0x8000]; DWORD ret_size, ret_size1; + /* test a large destination size */ + strcpy(buf, "12345"); + ret_size = ExpandEnvironmentStringsA(buf, buf2, sizeof(buf2)); + ok(!strcmp(buf, buf2), "ExpandEnvironmentStrings failed %s vs %s. ret_size = %ld\n", buf, buf2, ret_size); + ret_size1 = GetWindowsDirectoryA(buf1,256); ok ((ret_size1 >0) && (ret_size1<256), "GetWindowsDirectory Failed\n"); ret_size = ExpandEnvironmentStringsA("%SystemRoot%",buf,sizeof(buf));

1 0

Stefan Huehner : Fix some -Wstrict-prototype warnings () -> (void).
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 998e256c82158e84f521f8d2443bd8eab9f03104 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=998e256c82158e84f521f8d… Author: Stefan Huehner <stefan(a)huehner.org> Date: Fri Aug 18 20:57:46 2006 +0200 Fix some -Wstrict-prototype warnings () -> (void). --- dlls/advpack/tests/advpack.c | 2 +- dlls/advpack/tests/files.c | 2 +- dlls/comctl32/tests/header.c | 4 ++-- dlls/ddraw/tests/d3d.c | 2 +- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/gphoto2.ds/ui.c | 2 +- dlls/riched20/tests/editor.c | 10 +++++----- dlls/rpcrt4/tests/ndr_marshall.c | 2 +- dlls/sane.ds/sane_main.c | 2 +- dlls/shell32/shellpath.c | 2 +- dlls/twain_32/dsm_ctrl.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index c178268..b747e76 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -419,7 +419,7 @@ static BOOL check_reg_dword(HKEY hkey, L return (check == value); } -static void setperusersecvalues_test() +static void setperusersecvalues_test(void) { PERUSERSECTION peruser; HRESULT hr; diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 1ef76c8..6699617 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -127,7 +127,7 @@ static BOOL check_ini_contents(LPSTR fil return ret; } -static void test_AddDelBackupEntry() +static void test_AddDelBackupEntry(void) { HRESULT res; CHAR path[MAX_PATH]; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 65038ce..0084a71 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -56,7 +56,7 @@ static void dont_expect_notify(INT iCode unexpectedNotify[nUnexpectedNotify++] = iCode; } -static BOOL notifies_received() +static BOOL notifies_received(void) { BOOL fRet = (nExpectedNotify == nReceivedNotify); nExpectedNotify = nReceivedNotify = 0; @@ -323,7 +323,7 @@ static void check_auto_fields(void) /* field from comctl >4.0 not tested as the system probably won't touch them */ } -static void check_mask() +static void check_mask(void) { HDITEMA hdi; static CHAR text[] = "ABC"; diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index e029382..0409dce 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -220,7 +220,7 @@ static void LightTest(void) ok(rc==DDERR_INVALIDPARAMS, "GetLightEnable returned: %lx\n", rc); } -static void ProcessVerticesTest() +static void ProcessVerticesTest(void) { D3DVERTEXBUFFERDESC desc; HRESULT rc; diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 592ee53..3e91d6c 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -246,7 +246,7 @@ TW_UINT16 GPHOTO2_RGBResponseSet (pTW_IDENTITY pOrigin, TW_MEMREF pData); /* UI function */ -BOOL DoCameraUI(); +BOOL DoCameraUI(void); HWND TransferringDialogBox(HWND dialog, DWORD progress); #ifdef HAVE_GPHOTO2 diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 1851270..88fa8fa 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -226,7 +226,7 @@ static INT_PTR CALLBACK DialogProc(HWND return FALSE; } -BOOL DoCameraUI() +BOOL DoCameraUI(void) { return DialogBoxW(GPHOTO2_instance, (LPWSTR)MAKEINTRESOURCE(IDD_CAMERAUI),NULL, DialogProc); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1e378dd..e9a7550 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -455,7 +455,7 @@ static void test_EM_SETTEXTMODE(void) DestroyWindow(hwndRichEdit); } -static void test_TM_PLAINTEXT() +static void test_TM_PLAINTEXT(void) { /*Tests plain text properties*/ @@ -557,7 +557,7 @@ static void test_TM_PLAINTEXT() DestroyWindow(hwndRichEdit); } -static void test_WM_GETTEXT() +static void test_WM_GETTEXT(void) { HWND hwndRichEdit = new_richedit(NULL); static const char text[] = "Hello. My name is RichEdit!"; @@ -572,7 +572,7 @@ static void test_WM_GETTEXT() } /* FIXME: need to test unimplemented options and robustly test wparam */ -static void test_EM_SETOPTIONS() +static void test_EM_SETOPTIONS(void) { HWND hwndRichEdit = new_richedit(NULL); static const char text[] = "Hello. My name is RichEdit!"; @@ -675,7 +675,7 @@ static void test_EM_AUTOURLDETECT(void) DestroyWindow(parent); } -static void test_EM_SCROLL() +static void test_EM_SCROLL(void) { int i, j; int r; /* return value */ @@ -810,7 +810,7 @@ static void test_EM_SCROLL() DestroyWindow(hwndRichEdit); } -static void test_EM_SETUNDOLIMIT() +static void test_EM_SETUNDOLIMIT(void) { /* cases we test for: * default behaviour - limiting at 100 undo's diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index b4184b3..3d1a5d0 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -228,7 +228,7 @@ static int deref_cmp(const void *s1, con } -static void test_simple_types() +static void test_simple_types(void) { unsigned char wiredata[16]; unsigned char ch; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index a20a4ae..0afedd7 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -540,7 +540,7 @@ static void copy_sane_short_name(const c static const SANE_Device **sane_devlist; static void -detect_sane_devices() { +detect_sane_devices(void) { if (sane_devlist && sane_devlist[0]) return; TRACE("detecting sane...\n"); if (sane_get_devices (&sane_devlist, SANE_FALSE) != SANE_STATUS_GOOD) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index a0d8152..ddaedc8 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2010,7 +2010,7 @@ static inline BOOL _SHAppendToUnixPath(c * exists and left alone if not. * ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) */ -static void _SHCreateSymbolicLinks() +static void _SHCreateSymbolicLinks(void) { UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 18edfab..60928e7 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -98,7 +98,7 @@ twain_add_onedriver(const char *dsname) static int detectionrun = 0; static void -twain_autodetect() { +twain_autodetect(void) { if (detectionrun) return; detectionrun = 1;

1 0

Alexander Nicolaysen Sørnes : shlwapi: Update Norwegian Bokmål resources.
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 212edf2349dc0cef0211454ac07d602174acb3b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=212edf2349dc0cef0211454… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 18 21:42:46 2006 +0200 shlwapi: Update Norwegian Bokmål resources. --- dlls/shlwapi/shlwapi_No.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/shlwapi_No.rc b/dlls/shlwapi/shlwapi_No.rc index 3ca08a3..779fdc5 100644 --- a/dlls/shlwapi/shlwapi_No.rc +++ b/dlls/shlwapi/shlwapi_No.rc @@ -1,7 +1,7 @@ /* * Norwegian Bokm�l resources for shlwapi * - * Copyright 2005 Alexander N. S�rnes <alex(a)thehandofagony.com> + * Copyright 2005-2006 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 @@ -36,5 +36,5 @@ FONT 8, "MS Shell Dlg" STRINGTABLE DISCARDABLE { - IDS_BYTES_FORMAT "%ld bytes" + IDS_BYTES_FORMAT "%ld byte" }

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resources.
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 1a29c97d73fa5485b70ebb6e84b967680b99d76a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a29c97d73fa5485b70ebb6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Aug 18 21:42:46 2006 +0200 winecfg: Update Norwegian Bokmål resources. --- programs/winecfg/No.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 39370a4..249bc1a 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -232,7 +232,7 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_SHADER_MODE_HARDWARE "Hardware" - IDS_SHADER_MODE_NONE "None" - IDS_SHADER_MODE_EMULATION "Emulated" + IDS_SHADER_MODE_HARDWARE "Maskinvare" + IDS_SHADER_MODE_NONE "Ingen" + IDS_SHADER_MODE_EMULATION "Emulert" END

1 0

Stefan Leichter : qcap: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 21 Aug '06

21 Aug '06

Module: wine Branch: master Commit: 759e645794195572d65654ad0fece0ef0599745a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=759e645794195572d65654a… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 18 22:25:23 2006 +0200 qcap: Print 64bit integers with wine_dbgstr_longlong. --- dlls/qcap/capturegraph.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index ebed918..a656ba2 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -303,8 +303,8 @@ fnCaptureGraphBuilder2_AllocCapFile(ICap { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); - FIXME("(%p/%p)->(%s, %lld) Stub!\n", This, iface, - debugstr_w(lpwstr), dwlSize); + FIXME("(%p/%p)->(%s, 0x%s) Stub!\n", This, iface, + debugstr_w(lpwstr), wine_dbgstr_longlong(dwlSize)); return E_NOTIMPL; }

1 0

Alexandre Julliard : user: Add .exe extension to wineboot just in case.
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 909accf311ee9acc0177844e31ec8e682a4fcd8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=909accf311ee9acc0177844… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 18 20:54:26 2006 +0200 user: Add .exe extension to wineboot just in case. --- dlls/user/user_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index 4a2915a..8b3d83c 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -287,7 +287,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWO */ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) { - static const WCHAR winebootW[] = { '\\','w','i','n','e','b','o','o','t',0 }; + static const WCHAR winebootW[] = { '\\','w','i','n','e','b','o','o','t','.','e','x','e',0 }; static const WCHAR killW[] = { ' ','-','-','k','i','l','l',0 }; static const WCHAR end_sessionW[] = { ' ','-','-','e','n','d','-','s','e','s','s','i','o','n',0 }; static const WCHAR forceW[] = { ' ','-','-','f','o','r','c','e',0 };

1 0

Alexandre Julliard : msvcrt: Fixed access to the extra arguments of setjmp3 .
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 9edcd1c1b24b9b857a95f2e0e772cfae7a5470b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9edcd1c1b24b9b857a95f2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 18 20:56:43 2006 +0200 msvcrt: Fixed access to the extra arguments of setjmp3. --- dlls/msvcrt/except.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index d8691a8..75b7799 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -315,7 +315,7 @@ int CDECL __regs_MSVCRT__setjmp(struct M * _setjmp3 (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 ); -int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args) +int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...) { jmp->Cookie = MSVCRT_JMP_MAGIC; jmp->UnwindFunc = 0; @@ -326,16 +326,16 @@ int CDECL __regs_MSVCRT__setjmp3(struct } else { - void **args = ((void**)jmp->Esp)+2; + int i; + va_list args; - if (nb_args > 0) jmp->UnwindFunc = (unsigned long)*args++; - if (nb_args > 1) jmp->TryLevel = (unsigned long)*args++; + va_start( args, nb_args ); + if (nb_args > 0) jmp->UnwindFunc = va_arg( args, unsigned long ); + if (nb_args > 1) jmp->TryLevel = va_arg( args, unsigned long ); else jmp->TryLevel = ((MSVCRT_EXCEPTION_FRAME*)jmp->Registration)->trylevel; - if (nb_args > 2) - { - size_t size = (nb_args - 2) * sizeof(DWORD); - memcpy( jmp->UnwindData, args, min( size, sizeof(jmp->UnwindData) )); - } + for (i = 0; i < 6 && i < nb_args - 2; i++) + jmp->UnwindData[i] = va_arg( args, unsigned long ); + va_end( args ); } TRACE("buf=%p ebx=%08lx esi=%08lx edi=%08lx ebp=%08lx esp=%08lx eip=%08lx frame=%08lx\n",

1 0

Oleg Krylov : comctl32: Correctly map toolbar bitmap mask color in case of non-default color scheme .
by Alexandre Julliard 18 Aug '06

18 Aug '06

Module: wine Branch: master Commit: 21b94d4cf4b159c11dfdec5aa6b62de0a72b4f71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21b94d4cf4b159c11dfdec5… Author: Oleg Krylov <oleg.krylov(a)gmail.com> Date: Fri Aug 18 17:05:17 2006 +0300 comctl32: Correctly map toolbar bitmap mask color in case of non-default color scheme. --- dlls/comctl32/toolbar.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c1926cb..108bf04 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2689,48 +2689,48 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa switch (lpAddBmp->nID) { case IDB_STD_SMALL_COLOR: - hbmLoad = LoadBitmapW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDB_STD_SMALL)); + hbmLoad = CreateMappedBitmap (COMCTL32_hModule, + IDB_STD_SMALL, 0, NULL, 0); nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject (hbmLoad); break; case IDB_STD_LARGE_COLOR: - hbmLoad = LoadBitmapW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDB_STD_LARGE)); + hbmLoad = CreateMappedBitmap (COMCTL32_hModule, + IDB_STD_LARGE, 0, NULL, 0); nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject (hbmLoad); break; case IDB_VIEW_SMALL_COLOR: - hbmLoad = LoadBitmapW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDB_VIEW_SMALL)); + hbmLoad = CreateMappedBitmap (COMCTL32_hModule, + IDB_VIEW_SMALL, 0, NULL, 0); nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject (hbmLoad); break; case IDB_VIEW_LARGE_COLOR: - hbmLoad = LoadBitmapW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDB_VIEW_LARGE)); + hbmLoad = CreateMappedBitmap (COMCTL32_hModule, + IDB_VIEW_LARGE, 0, NULL, 0); nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject (hbmLoad); break; case IDB_HIST_SMALL_COLOR: - hbmLoad = LoadBitmapW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDB_HIST_SMALL)); + hbmLoad = CreateMappedBitmap (COMCTL32_hModule, + IDB_HIST_SMALL, 0, NULL, 0); nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject (hbmLoad); break; case IDB_HIST_LARGE_COLOR: - hbmLoad = LoadBitmapW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDB_HIST_LARGE)); + hbmLoad = CreateMappedBitmap (COMCTL32_hModule, + IDB_HIST_LARGE, 0, NULL, 0); nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject (hbmLoad); @@ -2744,7 +2744,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wPa } else { - hbmLoad = LoadBitmapW (lpAddBmp->hInst, (LPWSTR)lpAddBmp->nID); + hbmLoad = CreateMappedBitmap(lpAddBmp->hInst, lpAddBmp->nID, 0, NULL, 0); nIndex = ImageList_AddMasked (himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject (hbmLoad); }

1 0