wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Francois Gouget : windowscodecs: Make the QueryInterface() functions static .
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 97df1e12e6d128a916ba733b4fc3ebf521c920f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97df1e12e6d128a916ba733b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 30 10:22:52 2009 +0200 windowscodecs: Make the QueryInterface() functions static. --- dlls/windowscodecs/bmpdecode.c | 4 ++-- dlls/windowscodecs/imgfactory.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c index afe4881..e2378ba 100644 --- a/dlls/windowscodecs/bmpdecode.c +++ b/dlls/windowscodecs/bmpdecode.c @@ -66,7 +66,7 @@ typedef struct { BITMAPV5HEADER bih; } BmpFrameDecode; -HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, +static HRESULT WINAPI BmpFrameDecode_QueryInterface(IWICBitmapFrameDecode *iface, REFIID iid, void **ppv) { BmpFrameDecode *This = (BmpFrameDecode*)iface; @@ -274,7 +274,7 @@ static HRESULT BmpDecoder_ReadHeaders(BmpDecoder* This, IStream *stream) return S_OK; } -HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, +static HRESULT WINAPI BmpDecoder_QueryInterface(IWICBitmapDecoder *iface, REFIID iid, void **ppv) { BmpDecoder *This = (BmpDecoder*)iface; diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index f422a8a..5856661 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -39,7 +39,7 @@ typedef struct { LONG ref; } ImagingFactory; -HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory *iface, REFIID iid, +static HRESULT WINAPI ImagingFactory_QueryInterface(IWICImagingFactory *iface, REFIID iid, void **ppv) { ImagingFactory *This = (ImagingFactory*)iface;

1 0

Vitaliy Margolen : dxdiagn: Use quartz' s IFilterMapper to get DirectShow filter information instead of looking through private structures .
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 27072f296f6770a4fe2407c8aefefe5b25d0b5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=27072f296f6770a4fe2407c8a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jun 29 22:06:30 2009 -0600 dxdiagn: Use quartz's IFilterMapper to get DirectShow filter information instead of looking through private structures. --- dlls/dxdiagn/provider.c | 119 +++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 60 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index d3f0a26..fb13033 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -23,6 +23,7 @@ #define COBJMACROS #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "dxdiag_private.h" #include "wine/unicode.h" #include "winver.h" @@ -33,6 +34,9 @@ #include "mmddk.h" #include "ddraw.h" #include "d3d9.h" +#include "strmif.h" +#include "initguid.h" +#include "fil_data.h" #include "wine/debug.h" @@ -572,28 +576,6 @@ static HRESULT DXDiag_InitDXDiagDirectPlayContainer(IDxDiagContainer* pSubCont) return hr; } -struct REG_RF { - DWORD dwVersion; - DWORD dwMerit; - DWORD dwPins; - DWORD dwUnused; -}; -struct REG_RFP { - BYTE signature[4]; /* e.g. "0pi3" */ - DWORD dwFlags; - DWORD dwInstances; - DWORD dwMediaTypes; - DWORD dwMediums; - DWORD bCategory; /* is there a category clsid? */ - /* optional: dwOffsetCategoryClsid */ -}; -struct REG_TYPE { - BYTE signature[4]; /* e.g. "0ty3" */ - DWORD dwUnused; - DWORD dwOffsetMajor; - DWORD dwOffsetMinor; -}; - static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont) { HRESULT hr = S_OK; static const WCHAR szName[] = {'s','z','N','a','m','e',0}; @@ -603,7 +585,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; static const WCHAR dwInputs[] = {'d','w','I','n','p','u','t','s',0}; static const WCHAR dwOutputs[] = {'d','w','O','u','t','p','u','t','s',0}; - static const WCHAR dwMerit[] = {'d','w','M','e','r','i','t',0}; + static const WCHAR dwMeritW[] = {'d','w','M','e','r','i','t',0}; /* static const WCHAR szFileName[] = {'s','z','F','i','l','e','N','a','m','e',0}; static const WCHAR szFileVersion[] = {'s','z','F','i','l','e','V','e','r','s','i','o','n',0}; @@ -672,13 +654,13 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (void**) &pPropFilterBag); if (SUCCEEDED(hr)) { LPBYTE pData = NULL; - LPBYTE pCurrent = NULL; - struct REG_RF* prrf = NULL; - DWORD it; DWORD dwNOutputs = 0; DWORD dwNInputs = 0; + DWORD dwMerit = 0; WCHAR bufferW[10]; IDxDiagContainer *pDShowSubCont = NULL; + IFilterMapper2 *pFileMapper = NULL; + IAMFilterData *pFilterData = NULL; snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); if (FAILED(DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, (void**) &pDShowSubCont)) || @@ -689,6 +671,7 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu continue; } + bufferW[0] = 0; hr = IPropertyBag_Read(pPropFilterBag, wszFriendlyName, &v, 0); hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, szName, &v); TRACE("\tName:%s\n", debugstr_w(V_BSTR(&v))); @@ -699,45 +682,61 @@ static HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSu hr = IDxDiagContainerImpl_AddProp(pDShowSubCont, ClsidFilterW, &v); VariantClear(&v); - add_prop_str(pDShowSubCont, szCatName, wszCatName); - add_prop_str(pDShowSubCont, ClsidCatW, wszCatClsid); - - hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL); - hr = SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData); - prrf = (struct REG_RF*) pData; - pCurrent = pData; + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, + (LPVOID*)&pFileMapper); + if (SUCCEEDED(hr) && + SUCCEEDED(IFilterMapper2_QueryInterface(pFileMapper, &IID_IAMFilterData, (void **)&pFilterData))) + { + DWORD array_size; + BYTE *tmp; + REGFILTER2 *pRF = NULL; + + if (SUCCEEDED(IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL)) && + SUCCEEDED(SafeArrayAccessData(V_UNION(&v, parray), (LPVOID*) &pData))) + { + ULONG j; + array_size = V_UNION(&v, parray)->rgsabound->cElements; + + if (SUCCEEDED(IAMFilterData_ParseFilterData(pFilterData, pData, array_size, &tmp))) + { + pRF = ((REGFILTER2 **)tmp)[0]; + + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); + if (pRF->dwVersion == 1) + { + for (j = 0; j < pRF->u.s.cPins; j++) + if (pRF->u.s.rgPins[j].bOutput) + dwNOutputs++; + else + dwNInputs++; + } + else if (pRF->dwVersion == 2) + { + for (j = 0; j < pRF->u.s1.cPins2; j++) + if (pRF->u.s1.rgPins2[j].dwFlags & REG_PINFLAG_B_OUTPUT) + dwNOutputs++; + else + dwNInputs++; + } + + dwMerit = pRF->dwMerit; + CoTaskMemFree(tmp); + } + + SafeArrayUnaccessData(V_UNION(&v, parray)); + VariantClear(&v); + } + IFilterMapper2_Release(pFilterData); + } + if (pFileMapper) IFilterMapper2_Release(pFileMapper); - snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, prrf->dwVersion); add_prop_str(pDShowSubCont, szVersionW, bufferW); - - pCurrent += sizeof(struct REG_RF); - for (it = 0; it < prrf->dwPins; ++it) { - struct REG_RFP* prrfp = (struct REG_RFP*) pCurrent; - UINT j; - - if (prrfp->dwFlags & REG_PINFLAG_B_OUTPUT) ++dwNOutputs; - else ++dwNInputs; - - pCurrent += sizeof(struct REG_RFP); - if (prrfp->bCategory) { - pCurrent += sizeof(DWORD); - } - for (j = 0; j < prrfp->dwMediaTypes; ++j) { - struct REG_TYPE* prt = (struct REG_TYPE *)pCurrent; - pCurrent += sizeof(*prt); - } - for (j = 0; j < prrfp->dwMediums; ++j) { - DWORD dwOffset = *(DWORD*) pCurrent; - pCurrent += sizeof(dwOffset); - } - } - + add_prop_str(pDShowSubCont, szCatName, wszCatName); + add_prop_str(pDShowSubCont, ClsidCatW, wszCatClsid); add_prop_ui4(pDShowSubCont, dwInputs, dwNInputs); add_prop_ui4(pDShowSubCont, dwOutputs, dwNOutputs); - add_prop_ui4(pDShowSubCont, dwMerit, prrf->dwMerit); + add_prop_ui4(pDShowSubCont, dwMeritW, dwMerit); - SafeArrayUnaccessData(V_UNION(&v, parray)); - VariantClear(&v); i++; } IPropertyBag_Release(pPropFilterBag); pPropFilterBag = NULL;

1 0

Vitaliy Margolen : dxdiagn: Add fil_data. idl to describe IAMFilterData interface.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 516aac77aa3af8a9b782e820372eb5bafd7e41ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=516aac77aa3af8a9b782e8203… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jun 29 22:06:04 2009 -0600 dxdiagn: Add fil_data.idl to describe IAMFilterData interface. --- .gitignore | 1 + dlls/dxdiagn/Makefile.in | 2 ++ dlls/dxdiagn/fil_data.idl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index a47a096..f096f4a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h dlls/commdlg.dll16 +dlls/dxdiagn/fil_data.h dlls/gdi.exe16 dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index 56ca656..c69df4e 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -13,6 +13,8 @@ C_SRCS = \ RC_SRCS = version.rc +IDL_H_SRCS = fil_data.idl + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dxdiagn/fil_data.idl b/dlls/dxdiagn/fil_data.idl new file mode 100644 index 0000000..806c053 --- /dev/null +++ b/dlls/dxdiagn/fil_data.idl @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * 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 + */ + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +}

1 0

Rein Klazes : comdlg32: Fix a problem with the returned value of a CDN_FILEOK notification.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: ce856684169608139307ec4c8f9407687133482c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce856684169608139307ec4c8… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Jun 30 08:41:10 2009 +0200 comdlg32: Fix a problem with the returned value of a CDN_FILEOK notification. --- dlls/comdlg32/filedlg.c | 8 ++-- dlls/comdlg32/tests/filedlg.c | 112 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6e7f985..6f89697 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1760,19 +1760,19 @@ static BOOL FILEDLG95_SendFileOK( HWND hwnd, FileOpenDlgInfos *fodInfos ) /* First send CDN_FILEOK as MSDN doc says */ if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) retval = SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK); - if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) + if( retval) { TRACE("canceled\n"); - return (retval == 0); + return FALSE; } /* fodInfos->ofnInfos points to an ASCII or UNICODE structure as appropriate */ retval = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg, fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos); - if (GetWindowLongPtrW(fodInfos->DlgInfos.hwndCustomDlg, DWLP_MSGRESULT)) + if( retval) { TRACE("canceled\n"); - return (retval == 0); + return FALSE; } } return TRUE; diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 0cd1e63..0b1561e 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -399,10 +399,122 @@ static void test_resize(void) } } +/* test cases for control message IDOK */ +/* Show case for bug #19079 */ +static struct { + int retval; /* return code of the message handler */ + BOOL setmsgresult; /* set the result in the DWLP_MSGRESULT */ + BOOL usemsgokstr; /* use the FILEOKSTRING message instead of WM_NOTIFY:CDN_FILEOK */ + BOOL do_subclass; /* subclass the dialog hook procedure */ + BOOL expclose; /* is the dialog expected to close ? */ + BOOL actclose; /* has the dialog actually closed ? */ +} ok_testcases[] = { + { 0, FALSE, FALSE, FALSE, TRUE}, + { 0, TRUE, FALSE, FALSE, TRUE}, + { 0, FALSE, FALSE, TRUE, TRUE}, + { 0, TRUE, FALSE, TRUE, TRUE}, + { 1, FALSE, FALSE, FALSE, TRUE}, + { 1, TRUE, FALSE, FALSE, FALSE}, + { 1, FALSE, FALSE, TRUE, FALSE}, + { 1, TRUE, FALSE, TRUE, FALSE}, + /* FILEOKSTRING tests */ + { 1, TRUE, TRUE, FALSE, FALSE}, + { 1, FALSE, TRUE, TRUE, FALSE}, + /* mark the end */ + { -1 } +}; + +/* test_ok_wndproc can be used as hook procedure or a subclass + * window proc for the file dialog */ +static LONG_PTR WINAPI test_ok_wndproc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + HWND parent = GetParent( dlg); + static int index; + static UINT msgFILEOKSTRING; + if (msg == WM_INITDIALOG) + { + index = ((OPENFILENAME*)lParam)->lCustData; + ok_testcases[index].actclose = TRUE; + msgFILEOKSTRING = RegisterWindowMessageA( FILEOKSTRING); + } + if( msg == WM_NOTIFY) { + if(((LPNMHDR)lParam)->code == CDN_INITDONE) { + SetTimer( dlg, 0, 100, 0); + PostMessage( parent, WM_COMMAND, IDOK, 0); + return FALSE; + } else if(((LPNMHDR)lParam)->code == CDN_FILEOK) { + if( ok_testcases[index].usemsgokstr) + return FALSE; + if( ok_testcases[index].setmsgresult) + SetWindowLongPtrA( dlg, DWLP_MSGRESULT, ok_testcases[index].retval); + return ok_testcases[index].retval; + } + } + if( msg == msgFILEOKSTRING) { + if( !ok_testcases[index].usemsgokstr) + return FALSE; + if( ok_testcases[index].setmsgresult) + SetWindowLongPtrA( dlg, DWLP_MSGRESULT, ok_testcases[index].retval); + return ok_testcases[index].retval; + } + if( msg == WM_TIMER) { + /* the dialog did not close automatically */ + ok_testcases[index].actclose = FALSE; + KillTimer( dlg, 0); + PostMessage( parent, WM_COMMAND, IDCANCEL, 0); + return FALSE; + } + if( ok_testcases[index].do_subclass) + return DefWindowProc( dlg, msg, wParam, lParam); + return FALSE; +} + +static LONG_PTR WINAPI ok_template_hook(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == WM_SETFONT) + SetWindowLongPtrA( dlg, GWLP_WNDPROC, (LONG_PTR) test_ok_wndproc); + return FALSE; +} + +static void test_ok(void) +{ + OPENFILENAME ofn = { sizeof(OPENFILENAME)}; + char filename[1024] = {0}; + char tmpfilename[ MAX_PATH]; + int i; + DWORD ret; + + if (!GetTempFileNameA(".", "tmp", 0, tmpfilename)) { + skip("Failed to create a temporary file name\n"); + return; + } + ofn.lpstrFile = filename; + ofn.nMaxFile = 1024; + ofn.hInstance = GetModuleHandle(NULL); + ofn.lpTemplateName = "template1"; + ofn.Flags = OFN_ENABLEHOOK | OFN_EXPLORER| OFN_ENABLETEMPLATE ; + for( i = 0; ok_testcases[i].retval != -1; i++) { + strcpy( filename, tmpfilename); + ofn.lCustData = i; + ofn.lpfnHook = ok_testcases[i].do_subclass + ? (LPOFNHOOKPROC) ok_template_hook + : (LPOFNHOOKPROC) test_ok_wndproc; + ret = GetOpenFileNameA(&ofn); + ok( ok_testcases[i].expclose == ok_testcases[i].actclose, + "Open File dialog should %shave closed.\n", + ok_testcases[i].expclose ? "" : "NOT "); + ok(ret == ok_testcases[i].expclose, "GetOpenFileName returned %#x\n", ret); + ret = CommDlgExtendedError(); + ok(!ret, "CommDlgExtendedError returned %#x\n", ret); + } + ok( DeleteFileA( tmpfilename), "Failed to delete temporary file\n"); +} + START_TEST(filedlg) { test_DialogCancel(); test_create_view_window2(); test_create_view_template(); test_resize(); + test_ok(); }

1 0

Michael Stefaniuc : crypt32: Build language resource files separately.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 01366a6b415eb185d0410da550c1fe65808e2780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01366a6b415eb185d0410da55… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 11:14:26 2009 +0200 crypt32: Build language resource files separately. Instead of including them from an other rc file. --- dlls/crypt32/Makefile.in | 12 +++++++++++- dlls/crypt32/crypt32.rc | 35 ----------------------------------- dlls/crypt32/crypt32_De.rc | 4 ++-- dlls/crypt32/crypt32_En.rc | 2 ++ dlls/crypt32/crypt32_Fr.rc | 2 ++ dlls/crypt32/crypt32_Ko.rc | 2 ++ dlls/crypt32/crypt32_Nl.rc | 2 ++ dlls/crypt32/crypt32_No.rc | 2 ++ dlls/crypt32/crypt32_Pt.rc | 2 ++ dlls/crypt32/crypt32_Ro.rc | 4 ++-- dlls/crypt32/crypt32_Sv.rc | 5 +++-- dlls/crypt32/cryptres.h | 2 ++ 12 files changed, 32 insertions(+), 42 deletions(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 10ffda9..695bc75 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -33,7 +33,17 @@ C_SRCS = \ store.c \ str.c -RC_SRCS = crypt32.rc +RC_SRCS = \ + crypt32_De.rc \ + crypt32_En.rc \ + crypt32_Fr.rc \ + crypt32_Ko.rc \ + crypt32_Nl.rc \ + crypt32_No.rc \ + crypt32_Pt.rc \ + crypt32_Ro.rc \ + crypt32_Sv.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/crypt32/crypt32.rc b/dlls/crypt32/crypt32.rc deleted file mode 100644 index c51174b..0000000 --- a/dlls/crypt32/crypt32.rc +++ /dev/null @@ -1,35 +0,0 @@ -/* - * crypt32 dll resources - * - * Copyright (C) 2006 Juan Lang - * - * 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 "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "cryptres.h" - -#include "version.rc" - -#include "crypt32_De.rc" -#include "crypt32_En.rc" -#include "crypt32_Fr.rc" -#include "crypt32_Ko.rc" -#include "crypt32_Nl.rc" -#include "crypt32_No.rc" -#include "crypt32_Pt.rc" -#include "crypt32_Ro.rc" -#include "crypt32_Sv.rc" diff --git a/dlls/crypt32/crypt32_De.rc b/dlls/crypt32/crypt32_De.rc index 1d9cbb7..0a8bd38 100644 --- a/dlls/crypt32/crypt32_De.rc +++ b/dlls/crypt32/crypt32_De.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -239,5 +241,3 @@ STRINGTABLE DISCARDABLE IDS_NETSCAPE_SMIME_CA "S/MIME Zertifikationsautorität" IDS_NETSCAPE_SIGN_CA "Zertifikationsautorität der Signatur" } - -#pragma code_page(default) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index e24ce86..4670029 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Fr.rc b/dlls/crypt32/crypt32_Fr.rc index 35ade1e..e6f57fc 100644 --- a/dlls/crypt32/crypt32_Fr.rc +++ b/dlls/crypt32/crypt32_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index 51e3fc3..1a05353 100644 --- a/dlls/crypt32/crypt32_Ko.rc +++ b/dlls/crypt32/crypt32_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index 70ea2ba..e12d25d 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_No.rc b/dlls/crypt32/crypt32_No.rc index 18de84b..2665286 100644 --- a/dlls/crypt32/crypt32_No.rc +++ b/dlls/crypt32/crypt32_No.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Pt.rc b/dlls/crypt32/crypt32_Pt.rc index 424f8ea..5c5d3b7 100644 --- a/dlls/crypt32/crypt32_Pt.rc +++ b/dlls/crypt32/crypt32_Pt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/crypt32/crypt32_Ro.rc b/dlls/crypt32/crypt32_Ro.rc index 6c02f5c..65d1c1e 100644 --- a/dlls/crypt32/crypt32_Ro.rc +++ b/dlls/crypt32/crypt32_Ro.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "cryptres.h" + /* UTF-8 */ #pragma code_page(65001) @@ -239,5 +241,3 @@ STRINGTABLE DISCARDABLE IDS_NETSCAPE_SMIME_CA "S/MIME CA" IDS_NETSCAPE_SIGN_CA "Semnătură CA" } - -#pragma code_page(default) diff --git a/dlls/crypt32/crypt32_Sv.rc b/dlls/crypt32/crypt32_Sv.rc index a0e9df5..4a242fe 100644 --- a/dlls/crypt32/crypt32_Sv.rc +++ b/dlls/crypt32/crypt32_Sv.rc @@ -17,6 +17,9 @@ * 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 "cryptres.h" + #pragma code_page(65001) LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -160,5 +163,3 @@ STRINGTABLE DISCARDABLE IDS_FILE_RECOVERY "File Recovery" IDS_ROOT_LIST_SIGNER "Root List Signer" } - -#pragma code_page(default) diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index fe2fd91..f9845be 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -18,6 +18,8 @@ #ifndef __WINE_CRYPTRES_H__ #define __WINE_CRYPTRES_H__ +#include <windef.h> + #define IDS_AUTHORITY_KEY_ID 1000 #define IDS_KEY_ATTRIBUTES 1001 #define IDS_KEY_USAGE_RESTRICTION 1002

1 0

Michael Stefaniuc : oleacc: Build language resource files separately.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: fed054a9ef7416caca514285e99fd712683c91dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed054a9ef7416caca514285e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 11:11:36 2009 +0200 oleacc: Build language resource files separately. Instead of including them from an other rc file. --- dlls/oleacc/Makefile.in | 9 ++++++++- dlls/oleacc/oleacc.rc | 30 ------------------------------ dlls/oleacc/oleacc_De.rc | 2 ++ dlls/oleacc/oleacc_En.rc | 2 ++ dlls/oleacc/oleacc_Fr.rc | 2 ++ dlls/oleacc/oleacc_Ko.rc | 2 ++ dlls/oleacc/oleacc_Lt.rc | 4 ++-- dlls/oleacc/oleacc_Nl.rc | 2 ++ dlls/oleacc/oleacc_Pl.rc | 2 ++ 9 files changed, 22 insertions(+), 33 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 01b03ae..3a2b0b7 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -9,7 +9,14 @@ IMPORTS = user32 kernel32 C_SRCS = \ main.c -RC_SRCS = oleacc.rc +RC_SRCS = \ + oleacc_De.rc \ + oleacc_En.rc \ + oleacc_Fr.rc \ + oleacc_Ko.rc \ + oleacc_Lt.rc \ + oleacc_Nl.rc \ + oleacc_Pl.rc @MAKE_DLL_RULES@ diff --git a/dlls/oleacc/oleacc.rc b/dlls/oleacc/oleacc.rc deleted file mode 100644 index abcd7fb..0000000 --- a/dlls/oleacc/oleacc.rc +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Top level resource file for oleacc - * - * Copyright 2008 Nikolay Sivov - * - * 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 "windef.h" -#include "oleacc.h" - -#include "oleacc_De.rc" -#include "oleacc_En.rc" -#include "oleacc_Fr.rc" -#include "oleacc_Ko.rc" -#include "oleacc_Lt.rc" -#include "oleacc_Nl.rc" -#include "oleacc_Pl.rc" diff --git a/dlls/oleacc/oleacc_De.rc b/dlls/oleacc/oleacc_De.rc index 7d96d2a..f39ff39 100644 --- a/dlls/oleacc/oleacc_De.rc +++ b/dlls/oleacc/oleacc_De.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "oleacc.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleacc/oleacc_En.rc b/dlls/oleacc/oleacc_En.rc index 992d29c..5c1af2d 100644 --- a/dlls/oleacc/oleacc_En.rc +++ b/dlls/oleacc/oleacc_En.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "oleacc.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleacc/oleacc_Fr.rc b/dlls/oleacc/oleacc_Fr.rc index 87bea0b..fbdfa05 100644 --- a/dlls/oleacc/oleacc_Fr.rc +++ b/dlls/oleacc/oleacc_Fr.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "oleacc.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleacc/oleacc_Ko.rc b/dlls/oleacc/oleacc_Ko.rc index a1993f1..919b8d4 100644 --- a/dlls/oleacc/oleacc_Ko.rc +++ b/dlls/oleacc/oleacc_Ko.rc @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "oleacc.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/oleacc/oleacc_Lt.rc b/dlls/oleacc/oleacc_Lt.rc index 5498e84..4056c3d 100644 --- a/dlls/oleacc/oleacc_Lt.rc +++ b/dlls/oleacc/oleacc_Lt.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "oleacc.h" + /* UTF-8 */ #pragma code_page(65001) @@ -91,5 +93,3 @@ STRINGTABLE DISCARDABLE ROLE_SYSTEM_IPADDRESS "IP adresas" ROLE_SYSTEM_OUTLINEBUTTON "plano mygtukas" } - -#pragma code_page(default) diff --git a/dlls/oleacc/oleacc_Nl.rc b/dlls/oleacc/oleacc_Nl.rc index 1dce053..47daa1f 100644 --- a/dlls/oleacc/oleacc_Nl.rc +++ b/dlls/oleacc/oleacc_Nl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "oleacc.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleacc/oleacc_Pl.rc b/dlls/oleacc/oleacc_Pl.rc index fc93cb0..5d45368 100644 --- a/dlls/oleacc/oleacc_Pl.rc +++ b/dlls/oleacc/oleacc_Pl.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "oleacc.h" + LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Michael Stefaniuc : iccvid: Build language resource files separately.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 58d49b42c945dcc1dc2f239d6527a315a80f02fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d49b42c945dcc1dc2f239d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 11:09:31 2009 +0200 iccvid: Build language resource files separately. Instead of including them from an other rc file. --- dlls/iccvid/Makefile.in | 18 +++++++++++++++++- dlls/iccvid/iccvid_Da.rc | 2 ++ dlls/iccvid/iccvid_De.rc | 2 ++ dlls/iccvid/iccvid_En.rc | 2 ++ dlls/iccvid/iccvid_Fr.rc | 2 ++ dlls/iccvid/iccvid_Hu.rc | 2 ++ dlls/iccvid/iccvid_Ko.rc | 2 ++ dlls/iccvid/iccvid_Lt.rc | 4 ++-- dlls/iccvid/iccvid_Nl.rc | 2 ++ dlls/iccvid/iccvid_No.rc | 2 ++ dlls/iccvid/iccvid_Pl.rc | 2 ++ dlls/iccvid/iccvid_Pt.rc | 2 ++ dlls/iccvid/iccvid_Ro.rc | 2 ++ dlls/iccvid/iccvid_Ru.rc | 2 ++ dlls/iccvid/iccvid_Si.rc | 4 ++-- dlls/iccvid/iccvid_Sv.rc | 2 ++ dlls/iccvid/iccvid_Tr.rc | 2 ++ dlls/iccvid/iccvid_private.h | 2 ++ dlls/iccvid/rsrc.rc | 37 ------------------------------------- 19 files changed, 51 insertions(+), 42 deletions(-) diff --git a/dlls/iccvid/Makefile.in b/dlls/iccvid/Makefile.in index c81a913..1a2fd75 100644 --- a/dlls/iccvid/Makefile.in +++ b/dlls/iccvid/Makefile.in @@ -8,7 +8,23 @@ IMPORTS = user32 kernel32 C_SRCS = \ iccvid.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + iccvid_Da.rc \ + iccvid_De.rc \ + iccvid_En.rc \ + iccvid_Fr.rc \ + iccvid_Hu.rc \ + iccvid_Ko.rc \ + iccvid_Lt.rc \ + iccvid_Nl.rc \ + iccvid_No.rc \ + iccvid_Pl.rc \ + iccvid_Pt.rc \ + iccvid_Ro.rc \ + iccvid_Ru.rc \ + iccvid_Si.rc \ + iccvid_Sv.rc \ + iccvid_Tr.rc @MAKE_DLL_RULES@ diff --git a/dlls/iccvid/iccvid_Da.rc b/dlls/iccvid/iccvid_Da.rc index 185b1bb..bbdc03e 100644 --- a/dlls/iccvid/iccvid_Da.rc +++ b/dlls/iccvid/iccvid_Da.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_De.rc b/dlls/iccvid/iccvid_De.rc index c101f3a..3262c91 100644 --- a/dlls/iccvid/iccvid_De.rc +++ b/dlls/iccvid/iccvid_De.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_En.rc b/dlls/iccvid/iccvid_En.rc index c71b0a4..91d848a 100644 --- a/dlls/iccvid/iccvid_En.rc +++ b/dlls/iccvid/iccvid_En.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Fr.rc b/dlls/iccvid/iccvid_Fr.rc index 4d276e6..f3862be 100644 --- a/dlls/iccvid/iccvid_Fr.rc +++ b/dlls/iccvid/iccvid_Fr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Hu.rc b/dlls/iccvid/iccvid_Hu.rc index b24cf8e..69faccd 100644 --- a/dlls/iccvid/iccvid_Hu.rc +++ b/dlls/iccvid/iccvid_Hu.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Ko.rc b/dlls/iccvid/iccvid_Ko.rc index 0cfbe3e..f47eb8c 100644 --- a/dlls/iccvid/iccvid_Ko.rc +++ b/dlls/iccvid/iccvid_Ko.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Lt.rc b/dlls/iccvid/iccvid_Lt.rc index b5157e8..2e31cd3 100644 --- a/dlls/iccvid/iccvid_Lt.rc +++ b/dlls/iccvid/iccvid_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + /* UTF-8 */ #pragma code_page(65001) @@ -26,5 +28,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "Cinepak vaizdo kodekas" IDS_DESCRIPTION "Cinepak vaizdo kodekas" } - -#pragma code_page(default) diff --git a/dlls/iccvid/iccvid_Nl.rc b/dlls/iccvid/iccvid_Nl.rc index 0c58dd1..fbc4024 100644 --- a/dlls/iccvid/iccvid_Nl.rc +++ b/dlls/iccvid/iccvid_Nl.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_No.rc b/dlls/iccvid/iccvid_No.rc index dd64108..4cefc00 100644 --- a/dlls/iccvid/iccvid_No.rc +++ b/dlls/iccvid/iccvid_No.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Pl.rc b/dlls/iccvid/iccvid_Pl.rc index e276e87..0a4c0f5 100644 --- a/dlls/iccvid/iccvid_Pl.rc +++ b/dlls/iccvid/iccvid_Pl.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Pt.rc b/dlls/iccvid/iccvid_Pt.rc index 5e4ad5c..659224f 100644 --- a/dlls/iccvid/iccvid_Pt.rc +++ b/dlls/iccvid/iccvid_Pt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Ro.rc b/dlls/iccvid/iccvid_Ro.rc index 85cb1da..ccd8ef7 100644 --- a/dlls/iccvid/iccvid_Ro.rc +++ b/dlls/iccvid/iccvid_Ro.rc @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Ru.rc b/dlls/iccvid/iccvid_Ru.rc index c78ee72..01bbec0 100644 --- a/dlls/iccvid/iccvid_Ru.rc +++ b/dlls/iccvid/iccvid_Ru.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Si.rc b/dlls/iccvid/iccvid_Si.rc index 82bbd05..9635480 100644 --- a/dlls/iccvid/iccvid_Si.rc +++ b/dlls/iccvid/iccvid_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -25,5 +27,3 @@ STRINGTABLE DISCARDABLE IDS_NAME "Cinepak Video kodek" IDS_DESCRIPTION "Cinepak Video kodek" } - -#pragma code_page(default) diff --git a/dlls/iccvid/iccvid_Sv.rc b/dlls/iccvid/iccvid_Sv.rc index 55eb468..34762d6 100644 --- a/dlls/iccvid/iccvid_Sv.rc +++ b/dlls/iccvid/iccvid_Sv.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_Tr.rc b/dlls/iccvid/iccvid_Tr.rc index 929f44f..8eabf9f 100644 --- a/dlls/iccvid/iccvid_Tr.rc +++ b/dlls/iccvid/iccvid_Tr.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "iccvid_private.h" + LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE diff --git a/dlls/iccvid/iccvid_private.h b/dlls/iccvid/iccvid_private.h index 8400e77..56b082d 100644 --- a/dlls/iccvid/iccvid_private.h +++ b/dlls/iccvid/iccvid_private.h @@ -19,6 +19,8 @@ #ifndef __ICCVID_PRIVATE_H #define __ICCVID_PRIVATE_H +#include <windef.h> + #define IDS_NAME 100 #define IDS_DESCRIPTION 101 diff --git a/dlls/iccvid/rsrc.rc b/dlls/iccvid/rsrc.rc deleted file mode 100644 index 6a1955c..0000000 --- a/dlls/iccvid/rsrc.rc +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2005 Dmitry Timoshkov - * - * 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 "windef.h" -#include "iccvid_private.h" - -#include "iccvid_Da.rc" -#include "iccvid_De.rc" -#include "iccvid_En.rc" -#include "iccvid_Fr.rc" -#include "iccvid_Hu.rc" -#include "iccvid_Ko.rc" -#include "iccvid_Lt.rc" -#include "iccvid_Nl.rc" -#include "iccvid_No.rc" -#include "iccvid_Pl.rc" -#include "iccvid_Pt.rc" -#include "iccvid_Ro.rc" -#include "iccvid_Ru.rc" -#include "iccvid_Si.rc" -#include "iccvid_Sv.rc" -#include "iccvid_Tr.rc"

1 0

Michael Stefaniuc : browseui: Build language resource files separately.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 69411faf4da4a891c4ff4edbfb193ae7dc11ed3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=69411faf4da4a891c4ff4edbf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 01:15:38 2009 +0200 browseui: Build language resource files separately. Instead of including them from an other rc file. --- dlls/browseui/Makefile.in | 19 ++++++++++++++++++- dlls/browseui/resids.h | 4 ++++ dlls/browseui/rsrc.rc | 42 ------------------------------------------ dlls/browseui/rsrc_De.rc | 1 + dlls/browseui/rsrc_En.rc | 1 + dlls/browseui/rsrc_Es.rc | 1 + dlls/browseui/rsrc_Fr.rc | 1 + dlls/browseui/rsrc_Ja.rc | 4 ++-- dlls/browseui/rsrc_Ko.rc | 1 + dlls/browseui/rsrc_Lt.rc | 4 ++-- dlls/browseui/rsrc_Nl.rc | 1 + dlls/browseui/rsrc_No.rc | 1 + dlls/browseui/rsrc_Pl.rc | 1 + dlls/browseui/rsrc_Pt.rc | 1 + dlls/browseui/rsrc_Ro.rc | 3 +-- dlls/browseui/rsrc_Ru.rc | 1 + dlls/browseui/rsrc_Si.rc | 4 ++-- dlls/browseui/rsrc_Sv.rc | 1 + dlls/browseui/rsrc_Zh.rc | 3 +-- 19 files changed, 41 insertions(+), 53 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 845e66a..777a217 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -14,7 +14,24 @@ C_SRCS = \ progressdlg.c \ regsvr.c -RC_SRCS = rsrc.rc +RC_SRCS = \ + rsrc_De.rc \ + rsrc_En.rc \ + rsrc_Es.rc \ + rsrc_Fr.rc \ + rsrc_Ja.rc \ + rsrc_Ko.rc \ + rsrc_Lt.rc \ + rsrc_Nl.rc \ + rsrc_No.rc \ + rsrc_Pl.rc \ + rsrc_Pt.rc \ + rsrc_Ro.rc \ + rsrc_Ru.rc \ + rsrc_Si.rc \ + rsrc_Sv.rc \ + rsrc_Zh.rc \ + version.rc @MAKE_DLL_RULES@ diff --git a/dlls/browseui/resids.h b/dlls/browseui/resids.h index a5b5337..cd44a8e 100644 --- a/dlls/browseui/resids.h +++ b/dlls/browseui/resids.h @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winuser.h" +#include "commctrl.h" + #define IDS_CANCELLING 16 #define IDC_ANIMATION 100 diff --git a/dlls/browseui/rsrc.rc b/dlls/browseui/rsrc.rc deleted file mode 100644 index e593c38..0000000 --- a/dlls/browseui/rsrc.rc +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2007 Mikolaj Zalewski - * - * 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 "windef.h" -#include "winuser.h" -#include "commctrl.h" - -#include "resids.h" - -#include "version.rc" - -#include "rsrc_De.rc" -#include "rsrc_En.rc" -#include "rsrc_Es.rc" -#include "rsrc_Fr.rc" -#include "rsrc_Ja.rc" -#include "rsrc_Ko.rc" -#include "rsrc_Lt.rc" -#include "rsrc_Nl.rc" -#include "rsrc_No.rc" -#include "rsrc_Pl.rc" -#include "rsrc_Pt.rc" -#include "rsrc_Ro.rc" -#include "rsrc_Ru.rc" -#include "rsrc_Si.rc" -#include "rsrc_Sv.rc" -#include "rsrc_Zh.rc" diff --git a/dlls/browseui/rsrc_De.rc b/dlls/browseui/rsrc_De.rc index c5c237f..b32400c 100644 --- a/dlls/browseui/rsrc_De.rc +++ b/dlls/browseui/rsrc_De.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_En.rc b/dlls/browseui/rsrc_En.rc index 1749d1c..c6f597e 100644 --- a/dlls/browseui/rsrc_En.rc +++ b/dlls/browseui/rsrc_En.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Es.rc b/dlls/browseui/rsrc_Es.rc index d1478a8..0fe5d14 100644 --- a/dlls/browseui/rsrc_Es.rc +++ b/dlls/browseui/rsrc_Es.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Fr.rc b/dlls/browseui/rsrc_Fr.rc index 85bca2f..5db8abc 100644 --- a/dlls/browseui/rsrc_Fr.rc +++ b/dlls/browseui/rsrc_Fr.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Ja.rc b/dlls/browseui/rsrc_Ja.rc index ee78414..9274c19 100644 --- a/dlls/browseui/rsrc_Ja.rc +++ b/dlls/browseui/rsrc_Ja.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" + /* UTF-8 */ #pragma code_page(65001) @@ -38,5 +40,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "キャンセル(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Ko.rc b/dlls/browseui/rsrc_Ko.rc index e3d0d6d..c6d4a68 100644 --- a/dlls/browseui/rsrc_Ko.rc +++ b/dlls/browseui/rsrc_Ko.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Lt.rc b/dlls/browseui/rsrc_Lt.rc index 8814534..fabad16 100644 --- a/dlls/browseui/rsrc_Lt.rc +++ b/dlls/browseui/rsrc_Lt.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" + /* UTF-8 */ #pragma code_page(65001) @@ -38,5 +40,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Atsisakyti", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Nl.rc b/dlls/browseui/rsrc_Nl.rc index 06ee906..c15f631 100644 --- a/dlls/browseui/rsrc_Nl.rc +++ b/dlls/browseui/rsrc_Nl.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_No.rc b/dlls/browseui/rsrc_No.rc index 88798cc..dc98076 100644 --- a/dlls/browseui/rsrc_No.rc +++ b/dlls/browseui/rsrc_No.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/dlls/browseui/rsrc_Pl.rc b/dlls/browseui/rsrc_Pl.rc index 1f63890..1677c03 100644 --- a/dlls/browseui/rsrc_Pl.rc +++ b/dlls/browseui/rsrc_Pl.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Pt.rc b/dlls/browseui/rsrc_Pt.rc index a1f446c..fe07405 100644 --- a/dlls/browseui/rsrc_Pt.rc +++ b/dlls/browseui/rsrc_Pt.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Ro.rc b/dlls/browseui/rsrc_Ro.rc index faf3afa..5da07e7 100644 --- a/dlls/browseui/rsrc_Ro.rc +++ b/dlls/browseui/rsrc_Ro.rc @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -39,5 +40,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Renunță", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Ru.rc b/dlls/browseui/rsrc_Ru.rc index bab8e44..40e26f9 100644 --- a/dlls/browseui/rsrc_Ru.rc +++ b/dlls/browseui/rsrc_Ru.rc @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/dlls/browseui/rsrc_Si.rc b/dlls/browseui/rsrc_Si.rc index e4541f7..a4ca2ec 100644 --- a/dlls/browseui/rsrc_Si.rc +++ b/dlls/browseui/rsrc_Si.rc @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" + #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT @@ -37,5 +39,3 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Prekliči", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default) diff --git a/dlls/browseui/rsrc_Sv.rc b/dlls/browseui/rsrc_Sv.rc index 795f737..544d62b 100644 --- a/dlls/browseui/rsrc_Sv.rc +++ b/dlls/browseui/rsrc_Sv.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/dlls/browseui/rsrc_Zh.rc b/dlls/browseui/rsrc_Zh.rc index 92a3e07..52c0672 100644 --- a/dlls/browseui/rsrc_Zh.rc +++ b/dlls/browseui/rsrc_Zh.rc @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "resids.h" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) @@ -61,5 +62,3 @@ FONT 9, "MS Shell Dlg" PUSHBUTTON "取消(&C)", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX } - -#pragma code_page(default)

1 0

Michael Stefaniuc : user32: Remove unreachable code: break after return ( Smatch).
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: e17af8082bb6ba6e12f068f29ff48f2196b7a59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17af8082bb6ba6e12f068f29… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 30 01:15:43 2009 +0200 user32: Remove unreachable code: break after return (Smatch). --- dlls/user32/cursoricon.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 92446e1..48a1a59 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1630,7 +1630,6 @@ static BOOL bitmap_has_alpha_channel( int bpp, unsigned char *bitmapBits, if(bitmapBits[offset] != 0) { return TRUE; - break; } } }

1 0

Nikolay Sivov : comctl32/rebar: Use proper structure size in tests and parameter checks.
by Alexandre Julliard 30 Jun '09

30 Jun '09

Module: wine Branch: master Commit: 9ee5f26570ebd25aa1b5d6a27a043fef3334e2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee5f26570ebd25aa1b5d6a27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jun 29 20:00:16 2009 +0400 comctl32/rebar: Use proper structure size in tests and parameter checks. --- dlls/comctl32/rebar.c | 14 +++++++------- dlls/comctl32/tests/rebar.c | 18 +++++++++--------- include/commctrl.h | 3 +++ 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 8e18e22..e11d974 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1699,11 +1699,11 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || - ( (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) && + ( (lprbbi->cbSize >= REBARBANDINFOA_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) && ( (lpBand->cyChild != lprbbi->cyChild ) || (lpBand->cyMaxChild != lprbbi->cyMaxChild ) || (lpBand->cyIntegral != lprbbi->cyIntegral ) ) ) || - ( (lprbbi->cbSize < sizeof (REBARBANDINFOA)) && + ( (lprbbi->cbSize < REBARBANDINFOA_V6_SIZE) && ( (lpBand->cyChild || lpBand->cyMaxChild || lpBand->cyIntegral ) ) ) ) ) @@ -1711,7 +1711,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->cxMinChild = lprbbi->cxMinChild; lpBand->cyMinChild = lprbbi->cyMinChild; /* These fields where added in WIN32_IE == 0x400 and are set only for RBBS_VARIABLEHEIGHT bands */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { + if (lprbbi->cbSize >= REBARBANDINFOA_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lpBand->cyMaxChild = lprbbi->cyMaxChild; lpBand->cyIntegral = lprbbi->cyIntegral; @@ -1747,7 +1747,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan } /* check for additional data */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) { + if (lprbbi->cbSize >= REBARBANDINFOA_V6_SIZE) { if( (lprbbi->fMask & RBBIM_IDEALSIZE) && ( lpBand->cxIdeal != lprbbi->cxIdeal ) ) { @@ -2167,7 +2167,7 @@ REBAR_GetBandInfoT(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL lprbbi->cyMinChild = lpBand->cyMinChild; /* to make tests pass we follow Windows behaviour and allow to read these fields only * for RBBS_VARIABLEHEIGHTS bands */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { + if (lprbbi->cbSize >= REBARBANDINFOW_V6_SIZE && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lprbbi->cyChild = lpBand->cyChild; lprbbi->cyMaxChild = lpBand->cyMaxChild; lprbbi->cyIntegral = lpBand->cyIntegral; @@ -2184,7 +2184,7 @@ REBAR_GetBandInfoT(const REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL lprbbi->wID = lpBand->wID; /* check for additional data */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) { + if (lprbbi->cbSize >= REBARBANDINFOW_V6_SIZE) { if (lprbbi->fMask & RBBIM_IDEALSIZE) lprbbi->cxIdeal = lpBand->cxIdeal; @@ -2424,7 +2424,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnico REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); /* Make sure the defaults for these are correct */ - if (lprbbi->cbSize < sizeof (REBARBANDINFOA) || !(lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { + if (lprbbi->cbSize < REBARBANDINFOA_V6_SIZE || !(lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { lpBand->cyChild = lpBand->cyMinChild; lpBand->cyMaxChild = 0x7fffffff; lpBand->cyIntegral = 0; diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index c819bc7..2af9ab1 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -150,7 +150,7 @@ static void dump_sizes(HWND hRebar) for (i=0; i<count; i++) { REBARBANDINFO rbi; - rbi.cbSize = sizeof(REBARBANDINFO); + rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE; ok(SendMessageA(hRebar, RB_GETBANDINFOA, i, (LPARAM)&rbi), "RB_GETBANDINFO failed\n"); ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&r), "RB_GETRECT failed\n"); @@ -313,7 +313,7 @@ static int rbsize_numtests = 0; ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&rc) == 1, "RB_GETRECT\n"); \ if (!(res->bands[i].fStyle & RBBS_HIDDEN)) \ check_rect("band", rc, res->bands[i].rc); \ - rbi.cbSize = sizeof(REBARBANDINFO); \ + rbi.cbSize = REBARBANDINFOA_V6_SIZE; \ rbi.fMask = RBBIM_STYLE | RBBIM_SIZE; \ ok(SendMessageA(hRebar, RB_GETBANDINFO, i, (LPARAM)&rbi) == 1, "RB_GETBANDINFO\n"); \ compare(rbi.fStyle, res->bands[i].fStyle, "%x"); \ @@ -329,11 +329,11 @@ static int rbsize_numtests = 0; static void add_band_w(HWND hRebar, LPCSTR lpszText, int cxMinChild, int cx, int cxIdeal) { CHAR buffer[MAX_PATH]; - REBARBANDINFO rbi; + REBARBANDINFOA rbi; if (lpszText != NULL) strcpy(buffer, lpszText); - rbi.cbSize = sizeof(rbi); + rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_IDEALSIZE | RBBIM_TEXT; rbi.cx = cx; rbi.cxMinChild = cxMinChild; @@ -353,7 +353,7 @@ static void layout_test(void) rebuild_rebar(&hRebar); check_sizes(); - rbi.cbSize = sizeof(rbi); + rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; rbi.cx = 200; rbi.cxMinChild = 100; @@ -742,10 +742,10 @@ static void expect_band_content(UINT uBand, INT fStyle, COLORREF clrFore, INT cxHeader) { CHAR buf[MAX_PATH] = "abc"; - REBARBANDINFO rb; + REBARBANDINFOA rb; memset(&rb, 0xdd, sizeof(rb)); - rb.cbSize = sizeof(rb); + rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = RBBIM_BACKGROUND | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_COLORS | RBBIM_HEADERSIZE | RBBIM_ID | RBBIM_IDEALSIZE | RBBIM_IMAGE | RBBIM_LPARAM | RBBIM_SIZE | RBBIM_STYLE | RBBIM_TEXT; @@ -779,7 +779,7 @@ static void bandinfo_test(void) CHAR szABCD[] = "ABCD"; rebuild_rebar(&hRebar); - rb.cbSize = sizeof(REBARBANDINFO); + rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; ok(SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0); @@ -798,7 +798,7 @@ static void bandinfo_test(void) ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 35); - rb.cbSize = sizeof(REBARBANDINFO); + rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; ok(SendMessageA(hRebar, RB_INSERTBANDA, 1, (LPARAM)&rb), "RB_INSERTBAND failed\n"); expect_band_content(1, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 9); diff --git a/include/commctrl.h b/include/commctrl.h index beecb52..8673ba9 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2031,6 +2031,9 @@ typedef REBARBANDINFOW const *LPCREBARBANDINFOW; #define REBARBANDINFOA_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA, wID) #define REBARBANDINFOW_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, wID) #define REBARBANDINFO_V3_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(REBARBANDINFO), wID) +#define REBARBANDINFOA_V6_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA, cxHeader) +#define REBARBANDINFOW_V6_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, cxHeader) +#define REBARBANDINFO_V6_SIZE CCSIZEOF_STRUCT(WINELIB_NAME_AW(REBARBANDINFO), cxHeader) typedef struct tagNMREBARCHILDSIZE {

1 0

← Newer
1
2
3
4
5
6
7
...
112
Older →

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 June 2009