October 2010 - Wine-commits

David Hedberg : shlwapi: Fix UrlGetPart to also return unknown schemes.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: 6b897513ff66e152cf5f9202877c81796046aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b897513ff66e152cf5f92028… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Oct 26 13:07:59 2010 +0200 shlwapi: Fix UrlGetPart to also return unknown schemes. --- dlls/shlwapi/tests/url.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/url.c | 6 ++++- 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index febe23d..21e2f80 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -620,6 +620,9 @@ static void test_UrlGetPart(void) const char* http_url = "http://user:pass 123(a)www.wine hq.org"; const char* res_url = "res://some.dll/find.dlg"; const char* about_url = "about:blank"; + const char* excid_url = "x-excid://36C00000/guid:{048B4E89-2E92-496F-A837-33BA02FF6D32}/Message.htm"; + const char* foo_url = "foo://bar-url/test"; + const char* short_url = "ascheme:"; CHAR szPart[INTERNET_MAX_URL_LENGTH]; DWORD dwSize; @@ -656,6 +659,20 @@ static void test_UrlGetPart(void) ok(szPart[0]==0, "UrlGetPartA(\"hi\") return \"%s\" instead of \"\"\n", szPart); ok(dwSize == 0, "dwSize = %d\n", dwSize); + if(pUrlGetPartW) + { + const WCHAR hiW[] = {'h','i',0}; + WCHAR bufW[5]; + + /* UrlGetPartW returns S_OK instead of S_FALSE */ + dwSize = sizeof szPart; + bufW[0]='x'; bufW[1]=0; + res = pUrlGetPartW(hiW, bufW, &dwSize, URL_PART_SCHEME, 0); + todo_wine ok(res==S_OK, "UrlGetPartW(\"hi\") returned %08X\n", res); + ok(bufW[0] == 0, "UrlGetPartW(\"hi\") return \"%c\"\n", bufW[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); + } + dwSize = sizeof szPart; szPart[0]='x'; szPart[1]=0; res = pUrlGetPartA("hi", szPart, &dwSize, URL_PART_QUERY, 0); @@ -677,6 +694,10 @@ static void test_UrlGetPart(void) test_url_part(about_url, URL_PART_SCHEME, 0, "about"); + test_url_part(excid_url, URL_PART_SCHEME, 0, "x-excid"); + test_url_part(foo_url, URL_PART_SCHEME, 0, "foo"); + test_url_part(short_url, URL_PART_SCHEME, 0, "ascheme"); + dwSize = sizeof(szPart); res = pUrlGetPartA(about_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); @@ -707,6 +728,34 @@ static void test_UrlGetPart(void) szPart[0] = 'x'; szPart[1] = '\0'; res = pUrlGetPartA("index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); ok(res==E_FAIL, "returned %08x\n", res); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==E_FAIL, "returned %08x\n", res); + ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); + ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(excid_url, szPart, &dwSize, URL_PART_QUERY, 0); + ok(res==S_FALSE, "returned %08x\n", res); + ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==E_FAIL, "returned %08x\n", res); + ok(szPart[0] == 'x', "szPart[0] = %c\n", szPart[0]); + ok(dwSize == sizeof(szPart), "dwSize = %d\n", dwSize); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = pUrlGetPartA(foo_url, szPart, &dwSize, URL_PART_QUERY, 0); + ok(res==S_FALSE, "returned %08x\n", res); + ok(szPart[0] == 0, "szPart[0] = %c\n", szPart[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 04e80f9..adfbb09 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1967,6 +1967,10 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) else cont = FALSE; } + + if(*start != ':') + *size = 0; + break; case USERPASS: @@ -2190,7 +2194,7 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, switch (dwPart) { case URL_PART_SCHEME: - if (!pl.szScheme || scheme == URL_SCHEME_UNKNOWN) { + if (!pl.szScheme) { *pcchOut = 0; return S_FALSE; }

1 0

Aric Stewart : winegstreamer: Add glib threading overrides.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: 48f3adc06bdb5d6979219fdd2079c0af0ffaedc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48f3adc06bdb5d6979219fdd2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 25 08:44:41 2010 -0500 winegstreamer: Add glib threading overrides. --- dlls/winegstreamer/Makefile.in | 1 + dlls/winegstreamer/glibthread.c | 390 ++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/gst_private.h | 3 + dlls/winegstreamer/main.c | 23 +++ 4 files changed, 417 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48f3adc06bdb5d6979219…

1 0

Detlef Riekenberg : wer: Add a stub for WerRemoveExcludedApplication.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: ac194c387316a0fcf46fee7896d276cae3a2d677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac194c387316a0fcf46fee789… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Oct 26 11:37:16 2010 +0200 wer: Add a stub for WerRemoveExcludedApplication. --- dlls/wer/main.c | 20 ++++++++++++++++++++ dlls/wer/wer.spec | 2 +- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 740462f..a283bae 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -49,3 +49,23 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * WerRemoveExcludedApplication (wer.@) + * + * remove an application from the exclusion list + * + * PARAMS + * exeName [i] The application name + * allUsers [i] for all users (TRUE) or for the current user (FALSE) + * + * RESULTS + * SUCCESS S_OK + * FAILURE A HRESULT error code + * + */ +HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) +{ + FIXME("(%s, %d) :stub\n",debugstr_w(exeName), allUsers); + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index d240a90..b50eb47 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -62,7 +62,7 @@ @ stub WerpSubmitReportFromStore @ stub WerpSvcReportFromMachineQueue @ stdcall WerAddExcludedApplication(wstr long) -@ stub WerRemoveExcludedApplication +@ stdcall WerRemoveExcludedApplication(wstr long) @ stub WerReportAddDump @ stub WerReportAddFile @ stub WerReportCloseHandle

1 0

Hans Leidekker : gdi32: Move EnumICMProfiles to the driver.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: 0839dabdabd43fd99d0c47507fabce08a8d43c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0839dabdabd43fd99d0c47507… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 26 12:40:41 2010 +0200 gdi32: Move EnumICMProfiles to the driver. --- dlls/gdi32/driver.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/icm.c | 71 +++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/mfdrv/init.c | 1 + 5 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 65eb048..38c4942 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -96,6 +96,7 @@ static struct graphics_driver *create_driver( HMODULE module ) GET_FUNC(EndPage); GET_FUNC(EndPath); GET_FUNC(EnumDeviceFonts); + GET_FUNC(EnumICMProfiles); GET_FUNC(ExcludeClipRect); GET_FUNC(ExtDeviceMode); GET_FUNC(ExtEscape); diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 279300d..8f0b932 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -58,6 +58,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = NULL, /* pEndPage */ EMFDRV_EndPath, /* pEndPath */ NULL, /* pEnumDeviceFonts */ + NULL, /* pEnumICMProfiles */ EMFDRV_ExcludeClipRect, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ NULL, /* pExtEscape */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index ee44af5..3ed9356 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,6 +99,7 @@ typedef struct tagDC_FUNCS INT (CDECL *pEndDoc)(PHYSDEV); INT (CDECL *pEndPage)(PHYSDEV); BOOL (CDECL *pEndPath)(PHYSDEV); + INT (CDECL *pEnumICMProfiles)(PHYSDEV,ICMENUMPROCW,LPARAM); BOOL (CDECL *pEnumDeviceFonts)(PHYSDEV,LPLOGFONTW,FONTENUMPROCW,LPARAM); INT (CDECL *pExcludeClipRect)(PHYSDEV,INT,INT,INT,INT); INT (CDECL *pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index 0e346ee..033dbd9 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -38,13 +38,60 @@ WINE_DEFAULT_DEBUG_CHANNEL(icm); +struct enum_profiles +{ + BOOL unicode; + union + { + ICMENUMPROCA funcA; + ICMENUMPROCW funcW; + } callback; + LPARAM data; +}; + +INT CALLBACK enum_profiles_callback( LPWSTR filename, LPARAM lparam ) +{ + int len, ret = -1; + struct enum_profiles *ep = (struct enum_profiles *)lparam; + char *filenameA; + + if (ep->unicode) + return ep->callback.funcW( filename, ep->data ); + + len = WideCharToMultiByte( CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL ); + filenameA = HeapAlloc( GetProcessHeap(), 0, len ); + if (filenameA) + { + WideCharToMultiByte( CP_ACP, 0, filename, -1, filenameA, len, NULL, NULL ); + ret = ep->callback.funcA( filenameA, ep->data ); + HeapFree( GetProcessHeap(), 0, filenameA ); + } + return ret; +} + /*********************************************************************** * EnumICMProfilesA (GDI32.@) */ INT WINAPI EnumICMProfilesA(HDC hdc, ICMENUMPROCA func, LPARAM lparam) { - FIXME("%p, %p, 0x%08lx stub\n", hdc, func, lparam); - return -1; + INT ret = -1; + DC *dc = get_dc_ptr(hdc); + + TRACE("%p, %p, 0x%08lx\n", hdc, func, lparam); + if (dc) + { + if (dc->funcs->pEnumICMProfiles) + { + struct enum_profiles ep; + + ep.unicode = FALSE; + ep.callback.funcA = func; + ep.data = lparam; + ret = dc->funcs->pEnumICMProfiles(dc->physDev, enum_profiles_callback, (LPARAM)&ep); + } + release_dc_ptr(dc); + } + return ret; } /*********************************************************************** @@ -52,8 +99,24 @@ INT WINAPI EnumICMProfilesA(HDC hdc, ICMENUMPROCA func, LPARAM lparam) */ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam) { - FIXME("%p, %p, 0x%08lx stub\n", hdc, func, lparam); - return -1; + INT ret = -1; + DC *dc = get_dc_ptr(hdc); + + TRACE("%p, %p, 0x%08lx\n", hdc, func, lparam); + if (dc) + { + if (dc->funcs->pEnumICMProfiles) + { + struct enum_profiles ep; + + ep.unicode = TRUE; + ep.callback.funcW = func; + ep.data = lparam; + ret = dc->funcs->pEnumICMProfiles(dc->physDev, enum_profiles_callback, (LPARAM)&ep); + } + release_dc_ptr(dc); + } + return ret; } /********************************************************************** diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 810bd27..553c363 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -56,6 +56,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = NULL, /* pEndPage */ MFDRV_EndPath, /* pEndPath */ NULL, /* pEnumDeviceFonts */ + NULL, /* pEnumICMProfiles */ MFDRV_ExcludeClipRect, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ MFDRV_ExtEscape, /* pExtEscape */

1 0

Hans Leidekker : winex11: Implement EnumICMProfiles.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: 898a4cfaec12556155782b396a4ec9c3c3d23d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=898a4cfaec12556155782b396… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 26 12:41:19 2010 +0200 winex11: Implement EnumICMProfiles. --- dlls/winex11.drv/graphics.c | 76 +++++++++++++++++++++++++++++++----- dlls/winex11.drv/winex11.drv.spec | 1 + 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 8420f01..8236759 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1508,35 +1508,35 @@ extern void WINAPI A_SHAInit( sha_ctx * ); extern void WINAPI A_SHAUpdate( sha_ctx *, const unsigned char *, unsigned int ); extern void WINAPI A_SHAFinal( sha_ctx *, unsigned char * ); +static const WCHAR mntr_key[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t', + 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r',0}; + +static const WCHAR color_path[] = + {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\','c','o','l','o','r','\\',0}; + /*********************************************************************** * GetICMProfile (X11DRV.@) */ BOOL CDECL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename ) { - static const WCHAR path[] = - {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s', - '\\','c','o','l','o','r','\\',0}; static const WCHAR srgb[] = {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', 'P','r','o','f','i','l','e','.','i','c','m',0}; - static const WCHAR mntr[] = - {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t', - 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r',0}; - HKEY hkey; DWORD required, len; - WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + sizeof(path)/sizeof(WCHAR)]; + WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + sizeof(color_path)/sizeof(WCHAR)]; unsigned char *buffer; unsigned long buflen; if (!size) return FALSE; GetSystemDirectoryW( fullname, MAX_PATH ); - strcatW( fullname, path ); + strcatW( fullname, color_path ); len = sizeof(profile)/sizeof(WCHAR); - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL ) && + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr_key, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL ) && !RegEnumValueW( hkey, 0, profile, &len, NULL, NULL, NULL, NULL )) /* FIXME handle multiple values */ { strcatW( fullname, profile ); @@ -1589,3 +1589,57 @@ BOOL CDECL X11DRV_GetICMProfile( X11DRV_PDEVICE *physDev, LPDWORD size, LPWSTR f *size = required; return TRUE; } + +/*********************************************************************** + * EnumICMProfiles (X11DRV.@) + */ +INT CDECL X11DRV_EnumICMProfiles( X11DRV_PDEVICE *physDev, ICMENUMPROCW proc, LPARAM lparam ) +{ + HKEY hkey; + DWORD len_sysdir, len_path, len, index = 0; + WCHAR sysdir[MAX_PATH], *profile; + LONG res; + INT ret; + + TRACE("%p, %p, %ld\n", physDev, proc, lparam); + + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, mntr_key, 0, KEY_ALL_ACCESS, &hkey )) + return -1; + + len_sysdir = GetSystemDirectoryW( sysdir, MAX_PATH ); + len_path = len_sysdir + sizeof(color_path) / sizeof(color_path[0]) - 1; + len = 64; + for (;;) + { + if (!(profile = HeapAlloc( GetProcessHeap(), 0, (len_path + len) * sizeof(WCHAR) ))) + { + RegCloseKey( hkey ); + return -1; + } + res = RegEnumValueW( hkey, index, profile + len_path, &len, NULL, NULL, NULL, NULL ); + while (res == ERROR_MORE_DATA) + { + len *= 2; + HeapFree( GetProcessHeap(), 0, profile ); + if (!(profile = HeapAlloc( GetProcessHeap(), 0, (len_path + len) * sizeof(WCHAR) ))) + { + RegCloseKey( hkey ); + return -1; + } + res = RegEnumValueW( hkey, index, profile + len_path, &len, NULL, NULL, NULL, NULL ); + } + if (res != ERROR_SUCCESS) + { + HeapFree( GetProcessHeap(), 0, profile ); + break; + } + memcpy( profile, sysdir, len_sysdir * sizeof(WCHAR) ); + memcpy( profile + len_sysdir, color_path, sizeof(color_path) - sizeof(WCHAR) ); + ret = proc( profile, lparam ); + HeapFree( GetProcessHeap(), 0, profile ); + if (!ret) break; + index++; + } + RegCloseKey( hkey ); + return -1; +} diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 323da2c..9476c40 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -12,6 +12,7 @@ @ cdecl DescribePixelFormat(ptr long long ptr) X11DRV_DescribePixelFormat @ cdecl Ellipse(ptr long long long long) X11DRV_Ellipse @ cdecl EnumDeviceFonts(ptr ptr ptr long) X11DRV_EnumDeviceFonts +@ cdecl EnumICMProfiles(ptr ptr long) X11DRV_EnumICMProfiles @ cdecl ExtEscape(ptr long long ptr long ptr) X11DRV_ExtEscape @ cdecl ExtFloodFill(ptr long long long long) X11DRV_ExtFloodFill @ cdecl ExtTextOut(ptr long long long ptr ptr long ptr) X11DRV_ExtTextOut

1 0

Hans Leidekker : gdi32: Fix invalid parameter handling in EnumICMProfiles and SetICMProfile.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: b32ed71ff52e00d3aba6a8f4860a78e0b39f80d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32ed71ff52e00d3aba6a8f48… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 26 12:41:49 2010 +0200 gdi32: Fix invalid parameter handling in EnumICMProfiles and SetICMProfile. --- dlls/gdi32/icm.c | 34 +++++++++++-- dlls/gdi32/tests/icm.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index 033dbd9..afbc0ee 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -74,11 +74,13 @@ INT CALLBACK enum_profiles_callback( LPWSTR filename, LPARAM lparam ) */ INT WINAPI EnumICMProfilesA(HDC hdc, ICMENUMPROCA func, LPARAM lparam) { + DC *dc; INT ret = -1; - DC *dc = get_dc_ptr(hdc); TRACE("%p, %p, 0x%08lx\n", hdc, func, lparam); - if (dc) + + if (!func) return -1; + if ((dc = get_dc_ptr(hdc))) { if (dc->funcs->pEnumICMProfiles) { @@ -99,11 +101,13 @@ INT WINAPI EnumICMProfilesA(HDC hdc, ICMENUMPROCA func, LPARAM lparam) */ INT WINAPI EnumICMProfilesW(HDC hdc, ICMENUMPROCW func, LPARAM lparam) { + DC *dc; INT ret = -1; - DC *dc = get_dc_ptr(hdc); TRACE("%p, %p, 0x%08lx\n", hdc, func, lparam); - if (dc) + + if (!func) return -1; + if ((dc = get_dc_ptr(hdc))) { if (dc->funcs->pEnumICMProfiles) { @@ -200,6 +204,17 @@ BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE colorspace, LPLOGCOLORSPACEW buffer, D BOOL WINAPI SetICMProfileA(HDC hdc, LPSTR filename) { FIXME("%p %s stub\n", hdc, debugstr_a(filename)); + + if (!filename) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!hdc) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } return TRUE; } @@ -209,6 +224,17 @@ BOOL WINAPI SetICMProfileA(HDC hdc, LPSTR filename) BOOL WINAPI SetICMProfileW(HDC hdc, LPWSTR filename) { FIXME("%p %s stub\n", hdc, debugstr_w(filename)); + + if (!filename) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!hdc) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } return TRUE; } diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 06812aa..f201eab 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -176,6 +176,127 @@ static void test_SetICMMode( HDC dc ) DeleteDC( dc ); } +static CALLBACK INT enum_profiles_callbackA( LPSTR filename, LPARAM lparam ) +{ + trace("%s\n", filename); + return 1; +} + +static void test_EnumICMProfilesA( HDC dc ) +{ + INT ret; + + ret = EnumICMProfilesA( NULL, NULL, 0 ); + ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); + + ret = EnumICMProfilesA( dc, NULL, 0 ); + ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); + + ret = EnumICMProfilesA( dc, enum_profiles_callbackA, 0 ); + ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); +} + +static CALLBACK INT enum_profiles_callbackW( LPWSTR filename, LPARAM lparam ) +{ + return 1; +} + +static void test_EnumICMProfilesW( HDC dc ) +{ + INT ret; + + ret = EnumICMProfilesW( NULL, NULL, 0 ); + ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + + ret = EnumICMProfilesW( dc, NULL, 0 ); + ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); + + ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 ); + ok(ret == -1 || broken(ret == 0) /* win9x, nt4 */, "expected -1, got %d\n", ret); +} + +static void test_SetICMProfileA( HDC dc ) +{ + BOOL ret; + char profile[MAX_PATH]; + DWORD len, error; + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileA( NULL, NULL ); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetICMProfileA is not implemented\n"); + return; + } + + len = sizeof(profile); + ret = GetICMProfileA( dc, &len, profile ); + ok(ret, "GetICMProfileA failed %u\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileA( NULL, NULL ); + error = GetLastError(); + ok(!ret, "SetICMProfileA succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* win9x */, + "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileA( NULL, profile ); + error = GetLastError(); + ok(!ret, "SetICMProfileA succeeded\n"); + ok(error == ERROR_INVALID_HANDLE || broken(error == 0xdeadbeef) /* win9x */, + "expected ERROR_INVALID_HANDLE, got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileA( dc, NULL ); + error = GetLastError(); + ok(!ret, "SetICMProfileA succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + ret = SetICMProfileA( dc, profile ); + ok(ret, "SetICMProfileA failed %u\n", GetLastError()); +} + +static void test_SetICMProfileW( HDC dc ) +{ + BOOL ret; + WCHAR profile[MAX_PATH]; + DWORD len, error; + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileW( NULL, NULL ); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetICMProfileW is not implemented\n"); + return; + } + + len = sizeof(profile)/sizeof(profile[0]); + ret = GetICMProfileW( dc, &len, profile ); + ok(ret, "GetICMProfileW failed %u\n", GetLastError()); + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileW( NULL, NULL ); + error = GetLastError(); + ok(!ret, "SetICMProfileW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileW( NULL, profile ); + error = GetLastError(); + ok(!ret, "SetICMProfileW succeeded\n"); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + + SetLastError( 0xdeadbeef ); + ret = SetICMProfileW( dc, NULL ); + error = GetLastError(); + ok(!ret, "SetICMProfileW succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + ret = SetICMProfileW( dc, profile ); + ok(ret, "SetICMProfileW failed %u\n", GetLastError()); +} + START_TEST(icm) { HDC dc = GetDC( NULL ); @@ -183,6 +304,10 @@ START_TEST(icm) test_GetICMProfileA( dc ); test_GetICMProfileW( dc ); test_SetICMMode( dc ); + test_EnumICMProfilesA( dc ); + test_EnumICMProfilesW( dc ); + test_SetICMProfileA( dc ); + test_SetICMProfileW( dc ); ReleaseDC( NULL, dc ); }

1 0

Hans Leidekker : msi: Open the log file in shared write mode.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: 29ee65402bd4a67c2cd088c8254be57a47b8d837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ee65402bd4a67c2cd088c82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 26 12:42:16 2010 +0200 msi: Open the log file in shared write mode. --- dlls/msi/msi.c | 6 +++--- dlls/msi/package.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 29c639c..11d1174 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1775,12 +1775,12 @@ UINT WINAPI MsiEnableLogW(DWORD dwLogMode, LPCWSTR szLogFile, DWORD attributes) lstrcpyW(gszLogFile,szLogFile); if (!(attributes & INSTALLLOGATTRIBUTES_APPEND)) DeleteFileW(szLogFile); - file = CreateFileW(szLogFile, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); + file = CreateFileW(szLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) CloseHandle(file); else - ERR("Unable to enable log %s\n",debugstr_w(szLogFile)); + ERR("Unable to enable log %s (%u)\n", debugstr_w(szLogFile), GetLastError()); } else gszLogFile[0] = '\0'; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ac11e69..8fcf6ff 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1773,11 +1773,10 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MsiCloseHandle( rec ); } - if ((!rc) && (gszLogFile[0]) && !((eMessageType & 0xff000000) == - INSTALLMESSAGE_PROGRESS)) + if (!rc && gszLogFile[0] && (eMessageType & 0xff000000) != INSTALLMESSAGE_PROGRESS) { DWORD write; - HANDLE log_file = CreateFileW(gszLogFile,GENERIC_WRITE, 0, NULL, + HANDLE log_file = CreateFileW(gszLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (log_file != INVALID_HANDLE_VALUE)

1 0

Yaron Shahrabani : oleview: Added Hebrew translation.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: 971ce6c44a7f094088805e8253f2bd268dd22a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=971ce6c44a7f094088805e825… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Tue Oct 26 12:21:52 2010 +0200 oleview: Added Hebrew translation. --- programs/oleview/He.rc | 223 ++++++++++++++++++++++++++++++++++++++++++ programs/oleview/Makefile.in | 1 + 2 files changed, 224 insertions(+), 0 deletions(-) diff --git a/programs/oleview/He.rc b/programs/oleview/He.rc new file mode 100644 index 0000000..6fae62d --- /dev/null +++ b/programs/oleview/He.rc @@ -0,0 +1,223 @@ +/* + * OleView (He.rc) + * Hebrew Language Support + * + * Copyright 2006 Piotr Caban + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDM_MENU MENU +{ + POPUP "&קובץ" + { + MENUITEM "&איגוד לקובץ...", IDM_BIND + MENUITEM "צ&פייה ב־TypeLib...", IDM_TYPELIB + MENUITEM SEPARATOR + MENUITEM "&תצורת המערכת...", IDM_SYSCONF + MENUITEM "ה&הפעלת עורך רישומי המערכת", IDM_REGEDIT + MENUITEM SEPARATOR + MENUITEM "י&ציאה", IDM_EXIT + } + POPUP "&עצם" + { + POPUP "דגלון &CoCreateInstance" + { + MENUITEM "CLSCTX_&INPROC_SERVER", IDM_FLAG_INSERV,CHECKED + MENUITEM "CLSCTX_INPROC_&HANDLER", IDM_FLAG_INHANDL + MENUITEM "CLSCTX_&LOCAL_SERVER", IDM_FLAG_LOCSERV,CHECKED + MENUITEM "CLSCTX_&REMOTE_SERVER", IDM_FLAG_REMSERV + } + MENUITEM SEPARATOR + MENUITEM "צפייה בפרטי ה&סוג", IDM_TYPEINFO, GRAYED + MENUITEM SEPARATOR + MENUITEM "יצי&רת מופע", IDM_CREATEINST, GRAYED + MENUITEM "יצירת מופע &ב־...", IDM_CREATEINSTON, GRAYED + MENUITEM "&שחרור מופע", IDM_RELEASEINST, GRAYED + MENUITEM SEPARATOR + MENUITEM "העתקת ה־CLSID ללוח הג&זירים", IDM_COPYCLSID, GRAYED + MENUITEM "העתקת תגית עצם ה־HTML ל&לוח הגזירים", IDM_HTMLTAG, GRAYED + MENUITEM SEPARATOR + MENUITEM "&צפייה...", IDM_VIEW, GRAYED + } + POPUP "&תצוגה" + { + MENUITEM "מצב &מומחה", IDM_EXPERT,CHECKED + MENUITEM SEPARATOR + MENUITEM "קטגוריות רכיבים מו&סתרות", IDM_HIDDEN, GRAYED + MENUITEM SEPARATOR + MENUITEM "&סרגל כלים", IDM_TOOLBAR,CHECKED + MENUITEM "שורת מ&צב", IDM_STATUSBAR,CHECKED + MENUITEM SEPARATOR + MENUITEM "&רענון\tF5", IDM_REFRESH + } + POPUP "ע&זרה" + { + MENUITEM "על &אודות OleView", IDM_ABOUT + } +} + +IDM_TYPELIB MENU +{ + POPUP "&קובץ" + { + MENUITEM "שמירה &בשם...", IDM_SAVEAS + MENUITEM "&סגירה", IDM_CLOSE + } + POPUP "&תצוגה" + { + MENUITEM "&קיבוץ לפי סוג", IDM_GROUP + MENUITEM SEPARATOR + MENUITEM "&סרגל כלים", IDM_TOOLBAR + MENUITEM "&שורת מצב", IDM_STATUSBAR,CHECKED + } +} + +STRINGTABLE +{ + IDS_APPNAME "OleView" + IDS_APPTITLE "OleView" + IDS_READY "מוכן" + IDS_ABOUT "OleView - מציג פרטי OLE/COM" + IDS_ABOUTVER "גרסה 1.0" + IDS_TYPELIBTITLE "מציג ITypeLib" + IDS_OPEN "פתיחה" + IDS_OPEN_TYPELIB_FILTER "קובצי TypeLib (*.tlb;*.olb;*.dll;*.ocx;*.exe)‏\0*.tlb;*.olb;*.dll;*.ocx;*.exe\0כל הקבצים (*.*)‏\0*.*\0\0" + + IDM_BIND, "איגוד לקובץ באמצעות מכנה קבצים" + IDM_TYPELIB, "פתיחת קובץ TypeLib וצפייה בתכנים" + IDM_SYSCONF, "שינוי הגדרות ה־COM המבוזר לכלל המערכת" + IDM_REGEDIT, "הפעלת עורך רישומי המערכת של Wine" + IDM_EXIT, "יציאה מהיישום. הצגת בקשה לשמירת השינויים" + IDM_CREATEINST, "יצירת מופע של העצם הנבחר" + IDM_CREATEINSTON, "יצירת מופע של הפריט הנבחר במחשב מסוים" + IDM_RELEASEINST, "שחרור מופע העצם הנבחר" + IDM_COPYCLSID, "העתקת ה־GUID של הפריט הנבחר ללוח הגזירים" + IDM_VIEW, "הצגת המציג עבור הפריט הנבחר" + IDM_FLAG_INSERV, "שימוש ב־CLSCTX_INPROC_SERVER בעת קריאה ל־CoGetClassObject" + IDM_FLAG_INHANDL, "שימוש ב־CLSCTX_INPROC_HANDLER בעת קריאה ל־CoGetClassObject" + IDM_FLAG_LOCSERV, "שימוש ב־CLSCTX_LOCAL_SERVER בעת קריאה ל־CoGetClassObject" + IDM_FLAG_REMSERV, "שימוש ב־CLSCTX_REMOTE_SERVER בעת קריאה ל־CoGetClassObject" + IDM_EXPERT, "החלפה בין מצב התצוגה למומחה לבין מצב תצוגה למתחיל" + IDM_HIDDEN, "החלפת מצב התצוגה של קטגוריות רכיבים שאינן אמורות להופיע" + IDM_TOOLBAR, "הצגה או הסתרה של סרגל הכלים" + IDM_STATUSBAR, "הצגה או הסתרה של שורת המצב" + IDM_REFRESH, "רענון כל הרשימות" + IDM_ABOUT, "הצגת פרטי התכנית, מספר הגרסה וזכויות היוצרים" + + IDM_SAVEAS, "שמירה כקובץ .IDL או קובץ .H" + IDM_CLOSE, "סגירת החלון" + IDM_GROUP, "קיבוץ פרטי סוגים לפי סוג" + + IDS_TREE_OC, "ObjectClasses" + IDS_TREE_GBCC, "מקובץ לפי קטגוריית הרכיבים" + IDS_TREE_O1O, "עצמי OLE 1.0" + IDS_TREE_CLO, "עצמי COM מספרייה" + IDS_TREE_AO, "כל העצמים" + IDS_TREE_AID, "מזהי היישומים" + IDS_TREE_TL, "ספריות סוג" + IDS_TL_VER, "גרסה" + IDS_TREE_I, "מנשקים" + + IDS_TAB_REG, "רישומי המערכת" + IDS_TAB_IMPL, "הטמעה" + IDS_TAB_ACTIV, "הפעלה" + + IDS_CGCOFAIL, "CoGetClassObject נכשל." + IDS_ERROR_UNKN, "שגיאה בלתי ידוע" + IDS_TRUE, "אמת" + IDS_FALSE, "שקר" + IDS_BYTES, "בתים" + + IDS_ERROR_LOADTYPELIB, "LoadTypeLib( %s ) נכשל ($%x)" + IDS_INHERITINTERFACES, "מנשקים שהתקבלו בירושה" +} + +DLG_CREATEINSTON DIALOG 0, 0, 250, 41 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "התחברות למחשב אחר" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&שם המחשב:", -1, 5, 6, 190, 8 + EDITTEXT IDC_MACHINE, 5, 16, 190, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL + DEFPUSHBUTTON "&אישור", IDOK, 200, 5, 45, 14 + PUSHBUTTON "&ביטול", IDCANCEL, 200, 22, 45, 14 +} + +DLG_SYSCONF DIALOG 0, 0, 170, 100 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הגדרות המערכת" +FONT 8, "MS Shell Dlg" +{ + LTEXT "הגדרות המערכת", -1, 5, 6, 160, 8 + CHECKBOX "הפעלת COM מ&בוזר", IDC_ENABLEDCOM, 5, 20, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + CHECKBOX "הפעלת חיבורים מ&רחוק (Win95 בלבד)", IDC_ENABLEREMOTE, 5, 35, 160, 10, WS_TABSTOP | WS_GROUP | BS_AUTOCHECKBOX + LTEXT "הגדרות אלו משנות רק את ערכי הרישום.\nאין להן שום השפעה על הביצועים של Wine.", -1, 5, 50, 160, 40 + DEFPUSHBUTTON "&OK", IDOK, 70, 80, 45, 14 + PUSHBUTTON "&ביטול", IDCANCEL, 120, 80, 45, 14 +} + +DLG_DEFAULT_IV DIALOG 0, 0, 280, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מציג מנשקי בררת המחדל" +FONT 8, "MS Shell Dlg" +{ + LTEXT "מנשק", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "IID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&סגירה", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&צפייה בפרטי הסוג", IDC_VIEWTYPEINFO, 6, 31, 70, 14, WS_DISABLED +} + +DLG_IPERSIST_IV DIALOG 0, 0, 280, 29 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מציג מנשקי ה־IPersist" +FONT 8, "MS Shell Dlg" +{ + LTEXT "שם המחלקה:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&סגירה", IDCANCEL, 230, 6, 45, 14 +} + +DLG_IPERSISTSTREAM_IV DIALOG 0, 0, 280, 68 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מציג מנשקי ה־IPersistStream" +FONT 8, "MS Shell Dlg" +{ + LTEXT "שם המחלקה:", -1, 5, 6, 50, 8 + LTEXT "", IDC_LABEL, 60, 6, 145, 8 + LTEXT "CLSID:", -1, 5, 16, 50, 8 + LTEXT "", IDC_IDENTIFIER, 60, 16, 165, 8 + DEFPUSHBUTTON "&סגירה", IDCANCEL, 230, 6, 45, 14 + PUSHBUTTON "&IsDirty", IDC_ISDIRTY_BUTTON, 6, 31, 50, 14 + LTEXT "???", IDC_ISDIRTY, 60, 34, 145, 8 + PUSHBUTTON "&GetSizeMax", IDC_GETSIZEMAX_BUTTON, 6, 49, 50, 14 + LTEXT "???", IDC_GETSIZEMAX, 60, 52, 145, 8 +} diff --git a/programs/oleview/Makefile.in b/programs/oleview/Makefile.in index 6f99b49..cfc743a 100644 --- a/programs/oleview/Makefile.in +++ b/programs/oleview/Makefile.in @@ -16,6 +16,7 @@ RC_SRCS = \ De.rc \ En.rc \ Fr.rc \ + He.rc \ It.rc \ Ja.rc \ Ko.rc \

1 0

Jacek Caban : mshtml.idl: Added DispHTMLObjectElement declaration.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: 41040c38fb50f72b3ffa9e5dbf95e19ae48ebccd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41040c38fb50f72b3ffa9e5db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 26 11:14:18 2010 +0200 mshtml.idl: Added DispHTMLObjectElement declaration. --- include/mshtmdid.h | 22 +++++++ include/mshtml.idl | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index fd7c707..9031358 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -131,6 +131,10 @@ #define DISPID_IE8_FRAME DISPID_IE8_FRAMESITEBASE #define DISPID_IE8_IFRAME DISPID_IE8_FRAMESITEBASE +#define DISPID_IE8_OBJECTBASE (DISPID_OBJECT+30) +#define DISPID_IE8_OBJECTMAX (DISPID_STYLE-1) +#define DISPID_IE8_OBJECT DISPID_IE8_OBJECTBASE + #define DISPID_COLLECTION (DISPID_NORMAL_FIRST+500) #define DISPID_OPTIONS_COL (DISPID_NORMAL_FIRST+500) #define DISPID_IMG (DISPID_IMGBASE+1000) @@ -2517,6 +2521,24 @@ #define DISPID_IHTMLOBJECTELEMENT_VSPACE DISPID_OBJECT+12 #define DISPID_IHTMLOBJECTELEMENT_HSPACE DISPID_OBJECT+13 +/* IHTMLObjectElement2 */ +#define DISPID_IHTMLOBJECTELEMENT2_NAMEDRECORDSET DISPID_OBJECT+14 +#define DISPID_IHTMLOBJECTELEMENT2_CLASSID DISPID_OBJECT+2 +#define DISPID_IHTMLOBJECTELEMENT2_DATA DISPID_OBJECT+3 + +/* IHTMLObjectElement3 */ +#define DISPID_IHTMLOBJECTELEMENT3_ARCHIVE DISPID_OBJECT+15 +#define DISPID_IHTMLOBJECTELEMENT3_ALT DISPID_OBJECT+16 +#define DISPID_IHTMLOBJECTELEMENT3_DECLARE DISPID_OBJECT+17 +#define DISPID_IHTMLOBJECTELEMENT3_STANDBY DISPID_OBJECT+18 +#define DISPID_IHTMLOBJECTELEMENT3_BORDER DISPID_OBJECT+19 +#define DISPID_IHTMLOBJECTELEMENT3_USEMAP DISPID_OBJECT+20 + +/* IHTMLObjectElement4 */ +#define DISPID_IHTMLOBJECTELEMENT4_CONTENTDOCUMENT DISPID_IE8_OBJECT +#define DISPID_IHTMLOBJECTELEMENT4_IE8_CODEBASE DISPID_IE8_OBJECT+1 +#define DISPID_IHTMLOBJECTELEMENT4_IE8_DATA DISPID_IE8_OBJECT+2 + /* IHTMLFrameBase */ #define DISPID_IHTMLFRAMEBASE_SRC DISPID_FRAMESITE+0 #define DISPID_IHTMLFRAMEBASE_NAME STDPROPID_XOBJ_NAME diff --git a/include/mshtml.idl b/include/mshtml.idl index 1c5ef64..414f639 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -14895,6 +14895,175 @@ interface IHTMLObjectElement : IDispatch } /***************************************************************************** + * DispHTMLObjectElement interface + */ +[ + hidden, + uuid(3050f529-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLObjectElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IHTMLOBJECTELEMENT_OBJECT), hidden] + IDispatch *object(); + + [propputref, id(DISPID_IHTMLOBJECTELEMENT_RECORDSET), hidden] + void recordset(IDispatch *v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_RECORDSET), hidden] + IDispatch *recordset(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_ALIGN), displaybind, bindable] + void align(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_ALIGN), displaybind, bindable] + BSTR align(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_CODEBASE), displaybind, bindable] + void codeBase(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_CODEBASE), displaybind, bindable] + BSTR codeBase(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_CODETYPE), displaybind, bindable] + void codeType(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_CODETYPE), displaybind, bindable] + BSTR codeType(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_CODE), displaybind, bindable] + void code(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_CODE), displaybind, bindable] + BSTR code(); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_BASEHREF)] + BSTR BaseHref(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_TYPE), displaybind, bindable] + void type(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_TYPE), displaybind, bindable] + BSTR type(); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_FORM)] + IHTMLFormElement *form(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_WIDTH)] + void width(VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_WIDTH)] + VARIANT width(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_HEIGHT)] + void height(VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_HEIGHT)] + VARIANT height(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] + void onerror(VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_ONERROR), displaybind, bindable] + VARIANT onerror(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_ALTHTML)] + void altHtml(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_ALTHTML)] + BSTR altHtml(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_VSPACE)] + void vspace(long v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_VSPACE)] + long vspace(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT_HSPACE)] + void hspace(long v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT_HSPACE)] + long hspace(); + + [id(DISPID_IHTMLOBJECTELEMENT2_NAMEDRECORDSET)] + IDispatch *namedRecordset( + [in] BSTR dataMember, + [optional, in] VARIANT *hierarchy); + + [propput, id(DISPID_IHTMLOBJECTELEMENT2_CLASSID), hidden] + void classid(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT2_CLASSID), hidden] + BSTR classid(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT2_DATA), hidden] + void data(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT2_DATA), hidden] + BSTR data(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT3_ARCHIVE), displaybind, bindable] + void archive(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT3_ARCHIVE), displaybind, bindable] + BSTR archive(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT3_ALT), displaybind, bindable] + void alt(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT3_ALT), displaybind, bindable] + BSTR alt(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT3_DECLARE), displaybind, bindable] + void declare(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT3_DECLARE), displaybind, bindable] + VARIANT_BOOL declare(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT3_STANDBY), displaybind, bindable] + void standby(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT3_STANDBY), displaybind, bindable] + BSTR standby(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT3_BORDER)] + void border(VARIANT v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT3_BORDER)] + VARIANT border(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT3_USEMAP), displaybind, bindable] + void useMap(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT3_USEMAP), displaybind, bindable] + BSTR useMap(); + + [propget, id(DISPID_IHTMLOBJECTELEMENT4_CONTENTDOCUMENT)] + IDispatch *contentDocument(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT4_IE8_CODEBASE)] + void ie8_codeBase(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT4_IE8_CODEBASE)] + BSTR ie8_codeBase(); + + [propput, id(DISPID_IHTMLOBJECTELEMENT4_IE8_DATA)] + void ie8_data(BSTR v); + + [propget, id(DISPID_IHTMLOBJECTELEMENT4_IE8_DATA)] + BSTR ie8_data(); +} + +/***************************************************************************** * IHTMLFrameBase interface */ [

1 0

Yaron Shahrabani : shdoclc: Added Hebrew translation.
by Alexandre Julliard 26 Oct '10

26 Oct '10

Module: wine Branch: master Commit: f17348a9b9cac413eccb2674c8295f5cd77d8069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17348a9b9cac413eccb2674c… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Sun Oct 24 16:33:46 2010 +0200 shdoclc: Added Hebrew translation. --- dlls/shdoclc/He.rc | 251 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdoclc/Makefile.in | 1 + 2 files changed, 252 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f17348a9b9cac413eccb2…

1 0