April 2007 - Wine-commits - list.winehq.org

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: bd51f1c98f0d8a9fa7836ebab354ad08a93524e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd51f1c98f0d8a9fa7836ebab… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 31 17:44:05 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/rebar.c | 110 ++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd51f1c98f0d8a9fa7836…

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: abf4d3b8cd8a12cb83a3fbcb42c90a91048c783d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf4d3b8cd8a12cb83a3fbcb4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 31 17:43:35 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/header.c | 6 +++--- dlls/comctl32/pager.c | 28 ++++++++++++++-------------- dlls/comctl32/progress.c | 8 ++++---- dlls/comctl32/propsheet.c | 18 +++++++++--------- 4 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=abf4d3b8cd8a12cb83a3f…

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 9a76763c901e17b3ca54e14842f6a5b631ce6cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a76763c901e17b3ca54e1484… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Mar 31 17:42:01 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/animate.c | 6 +++--- dlls/comctl32/comctl32undoc.c | 2 +- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/datetime.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index a0f390f..9f9151d 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -93,7 +93,7 @@ typedef struct #define ANIMATE_COLOR_NONE 0xffffffff -static void ANIMATE_Notify(ANIMATE_INFO *infoPtr, UINT notif) +static void ANIMATE_Notify(const ANIMATE_INFO *infoPtr, UINT notif) { SendMessageW(infoPtr->hwndNotify, WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(infoPtr->hwndSelf), notif), @@ -772,7 +772,7 @@ static BOOL ANIMATE_Stop(ANIMATE_INFO *infoPtr) } -static BOOL ANIMATE_Create(HWND hWnd, LPCREATESTRUCTW lpcs) +static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs) { static const WCHAR msvfw32W[] = { 'm', 's', 'v', 'f', 'w', '3', '2', '.', 'd', 'l', 'l', 0 }; ANIMATE_INFO *infoPtr; @@ -843,7 +843,7 @@ static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc) } -static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, LPSTYLESTRUCT lpss) +static LRESULT ANIMATE_StyleChanged(ANIMATE_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { TRACE("(styletype=%x, styleOld=0x%08x, styleNew=0x%08x)\n", wStyleType, lpss->styleOld, lpss->styleNew); diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index e2b2a7a..d17436f 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -1019,7 +1019,7 @@ typedef struct tagNOTIFYDATA * DoNotify [Internal] */ -static LRESULT DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr) +static LRESULT DoNotify (const NOTIFYDATA *lpNotify, UINT uCode, LPNMHDR lpHdr) { NMHDR nmhdr; LPNMHDR lpNmh = NULL; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index bd0563f..a5796f3 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1490,7 +1490,7 @@ static inline int IsDelimiter(WCHAR c) return FALSE; } -static int CALLBACK PathWordBreakProc(LPWSTR lpch, int ichCurrent, int cch, int code) +static int CALLBACK PathWordBreakProc(LPCWSTR lpch, int ichCurrent, int cch, int code) { if (code == WB_ISDELIMITER) return IsDelimiter(lpch[ichCurrent]); diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index faa1f72..4cc124d 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -137,7 +137,7 @@ static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1,-1}; static DWORD -DATETIME_GetSystemTime (DATETIME_INFO *infoPtr, SYSTEMTIME *lprgSysTimeArray) +DATETIME_GetSystemTime (const DATETIME_INFO *infoPtr, SYSTEMTIME *lprgSysTimeArray) { if (!lprgSysTimeArray) return GDT_NONE;

1 0

Rolf Kalbermatter : notepad: Fix a possible rounding error when storing the font point size to the registry .
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: a07e9c6933dc0b57d626c36fabe084e6d538b303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07e9c6933dc0b57d626c36fa… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Sun Apr 1 16:23:31 2007 +0200 notepad: Fix a possible rounding error when storing the font point size to the registry. --- programs/notepad/main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 0f5d3d2..6bd6ed8 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -144,7 +144,8 @@ static VOID NOTEPAD_SaveSettingToRegistry(void) SET_NOTEPAD_REG(hkey, value_iMarginRight, Globals.iMarginRight); #undef SET_NOTEPAD_REG - data = (DWORD)(abs(Globals.lfFont.lfHeight) * 72 / get_dpi() * 10); /* method of native notepad.exe */ + /* Store the current value as 10 * twips */ + data = MulDiv(abs(Globals.lfFont.lfHeight), 720 , get_dpi()); RegSetValueEx(hkey, value_iPointSize, 0, REG_DWORD, (LPBYTE)&data, sizeof(DWORD)); RegSetValueEx(hkey, value_lfFaceName, 0, REG_SZ, (LPBYTE)&Globals.lfFont.lfFaceName, @@ -239,7 +240,8 @@ static VOID NOTEPAD_LoadSettingFromRegistry(void) size = sizeof(DWORD); if(RegQueryValueEx(hkey, value_iPointSize, 0, &type, (LPBYTE)&data, &size) == ERROR_SUCCESS) if(type == REG_DWORD) - Globals.lfFont.lfHeight = (LONG)(-abs(data / 10 * get_dpi() / 72)); /* method of native notepad.exe */ + /* The value is stored as 10 * twips */ + Globals.lfFont.lfHeight = -MulDiv(abs(data), get_dpi(), 720); size = sizeof(Globals.lfFont.lfFaceName); if(RegQueryValueEx(hkey, value_lfFaceName, 0, &type, (LPBYTE)&data_helper, &size) == ERROR_SUCCESS)

1 0

Rolf Kalbermatter : notepad: Implement handling of page setup dialog parameters.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 3cae920399731ee7312ecaadf080a215900f756b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cae920399731ee7312ecaadf… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Sun Apr 1 20:52:08 2007 +0200 notepad: Implement handling of page setup dialog parameters. --- programs/notepad/Bg.rc | 20 +++++++---------- programs/notepad/Cs.rc | 20 +++++++---------- programs/notepad/Da.rc | 20 +++++++---------- programs/notepad/De.rc | 22 ++++++++----------- programs/notepad/En.rc | 22 ++++++++----------- programs/notepad/Eo.rc | 20 +++++++---------- programs/notepad/Es.rc | 22 ++++++++----------- programs/notepad/Fi.rc | 20 +++++++---------- programs/notepad/Fr.rc | 24 +++++++++------------ programs/notepad/Hu.rc | 20 +++++++---------- programs/notepad/It.rc | 20 +++++++---------- programs/notepad/Ja.rc | 20 +++++++---------- programs/notepad/Ko.rc | 20 +++++++---------- programs/notepad/Nl.rc | 22 ++++++++----------- programs/notepad/No.rc | 22 ++++++++----------- programs/notepad/Pl.rc | 20 +++++++---------- programs/notepad/Pt.rc | 30 ++++++++++----------------- programs/notepad/Ru.rc | 20 +++++++---------- programs/notepad/Si.rc | 20 +++++++---------- programs/notepad/Sk.rc | 20 +++++++---------- programs/notepad/Sw.rc | 20 +++++++---------- programs/notepad/Th.rc | 20 +++++++---------- programs/notepad/Tr.rc | 20 +++++++---------- programs/notepad/Wa.rc | 20 +++++++---------- programs/notepad/Zh.rc | 20 +++++++---------- programs/notepad/dialog.c | 25 +++++++++++---------- programs/notepad/main.c | 44 +++++++++++++++++++++++++++++++++++++-- programs/notepad/main.h | 8 +++--- programs/notepad/notepad_res.h | 12 +++++++--- 29 files changed, 276 insertions(+), 337 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cae920399731ee7312ec…

1 0

Rob Shearman : advpack: Call OleInitialize before registering OCXs, like native does.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: 5275b1b85fb4c21db0e69e48a359a0d89dcb4029 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5275b1b85fb4c21db0e69e48a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 1 13:44:18 2007 +0100 advpack: Call OleInitialize before registering OCXs, like native does. --- dlls/advpack/Makefile.in | 2 +- dlls/advpack/install.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in index c7a206c..88029d3 100644 --- a/dlls/advpack/Makefile.in +++ b/dlls/advpack/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = advpack.dll IMPORTLIB = libadvpack.$(IMPLIBEXT) -IMPORTS = setupapi version user32 advapi32 kernel32 ntdll +IMPORTS = ole32 setupapi version user32 advapi32 kernel32 ntdll C_SRCS = \ advpack.c \ diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 1209ea8..ed0660b 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -30,6 +30,7 @@ #include "winnls.h" #include "setupapi.h" #include "advpub.h" +#include "ole2.h" #include "wine/debug.h" #include "wine/unicode.h" #include "advpack_private.h" @@ -350,8 +351,10 @@ static HRESULT adv_install(ADVInfo *info) if (hr != S_OK) return hr; + OleInitialize(NULL); hr = iterate_section_fields(info->hinf, info->install_sec, RegisterOCXs, register_ocxs_callback, NULL); + OleUninitialize(); if (hr != S_OK) return hr;

1 0

Rob Shearman : advpack: Stop processing if there was an error registering an OCX.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: f170f5d8d3c06974ba8ad921e31cc10f9bd90111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f170f5d8d3c06974ba8ad921e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 1 13:45:00 2007 +0100 advpack: Stop processing if there was an error registering an OCX. --- dlls/advpack/install.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index ed0660b..3f1b1dd 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -160,13 +160,21 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, void *arg) continue; hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - if (!hm) - continue; + if (hm) + { + if (do_ocx_reg(hm, TRUE)) + hr = E_FAIL; - if (do_ocx_reg(hm, TRUE)) + FreeLibrary(hm); + } + else hr = E_FAIL; - FreeLibrary(hm); + if (FAILED(hr)) + { + /* FIXME: display a message box */ + break; + } } return hr;

1 0

Rob Shearman : urlmon: Fix a reference count leak that would keep the module alive when it shouldn 't.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: fd8868bac453bf4f25aa40ceca66ce1e3d36f509 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8868bac453bf4f25aa40cec… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Apr 1 13:43:39 2007 +0100 urlmon: Fix a reference count leak that would keep the module alive when it shouldn't. --- dlls/urlmon/urlmon_main.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 3d29feb..0f12011 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -220,11 +220,19 @@ static void init_session(BOOL init) for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { if(object_creation[i].protocol) { if(init) + { IInternetSession_RegisterNameSpace(session, object_creation[i].cf, object_creation[i].clsid, object_creation[i].protocol, 0, NULL, 0); + /* make sure that the AddRef on the class factory doesn't keep us loaded */ + URLMON_UnlockModule(); + } else + { + /* make sure that the Release on the class factory doesn't unload us */ + URLMON_LockModule(); IInternetSession_UnregisterNameSpace(session, object_creation[i].cf, object_creation[i].protocol); + } } }

1 0

Dmitry Timoshkov : kernel32: Add GetCPInfo test.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: bae3dc49cc7c5d1da185a26a322ac3b90b7499b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae3dc49cc7c5d1da185a26a3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Apr 1 20:16:42 2007 +0900 kernel32: Add GetCPInfo test. --- dlls/kernel32/tests/locale.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b22659b..08f4982 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2225,13 +2225,42 @@ static void test_EnumTimeFormatsA(void) ok(!lstrcmpA(date_fmt_buf, buf), "expected \"%s\" got \"%s\"\n", date_fmt_buf, buf); } +static void test_GetCPInfo(void) +{ + BOOL ret; + CPINFO cpinfo; + + SetLastError(0xdeadbeef); + ret = GetCPInfo(CP_SYMBOL, &cpinfo); + ok(!ret, "GetCPInfo(CP_SYMBOL) should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetCPInfo(CP_UTF7, &cpinfo); + ok(ret, "GetCPInfo(CP_UTF7) error %u\n", GetLastError()); + ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); + ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); + ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); + ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); + + SetLastError(0xdeadbeef); + ret = GetCPInfo(CP_UTF8, &cpinfo); + ok(ret, "GetCPInfo(CP_UTF8) error %u\n", GetLastError()); + ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); + ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); + ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); + ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + ok(cpinfo.MaxCharSize == 4, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); +} + START_TEST(locale) { InitFunctionPointers(); test_EnumTimeFormatsA(); test_EnumDateFormatsA(); - test_GetLocaleInfoA(); test_GetTimeFormatA(); test_GetDateFormatA(); @@ -2248,7 +2277,7 @@ START_TEST(locale) test_EnumLanguageGroupLocalesA(); test_SetLocaleInfoA(); test_EnumUILanguageA(); - + test_GetCPInfo(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Dmitry Timoshkov : gdi32: Make GetKerningPairsA not fail for fonts with SYMBOL charset.
by Alexandre Julliard 02 Apr '07

02 Apr '07

Module: wine Branch: master Commit: bc4bbb40d16558ea22bb2b90799a71ce2a4faef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4bbb40d16558ea22bb2b907… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Apr 1 20:17:33 2007 +0900 gdi32: Make GetKerningPairsA not fail for fonts with SYMBOL charset. --- dlls/gdi32/font.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ea2e66c..263454d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2662,7 +2662,11 @@ DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs, FIXME("Can't find codepage for charset %d\n", charset); return 0; } - if (!GetCPInfo(csi.ciACP, &cpi)) + /* GetCPInfo() will fail on CP_SYMBOL, and WideCharToMultiByte is supposed + * to fail on an invalid character for CP_SYMBOL. + */ + cpi.DefaultChar[0] = 0; + if (csi.ciACP != CP_SYMBOL && !GetCPInfo(csi.ciACP, &cpi)) { FIXME("Can't find codepage %u info\n", csi.ciACP); return 0;

1 0