December 2007 - Wine-commits

Tim Schwartz : advapi32: service_control_dispatcher(): Fixed invalid pipe test to display GetLastError() before it gets overwritten.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 65d2f8a68d7db59c4878e9f05897a1b7554d9d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d2f8a68d7db59c4878e9f05… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Mon Dec 3 09:44:37 2007 -0600 advapi32: service_control_dispatcher(): Fixed invalid pipe test to display GetLastError() before it gets overwritten. --- dlls/advapi32/service.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3acab45..302d649 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -686,6 +686,11 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) name = service_get_pipe_name(service->name); pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE|PIPE_WAIT, 1, 256, 256, 10000, NULL ); + + if (pipe==INVALID_HANDLE_VALUE) + ERR("failed to create pipe for %s, error = %d\n", + debugstr_w(service->name), GetLastError()); + HeapFree(GetProcessHeap(), 0, name); /* let the process who started us know we've tried to create a pipe */ @@ -693,12 +698,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) SetEvent(event); CloseHandle(event); - if (pipe==INVALID_HANDLE_VALUE) - { - ERR("failed to create pipe for %s, error = %d\n", - debugstr_w(service->name), GetLastError()); - return 0; - } + if (pipe==INVALID_HANDLE_VALUE) return 0; /* dispatcher loop */ while (1)

1 0

Gerald Pfeifer : wined3d: Fix error handling in fixed_get_input().
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: f4ec0a209b10dfbf1f44a2bf0cdf2bebc19ee3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ec0a209b10dfbf1f44a2bf0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Dec 3 20:41:31 2007 +0100 wined3d: Fix error handling in fixed_get_input(). --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 64ed038..e70f025 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -133,7 +133,7 @@ static BOOL fixed_get_input( else if (usage == WINED3DDECLUSAGE_SAMPLE && usage_idx == 0) *regnum = 14 + WINED3DDP_MAXTEXCOORD; - if (*regnum < 0) { + if (*regnum == -1) { FIXME("Unsupported input stream [usage=%s, usage_idx=%u]\n", debug_d3ddeclusage(usage), usage_idx); return FALSE;

1 0

Aric Stewart : commdlg: File name and extension offsets are not guaranteed to be the same in W-> A conversions.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 9649ca2aa29d869453b682354053d1e88ac63397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9649ca2aa29d869453b682354… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 3 20:24:23 2007 +0900 commdlg: File name and extension offsets are not guaranteed to be the same in W->A conversions. --- dlls/comdlg32/filedlg.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 67fefd1..3e9c692 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2140,7 +2140,6 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if(lstrlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile - ((fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) ? 1 : 0)) { - LPWSTR lpszTemp; /* fill destination buffer */ if (fodInfos->ofnInfos->lpstrFile) @@ -2164,13 +2163,31 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } } - /* set filename offset */ - lpszTemp = PathFindFileNameW(lpstrPathAndFile); - fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile); + if(fodInfos->unicode) + { + LPWSTR lpszTemp; + + /* set filename offset */ + lpszTemp = PathFindFileNameW(lpstrPathAndFile); + fodInfos->ofnInfos->nFileOffset = (lpszTemp - lpstrPathAndFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionW(lpstrPathAndFile); + fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0; + } + else + { + LPSTR lpszTemp; + LPOPENFILENAMEA ofn = (LPOPENFILENAMEA)fodInfos->ofnInfos; + + /* set filename offset */ + lpszTemp = PathFindFileNameA(ofn->lpstrFile); + fodInfos->ofnInfos->nFileOffset = (lpszTemp - ofn->lpstrFile); - /* set extension offset */ - lpszTemp = PathFindExtensionW(lpstrPathAndFile); - fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - lpstrPathAndFile) + 1 : 0; + /* set extension offset */ + lpszTemp = PathFindExtensionA(ofn->lpstrFile); + fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? (lpszTemp - ofn->lpstrFile) + 1 : 0; + } /* set the lpstrFileTitle */ if(fodInfos->ofnInfos->lpstrFileTitle) @@ -3658,12 +3675,20 @@ static void CALLBACK FD32_UpdateResult(const FD31_DATA *lfs) if (priv->ofnA) { + LPSTR lpszTemp; if (ofnW->nMaxFile && !WideCharToMultiByte( CP_ACP, 0, ofnW->lpstrFile, -1, priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL )) priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0; - priv->ofnA->nFileOffset = ofnW->nFileOffset; - priv->ofnA->nFileExtension = ofnW->nFileExtension; + + /* offsets are not guarenteed to be the same in WCHAR to MULTIBYTE conversion */ + /* set filename offset */ + lpszTemp = PathFindFileNameA(priv->ofnA->lpstrFile); + priv->ofnA->nFileOffset = (lpszTemp - priv->ofnA->lpstrFile); + + /* set extension offset */ + lpszTemp = PathFindExtensionA(priv->ofnA->lpstrFile); + priv->ofnA->nFileExtension = (*lpszTemp) ? (lpszTemp - priv->ofnA->lpstrFile) + 1 : 0; } }

1 0

Vitaly Lipatov : winspool.drv: Fix buffer sizes.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 914e78aeb50401ee33de31a03524c860ce549507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=914e78aeb50401ee33de31a03… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Dec 1 19:43:37 2007 +0300 winspool.drv: Fix buffer sizes. --- dlls/winspool.drv/info.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index adb1b63..236d77d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1626,7 +1626,7 @@ void WINSPOOL_LoadSystemPrinters(void) if(RegQueryInfoKeyA(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)) == ERROR_SUCCESS) { + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) == ERROR_SUCCESS) { if(RegOpenKeyW(hkeyPrinters, PrinterName, &hkey) == ERROR_SUCCESS) { if(RegQueryValueExW(hkey, NameW, 0, 0, 0, &needed) == ERROR_FILE_NOT_FOUND) { set_reg_szW(hkey, NameW, PrinterName); @@ -4276,7 +4276,7 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName, pi = (used <= cbBuf) ? lpbPrinters : NULL; for(i = 0; i < number; i++) { - if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)) != + if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyPrinters); @@ -5177,7 +5177,7 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, for( i = 0, ptr = (pDriverInfo && (cbBuf >= size)) ? pDriverInfo : NULL ; i < number; i++, ptr = (ptr && (cbBuf >= size * i)) ? ptr + size : NULL) { - if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, sizeof(DriverNameW)) + if(RegEnumKeyW(hkeyDrivers, i, DriverNameW, sizeof(DriverNameW)/sizeof(DriverNameW[0])) != ERROR_SUCCESS) { ERR("Can't enum key number %d\n", i); RegCloseKey(hkeyDrivers);

1 0

Alexandru Balut : oleaut32: Implement VarWeekdayName + tests.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 90d8741d23c9cc19f7f9d285efea2c7f8467af1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d8741d23c9cc19f7f9d285e… Author: Alexandru Balut <alexandru.balut(a)gmail.com> Date: Sun Dec 2 17:17:27 2007 +0100 oleaut32: Implement VarWeekdayName + tests. --- dlls/oleaut32/oleaut32.spec | 2 +- dlls/oleaut32/tests/varformat.c | 103 +++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 70 ++++++++++++++++++++++++++ 3 files changed, 174 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index abffbd2..7b764ef 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -124,7 +124,7 @@ 125 stdcall VarBoolFromStr(wstr long long ptr) 126 stdcall VarBoolFromDisp(ptr long ptr) 127 stdcall VarFormatCurrency(ptr long long long long long ptr) -128 stub VarWeekdayName # stdcall (long long long long ptr) +128 stdcall VarWeekdayName(long long long long ptr) 129 stdcall VarMonthName(long long long ptr) 130 stdcall VarUI1FromI2(long ptr) 131 stdcall VarUI1FromI4(long ptr) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index f7c7c28..5a13e67 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -42,6 +42,7 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pVarFormatNumber)(LPVARIANT,int,int,int,int,ULONG,BSTR*); static HRESULT (WINAPI *pVarFormat)(LPVARIANT,LPOLESTR,int,int,ULONG,BSTR*); +static HRESULT (WINAPI *pVarWeekdayName)(int,int,int,ULONG,BSTR*); /* Have I8/UI8 data type? */ #define HAVE_OLEAUT32_I8 HAVE_FUNC(VarI8FromI1) @@ -392,10 +393,112 @@ static void test_VarFormat(void) VARFMT(VT_BOOL,V_BOOL,VARIANT_TRUE,"",E_INVALIDARG,""); } +static const char *szVarWdnFail = \ + "VarWeekdayName (%d, %d, %d, %d, %x): returned %8x, expected %8x\n"; +#define VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, freeOut) \ +do { \ + hres = pVarWeekdayName(iWeekday, fAbbrev, iFirstDay, dwFlags, &out); \ + if (SUCCEEDED(hres)) { \ + WideCharToMultiByte(CP_ACP, 0, out, -1, buff, sizeof(buff), 0, 0); \ + if (freeOut) SysFreeString(out); \ + } else { \ + buff[0] = '\0'; \ + } \ + ok(hres == ret, \ + szVarWdnFail, \ + iWeekday, fAbbrev, iFirstDay, dwFlags, &out, hres, ret \ + ); \ +} while(0) + +#define VARWDN_F(iWeekday, fAbbrev, iFirstDay, dwFlags, ret) \ + VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, ret, buff, out, 1) + +#define VARWDN_O(iWeekday, fAbbrev, iFirstDay, dwFlags) \ + VARWDN(iWeekday, fAbbrev, iFirstDay, dwFlags, S_OK, buff, out, 0) + +static void test_VarWeekdayName(void) +{ + char buff[256]; + BSTR out = NULL; + HRESULT hres; + int iWeekday, fAbbrev, iFirstDay; + BSTR dayNames[7][2]; /* Monday-Sunday, full/abbr */ + DWORD defaultFirstDay; + int firstDay; + int day; + int size; + DWORD localeValue; + + CHECKPTR(VarWeekdayName); + + /* Initialize days' names */ + for (day = 0; day <= 6; ++day) + { + for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) + { + localeValue = fAbbrev ? LOCALE_SABBREVDAYNAME1 : LOCALE_SDAYNAME1; + localeValue += day; + size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0); + dayNames[day][fAbbrev] = SysAllocStringLen(NULL, size - 1); + GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, + dayNames[day][fAbbrev], size); + } + } + + /* Get the user's first day of week. 0=Monday, .. */ + GetLocaleInfoW( + LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, + (LPWSTR)&defaultFirstDay, sizeof(defaultFirstDay) / sizeof(WCHAR)); + + /* Check invalid arguments */ + VARWDN_F(0, 0, 4, 0, E_INVALIDARG); + VARWDN_F(8, 0, 4, 0, E_INVALIDARG); + VARWDN_F(4, 0, -1, 0, E_INVALIDARG); + VARWDN_F(4, 0, 8, 0, E_INVALIDARG); + + hres = pVarWeekdayName(1, 0, 0, 0, NULL); + ok(E_INVALIDARG == hres, + "Null pointer: expected E_INVALIDARG, got 0x%08x\n", hres); + + /* Check all combinations */ + for (iWeekday = 1; iWeekday <= 7; ++iWeekday) + { + for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) + { + /* 0 = Default, 1 = Sunday, 2 = Monday, .. */ + for (iFirstDay = 0; iFirstDay <= 7; ++iFirstDay) + { + VARWDN_O(iWeekday, fAbbrev, iFirstDay, 0); + if (iFirstDay == 0) + firstDay = defaultFirstDay; + else + /* Translate from 0=Sunday to 0=Monday in the modulo 7 space */ + firstDay = iFirstDay - 2; + day = (7 + iWeekday - 1 + firstDay) % 7; + ok(VARCMP_EQ == VarBstrCmp(out, dayNames[day][fAbbrev], + LOCALE_USER_DEFAULT, 0), + "VarWeekdayName(%d,%d,%d): got wrong dayname: '%s'\n", + iWeekday, fAbbrev, iFirstDay, buff); + SysFreeString(out); + } + } + } + + /* Cleanup */ + for (day = 0; day <= 6; ++day) + { + for (fAbbrev = 0; fAbbrev <= 1; ++fAbbrev) + { + SysFreeString(dayNames[day][fAbbrev]); + } + } +} + START_TEST(varformat) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); test_VarFormatNumber(); test_VarFormat(); + test_VarWeekdayName(); } diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 5faecd2..23b7e57 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2498,3 +2498,73 @@ HRESULT WINAPI VarMonthName(INT iMonth, INT fAbbrev, ULONG dwFlags, BSTR *pbstrO } return S_OK; } + +/********************************************************************** + * VarWeekdayName [OLEAUT32.129] + * + * Print the specified weekday as localized name. + * + * PARAMS + * iWeekday [I] day of week, 1..7, 1="the first day of the week" + * fAbbrev [I] 0 - full name, !0 - abbreviated name + * iFirstDay [I] first day of week, + * 0=system default, 1=Sunday, 2=Monday, .. (contrary to MSDN) + * dwFlags [I] flag stuff. only VAR_CALENDAR_HIJRI possible. + * pbstrOut [O] Destination for weekday name. + * + * RETURNS + * Success: S_OK, pbstrOut contains the name. + * Failure: E_INVALIDARG, if any parameter is invalid. + * E_OUTOFMEMORY, if enough memory cannot be allocated. + */ +HRESULT WINAPI VarWeekdayName(INT iWeekday, INT fAbbrev, INT iFirstDay, + ULONG dwFlags, BSTR *pbstrOut) +{ + DWORD localeValue; + INT size; + + /* Windows XP oleaut32.dll doesn't allow iWekday==0, contrary to MSDN */ + if (iWeekday < 1 || iWeekday > 7) + return E_INVALIDARG; + if (iFirstDay < 0 || iFirstDay > 7) + return E_INVALIDARG; + if (!pbstrOut) + return E_INVALIDARG; + + if (dwFlags) + FIXME("Does not support dwFlags 0x%x, ignoring.\n", dwFlags); + + /* If we have to use the default firstDay, find which one it is */ + if (iFirstDay == 0) { + DWORD firstDay; + localeValue = LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK; + size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, + (LPWSTR)&firstDay, sizeof(firstDay) / sizeof(WCHAR)); + if (!size) { + ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + return HRESULT_FROM_WIN32(GetLastError()); + } + iFirstDay = firstDay + 2; + } + + /* Determine what we need to return */ + localeValue = fAbbrev ? LOCALE_SABBREVDAYNAME1 : LOCALE_SDAYNAME1; + localeValue += (7 + iWeekday - 1 + iFirstDay - 2) % 7; + + /* Determine the size of the data, allocate memory and retrieve the data */ + size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, NULL, 0); + if (!size) { + ERR("GetLocaleInfo 0x%x failed.\n", localeValue); + return HRESULT_FROM_WIN32(GetLastError()); + } + *pbstrOut = SysAllocStringLen(NULL, size - 1); + if (!*pbstrOut) + return E_OUTOFMEMORY; + size = GetLocaleInfoW(LOCALE_USER_DEFAULT, localeValue, *pbstrOut, size); + if (!size) { + ERR("GetLocaleInfo 0x%x failed in 2nd stage?!\n", localeValue); + SysFreeString(*pbstrOut); + return HRESULT_FROM_WIN32(GetLastError()); + } + return S_OK; +}

1 0

Vitaly Lipatov : shell32: Use sizeof instead of constant for buffer size.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 2dcb7b5d5c30ee4a9ee4f9f06d7b72b3aefb2cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dcb7b5d5c30ee4a9ee4f9f06… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Dec 1 19:41:46 2007 +0300 shell32: Use sizeof instead of constant for buffer size. --- dlls/shell32/shlexec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a6a7138..bc93e13 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1266,7 +1266,7 @@ static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) i = 0; while ( 1 ) { - r = RegEnumKeyW( hkeycm, i++, szguid, 39 ); + r = RegEnumKeyW( hkeycm, i++, szguid, sizeof(szguid)/sizeof(szguid[0]) ); if ( r != ERROR_SUCCESS ) break;

1 0

Vitaly Lipatov : midimap: Fix buffer sizes.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 768c5000f3aeadf0878ba2ecb94ef2e9d6d41470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768c5000f3aeadf0878ba2ecb… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Dec 1 19:35:59 2007 +0300 midimap: Fix buffer sizes. --- dlls/midimap/midimap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index aa569e0..120a054 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -168,7 +168,7 @@ static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) return FALSE; } - for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)/sizeof(buffer[0])); idx++) { if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue;

1 0

Vitaly Lipatov : avifil32: Fix buffer sizes.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 23db2636fc15f3645fc2c3966d29f679b51e3aee URL: http://source.winehq.org/git/wine.git/?a=commit;h=23db2636fc15f3645fc2c3966… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Dec 1 19:35:24 2007 +0300 avifil32: Fix buffer sizes. --- dlls/avifil32/api.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 4027966..910c816 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1065,9 +1065,9 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } - for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)) == S_OK;n++) { + for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == S_OK;n++) { /* get CLSID to extension */ - size = sizeof(szValue)/sizeof(szValue[0]); + size = sizeof(szValue); if (RegQueryValueW(hKey, szFileExt, szValue, &size) != S_OK) break; @@ -1116,7 +1116,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) for (n = 0; n <= count; n++) { /* first the description */ if (n != 0) { - size = sizeof(szValue)/sizeof(szValue[0]); + size = sizeof(szValue); if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == S_OK) { size = lstrlenW(szValue); lstrcpynW(szFilter, szValue, cbFilter);

1 0

Vitaly Lipatov : oledlg: Use wide strings, fix buffers size.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: e3b4ebebf4728499254dc1be07b3f495c98b6b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b4ebebf4728499254dc1be0… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Dec 1 19:08:26 2007 +0300 oledlg: Use wide strings, fix buffers size. --- dlls/oledlg/Makefile.in | 2 +- dlls/oledlg/insobjdlg.c | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index ed51a94..e2ea707 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = oledlg.dll IMPORTLIB = liboledlg.$(IMPLIBEXT) -IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 ntdll +IMPORTS = ole32 comdlg32 user32 advapi32 kernel32 C_SRCS = \ insobjdlg.c \ diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 8ddf227..159b002 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -332,38 +332,39 @@ static void UIINSERTOBJECTDLG_SelectCreateFromFile(InsertObjectDlgInfo* pdlgInfo */ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) { + static const WCHAR szClsid[] = {'C','L','S','I','D',0}; + static const WCHAR szInsertable[] = {'I','n','s','e','r','t','a','b','l','e',0}; + static const WCHAR szNotInsertable[] = {'N','o','t','I','n','s','e','r','t','a','b','l','e',0}; DWORD i; LONG len; HKEY hkclsids; HKEY hkey; CLSID clsid; HRESULT ret; - CHAR szclsid[128]; - CHAR keydesc[MAX_PATH]; - CHAR keyname[MAX_PATH]; - WCHAR wszclsid[128]; + WCHAR keydesc[MAX_PATH]; + WCHAR keyname[MAX_PATH]; + WCHAR szclsid[128]; DWORD index = 0; UIINSERTOBJECTDLG_FreeObjectTypes(pdlgInfo); - RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &hkclsids); + RegOpenKeyExW(HKEY_CLASSES_ROOT, szClsid, 0, KEY_READ, &hkclsids); - while (ERROR_SUCCESS == (ret = RegEnumKeyA(hkclsids, index, szclsid, MAX_PATH))) + while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, sizeof(szclsid)/sizeof(szclsid[0])))) { index++; - RegOpenKeyExA(hkclsids, szclsid, 0, KEY_READ, &hkey); + RegOpenKeyExW(hkclsids, szclsid, 0, KEY_READ, &hkey); - len = MAX_PATH; - if (ERROR_SUCCESS != RegQueryValueA(hkey, "Insertable", keyname, &len)) + len = sizeof(keyname); + if (ERROR_SUCCESS != RegQueryValueW(hkey, szInsertable, keyname, &len)) continue; - len = MAX_PATH; - if (ERROR_SUCCESS == RegQueryValueA(hkey, "NotInsertable", keyname, &len)) + len = sizeof(keyname); + if (ERROR_SUCCESS == RegQueryValueW(hkey, szNotInsertable, keyname, &len)) continue; - RtlMultiByteToUnicodeN(wszclsid, MAX_PATH, NULL, szclsid, MAX_PATH); - CLSIDFromString(wszclsid, &clsid); + CLSIDFromString(szclsid, &clsid); for (i = 0; i < pdlgInfo->lpOleUIInsertObject->cClsidExclude; i++) if (IsEqualGUID(&pdlgInfo->lpOleUIInsertObject->lpClsidExclude[i], &clsid)) @@ -372,14 +373,14 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) if (i < pdlgInfo->lpOleUIInsertObject->cClsidExclude) continue; - len = MAX_PATH; - if (ERROR_SUCCESS == RegQueryValueA(hkey, NULL, keydesc, &len)) + len = sizeof(keydesc); + if (ERROR_SUCCESS == RegQueryValueW(hkey, NULL, keydesc, &len)) { CLSID* lpclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID)); memcpy(lpclsid, &clsid, sizeof(CLSID)); - len = SendMessageA(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); - SendMessageA(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, (WPARAM)len, (LPARAM)lpclsid); + len = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); + SendMessageW(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, (WPARAM)len, (LPARAM)lpclsid); } } @@ -471,17 +472,15 @@ static BOOL UIINSERTOBJECTDLG_OnOpen(InsertObjectDlgInfo* pdlgInfo) } else if (BST_CHECKED == SendMessageA(pdlgInfo->hwndCreateFromFileCB, BM_GETCHECK, 0, 0)) { - char fname[MAX_PATH]; - if (pdlgInfo->lpOleUIInsertObject->lpszFile) { HRESULT hres; WCHAR wcsFile[MAX_PATH]; - SendMessageA(pdlgInfo->hwndFileTB, WM_GETTEXT, (WPARAM)MAX_PATH, (LPARAM)fname); - lstrcpynA(pdlgInfo->lpOleUIInsertObject->lpszFile, fname, pdlgInfo->lpOleUIInsertObject->cchFile); + if (SendMessageW(pdlgInfo->hwndFileTB, WM_GETTEXT, MAX_PATH, (LPARAM)wcsFile)) + WideCharToMultiByte(CP_ACP, 0, wcsFile, -1, + pdlgInfo->lpOleUIInsertObject->lpszFile, pdlgInfo->lpOleUIInsertObject->cchFile, NULL, NULL); - RtlMultiByteToUnicodeN(wcsFile, MAX_PATH, NULL, fname, MAX_PATH); if (ERROR_SUCCESS == (hres = GetClassFile(wcsFile, &pdlgInfo->lpOleUIInsertObject->clsid))) { if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CREATEFILEOBJECT)

1 0

Vitaly Lipatov : oledlg: Add Russian translation.
by Alexandre Julliard 05 Dec '07

05 Dec '07

Module: wine Branch: master Commit: 1dc28c904c1f120413e5816c7668fd0296391cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc28c904c1f120413e5816c7… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Sat Dec 1 20:19:00 2007 +0300 oledlg: Add Russian translation. --- dlls/oledlg/oledlg_Ru.rc | 95 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oledlg/rsrc.rc | 1 + 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/oledlg/oledlg_Ru.rc b/dlls/oledlg/oledlg_Ru.rc new file mode 100644 index 0000000..10453ef --- /dev/null +++ b/dlls/oledlg/oledlg_Ru.rc @@ -0,0 +1,95 @@ +/* + * Copyright 2007 Vitaly Lipatov for Etersoft + * + * 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 + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | + LBS_NOINTEGRALHEIGHT | WS_VISIBLE | WS_VSCROLL | + WS_TABSTOP + LTEXT "�� :",IDC_OBJTYPELBL,82,7,53,8,WS_VISIBLE + DEFPUSHBUTTON "OK",IDOK,221,7,66,14 + PUSHBUTTON "��",IDCANCEL,221,24,66,14 + GROUPBOX "��",IDC_RESULT,7,103,208,41 + CONTROL "�� ",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | + WS_GROUP,7,20,62,10 + CONTROL "�� ",IDC_CREATECONTROL,"Button", + BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 + CONTROL "�� ",IDC_CREATEFROMFILE,"Button", + BS_AUTORADIOBUTTON,7,37,67,10 + LTEXT "",IDC_RESULTDESC,49,112,159,23 + PUSHBUTTON "&�� ...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + CONTROL "Display As Icon",IDC_ASICON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 + PUSHBUTTON "��...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE + LTEXT "��:",IDC_FILELBL,83,27,20,8, NOT WS_VISIBLE + EDITTEXT IDC_FILE,83,37,132,13,ES_AUTOHSCROLL | NOT WS_VISIBLE +END + +STRINGTABLE DISCARDABLE +{ + IDS_RESULTOBJDESC "�� %s � ��" + IDS_RESULTFILEOBJDESC "�� . �� ." + IDS_BROWSE "��" + IDS_NOTOLEMOD "�� OLE. �� OLE." + IDS_NOTOLEMODCAPTION "�� " +} + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&��", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "�� &��", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&��:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "��", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "�&��", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&�� ", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "�� &��...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< result text goes here >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "��", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "�� %s." + IDS_PS_PASTE_OBJECT "�� , �� , �� %s." + IDS_PS_PASTE_OBJECT_AS_ICON "�� , �� , �� %s. �� ." + IDS_PS_PASTE_LINK_DATA "�� %s. �� , �� ." + IDS_PS_PASTE_LINK_OBJECT "�� . �� , �� ." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "�� , �� . �� , �� ." + IDS_PS_NON_OLE "�� ." + IDS_PS_UNKNOWN_TYPE "�� " + IDS_PS_UNKNOWN_SRC "�� " + IDS_PS_UNKNOWN_APP "��, �� " +} diff --git a/dlls/oledlg/rsrc.rc b/dlls/oledlg/rsrc.rc index d8f7d6a..088f9e5 100644 --- a/dlls/oledlg/rsrc.rc +++ b/dlls/oledlg/rsrc.rc @@ -46,5 +46,6 @@ #include "oledlg_No.rc" #include "oledlg_Pl.rc" #include "oledlg_Pt.rc" +#include "oledlg_Ru.rc" #include "oledlg_Sv.rc" #include "oledlg_Tr.rc"

1 0