February 2009 - Wine-commits

Nikolay Sivov : gdiplus/tests: Some tests for Image raw format value.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: df9831d60a03c4af437859be4266e82bb38d7ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9831d60a03c4af437859be4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Feb 12 04:17:55 2009 +0300 gdiplus/tests: Some tests for Image raw format value. --- dlls/gdiplus/tests/image.c | 131 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 115 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6619759..84a67d4 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <math.h> #include "initguid.h" @@ -27,6 +29,58 @@ #define expect(expected, got) ok(((UINT)got) == ((UINT)expected), "Expected %.8x, got %.8x\n", (UINT)expected, (UINT)got) +static void expect_rawformat(REFGUID expected, GpImage *img, int line, BOOL todo) +{ + GUID raw; + WCHAR bufferW[39]; + char buffer[39]; + char buffer2[39]; + GpStatus stat; + + stat = GdipGetImageRawFormat(img, &raw); + ok_(__FILE__, line)(stat == Ok, "GdipGetImageRawFormat failed with %d\n", stat); + if(stat != Ok) return; + StringFromGUID2(&raw, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); + WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer, sizeof(buffer), NULL, NULL); + StringFromGUID2(expected, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); + WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer2, sizeof(buffer2), NULL, NULL); + if(todo) + todo_wine ok_(__FILE__, line)(IsEqualGUID(&raw, expected), "Expected format %s, got %s\n", buffer2, buffer); + else + ok_(__FILE__, line)(IsEqualGUID(&raw, expected), "Expected format %s, got %s\n", buffer2, buffer); +} + +static void test_bufferrawformat(void* buff, int size, REFGUID expected, int line, BOOL todo) +{ + LPSTREAM stream; + HGLOBAL hglob; + LPBYTE data; + HRESULT hres; + GpStatus stat; + GpBitmap *bmp; + + hglob = GlobalAlloc (0, size); + data = GlobalLock (hglob); + memcpy(data, buff, size); + GlobalUnlock(hglob); data = NULL; + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok_(__FILE__, line)(hres == S_OK, "Failed to create a stream\n"); + if(hres != S_OK) return; + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok_(__FILE__, line)(stat == Ok, "Failed to create a Bitmap\n"); + if(stat != Ok){ + IStream_Release(stream); + return; + } + + expect_rawformat(expected, (GpImage*)bmp, line, todo); + + GdipDisposeImage((GpImage*)bmp); + IStream_Release(stream); +} + static void test_Scan0(void) { GpBitmap *bm; @@ -426,6 +480,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) hbm = CreateBitmap(WIDTH2, HEIGHT2, 1, 1, &buff); stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); expect(Ok, stat); + /* raw format */ + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)gpbm, __LINE__, TRUE); + expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); ok(fabs(WIDTH2 - width) < .0001, "width wrong\n"); ok(fabs(HEIGHT2 - height) < .0001, "height wrong\n"); @@ -502,10 +559,12 @@ static void test_GdipCloneImage(void) /* Create an image, clone it, delete the original, make sure the copy works */ stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); expect(Ok, stat); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bm, __LINE__, TRUE); image_src = ((GpImage*)bm); stat = GdipCloneImage(image_src, &image_dest); expect(Ok, stat); + expect_rawformat(&ImageFormatMemoryBMP, image_dest, __LINE__, TRUE); stat = GdipDisposeImage((GpImage*)bm); expect(Ok, stat); @@ -542,10 +601,6 @@ static void test_fromhicon(void) UINT dim; ImageType type; PixelFormat format; - GUID raw; - WCHAR bufferW[39]; - char buffer[39]; - char buffer2[39]; /* NULL */ stat = GdipCreateBitmapFromHICON(NULL, NULL); @@ -584,12 +639,7 @@ static void test_fromhicon(void) stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); expect(PixelFormat32bppARGB, format); /* raw format */ - stat = GdipGetImageRawFormat((GpImage*)bitmap, &raw); - StringFromGUID2(&raw, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); - WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer, sizeof(buffer), NULL, NULL); - StringFromGUID2(&ImageFormatMemoryBMP, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); - WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer2, sizeof(buffer2), NULL, NULL); - todo_wine ok(IsEqualGUID(&raw, &ImageFormatMemoryBMP), "Expected format %s, got %s\n", buffer2, buffer); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, TRUE); GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon); @@ -625,17 +675,65 @@ static void test_fromhicon(void) stat = GdipGetImagePixelFormat((GpImage*)bitmap, &format); expect(PixelFormat32bppARGB, format); /* raw format */ - stat = GdipGetImageRawFormat((GpImage*)bitmap, &raw); - StringFromGUID2(&raw, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); - WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer, sizeof(buffer), NULL, NULL); - StringFromGUID2(&ImageFormatMemoryBMP, bufferW, sizeof(bufferW)/sizeof(bufferW[0])); - WideCharToMultiByte(CP_ACP, 0, bufferW, sizeof(bufferW)/sizeof(bufferW[0]), buffer2, sizeof(buffer2), NULL, NULL); - todo_wine ok(IsEqualGUID(&raw, &ImageFormatMemoryBMP), "Expected format %s, got %s\n", buffer2, buffer); + expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)bitmap, __LINE__, TRUE); GdipDisposeImage((GpImage*)bitmap); } DestroyIcon(hIcon); } +/* 1x1 pixel png */ +static const unsigned char pngimage[285] = { +0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, +0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, +0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, +0x13,0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xd5, +0x06,0x03,0x0f,0x07,0x2d,0x12,0x10,0xf0,0xfd,0x00,0x00,0x00,0x0c,0x49,0x44,0x41, +0x54,0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59, +0xe7,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 +}; +/* 1x1 pixel gif */ +static const unsigned char gifimage[35] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, +0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, +0x01,0x00,0x3b +}; +/* 1x1 pixel bmp */ +static const unsigned char bmpimage[66] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; +/* 1x1 pixel jpg */ +static const unsigned char jpgimage[285] = { +0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, +0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, +0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, +0x0b,0x09,0x0c,0x11,0x0f,0x12,0x12,0x11,0x0f,0x11,0x11,0x13,0x16,0x1c,0x17,0x13, +0x14,0x1a,0x15,0x11,0x11,0x18,0x21,0x18,0x1a,0x1d,0x1d,0x1f,0x1f,0x1f,0x13,0x17, +0x22,0x24,0x22,0x1e,0x24,0x1c,0x1e,0x1f,0x1e,0xff,0xdb,0x00,0x43,0x01,0x05,0x05, +0x05,0x07,0x06,0x07,0x0e,0x08,0x08,0x0e,0x1e,0x14,0x11,0x14,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0xff,0xc0, +0x00,0x11,0x08,0x00,0x01,0x00,0x01,0x03,0x01,0x22,0x00,0x02,0x11,0x01,0x03,0x11, +0x01,0xff,0xc4,0x00,0x15,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0xff,0xc4,0x00,0x14,0x10,0x01,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc4, +0x00,0x14,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0xff,0xc4,0x00,0x14,0x11,0x01,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xda,0x00,0x0c,0x03,0x01, +0x00,0x02,0x11,0x03,0x11,0x00,0x3f,0x00,0xb2,0xc0,0x07,0xff,0xd9 +}; +static void test_getrawformat(void) +{ + test_bufferrawformat((void*)pngimage, sizeof(pngimage), &ImageFormatPNG, __LINE__, TRUE); + test_bufferrawformat((void*)gifimage, sizeof(gifimage), &ImageFormatGIF, __LINE__, TRUE); + test_bufferrawformat((void*)bmpimage, sizeof(bmpimage), &ImageFormatBMP, __LINE__, FALSE); + test_bufferrawformat((void*)jpgimage, sizeof(jpgimage), &ImageFormatJPEG, __LINE__, TRUE); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -660,6 +758,7 @@ START_TEST(image) test_GdipCloneImage(); test_testcontrol(); test_fromhicon(); + test_getrawformat(); GdiplusShutdown(gdiplusToken); }

1 0

Aric Stewart : msctf: Add Enable key and User key for language profile.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: bc1e27d99ab63f8674479ee9044c18f6073dda8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc1e27d99ab63f8674479ee90… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 13 08:41:13 2009 -0600 msctf: Add Enable key and User key for language profile. --- dlls/msctf/inputprocessor.c | 51 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 893a88f..3ffa4bd 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -40,6 +40,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(msctf); +static const WCHAR szwLngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; +static const WCHAR szwEnabled[] = {'E','n','a','b','l','e','d',0}; +static const WCHAR szwTipfmt[] = {'%','s','\\','%','s',0}; +static const WCHAR szwFullLangfmt[] = {'%','s','\\','%','s','\\','%','s','\\','0','x','%','0','8','x','\\','%','s',0}; + typedef struct tagInputProcessorProfiles { const ITfInputProcessorProfilesVtbl *InputProcessorProfilesVtbl; LONG refCount; @@ -53,6 +58,35 @@ static void InputProcessorProfiles_Destructor(InputProcessorProfiles *This) HeapFree(GetProcessHeap(),0,This); } +static void add_userkey( REFCLSID rclsid, LANGID langid, + REFGUID guidProfile) +{ + HKEY key; + WCHAR buf[39]; + WCHAR buf2[39]; + WCHAR fullkey[168]; + DWORD disposition = 0; + ULONG res; + + TRACE("\n"); + + StringFromGUID2(rclsid, buf, 39); + StringFromGUID2(guidProfile, buf2, 39); + sprintfW(fullkey,szwFullLangfmt,szwSystemTIPKey,buf,szwLngp,langid,buf2); + + res = RegCreateKeyExW(HKEY_CURRENT_USER,fullkey, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, &disposition); + + if (!res && disposition == REG_CREATED_NEW_KEY) + { + DWORD zero = 0x0; + RegSetValueExW(key, szwEnabled, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); + } + + if (!res) + RegCloseKey(key); +} + static HRESULT WINAPI InputProcessorProfiles_QueryInterface(ITfInputProcessorProfiles *iface, REFIID iid, LPVOID *ppvOut) { InputProcessorProfiles *This = (InputProcessorProfiles *)iface; @@ -99,13 +133,12 @@ static HRESULT WINAPI InputProcessorProfiles_Register( InputProcessorProfiles *This = (InputProcessorProfiles*)iface; HKEY tipkey; WCHAR buf[39]; - static const WCHAR fmt[] = {'%','s','\\','%','s',0}; WCHAR fullkey[68]; TRACE("(%p) %s\n",This,debugstr_guid(rclsid)); StringFromGUID2(rclsid, buf, 39); - sprintfW(fullkey,fmt,szwSystemTIPKey,buf); + sprintfW(fullkey,szwTipfmt,szwSystemTIPKey,buf); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &tipkey, NULL) != ERROR_SUCCESS) @@ -134,10 +167,9 @@ static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile( WCHAR buf[39]; WCHAR fullkey[100]; ULONG res; + DWORD disposition = 0; - static const WCHAR fmt[] = {'%','s','\\','%','s',0}; static const WCHAR fmt2[] = {'%','s','\\','0','x','%','0','8','x','\\','%','s',0}; - static const WCHAR lngp[] = {'L','a','n','g','u','a','g','e','P','r','o','f','i','l','e',0}; static const WCHAR desc[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR icnf[] = {'I','c','o','n','F','i','l','e',0}; static const WCHAR icni[] = {'I','c','o','n','I','n','d','e','x',0}; @@ -149,24 +181,29 @@ static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile( debugstr_wn(pchIconFile,cchFile),uIconIndex); StringFromGUID2(rclsid, buf, 39); - sprintfW(fullkey,fmt,szwSystemTIPKey,buf); + sprintfW(fullkey,szwTipfmt,szwSystemTIPKey,buf); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,fullkey, 0, KEY_READ | KEY_WRITE, &tipkey ) != ERROR_SUCCESS) return E_FAIL; StringFromGUID2(guidProfile, buf, 39); - sprintfW(fullkey,fmt2,lngp,langid,buf); + sprintfW(fullkey,fmt2,szwLngp,langid,buf); res = RegCreateKeyExW(tipkey,fullkey, 0, NULL, 0, KEY_READ | KEY_WRITE, - NULL, &fmtkey, NULL); + NULL, &fmtkey, &disposition); if (!res) { + DWORD zero = 0x0; RegSetValueExW(fmtkey, desc, 0, REG_SZ, (LPBYTE)pchDesc, cchDesc * sizeof(WCHAR)); RegSetValueExW(fmtkey, icnf, 0, REG_SZ, (LPBYTE)pchIconFile, cchFile * sizeof(WCHAR)); RegSetValueExW(fmtkey, icni, 0, REG_DWORD, (LPBYTE)&uIconIndex, sizeof(DWORD)); + if (disposition == REG_CREATED_NEW_KEY) + RegSetValueExW(fmtkey, szwEnabled, 0, REG_DWORD, (LPBYTE)&zero, sizeof(DWORD)); RegCloseKey(fmtkey); + + add_userkey(rclsid, langid, guidProfile); } RegCloseKey(tipkey);

1 0

Huw Davies : gdi32: Improve calculation of the character code text metrics.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: e93d3481092f7abe72cdbab066947717f5e568a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93d3481092f7abe72cdbab06… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 16 12:39:15 2009 +0000 gdi32: Improve calculation of the character code text metrics. --- dlls/gdi32/font.c | 14 ++- dlls/gdi32/freetype.c | 20 ++- dlls/gdi32/tests/font.c | 319 ++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 279 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e93d3481092f7abe72cdb…

1 0

Gerald Pfeifer : comctl32: Simplify eight TOOLBAR_ function invocations.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 9d9880bd34141c953d6101558feb347f8cc521f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9880bd34141c953d6101558… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 14 23:38:31 2009 +0100 comctl32: Simplify eight TOOLBAR_ function invocations. --- dlls/comctl32/toolbar.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cf2c78a..5ef701d 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4643,7 +4643,7 @@ TOOLBAR_SetDrawTextFlags (HWND hwnd, WPARAM wParam, LPARAM lParam) * (MSDN says that this parameter is reserved) */ static LRESULT -TOOLBAR_SetExtendedStyle (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetExtendedStyle (HWND hwnd, LPARAM lParam) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); DWORD dwOldStyle; @@ -5401,7 +5401,7 @@ TOOLBAR_Create (HWND hwnd, LPARAM lParam) static LRESULT -TOOLBAR_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_Destroy (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -5521,7 +5521,7 @@ TOOLBAR_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_GetFont (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_GetFont (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -5987,7 +5987,7 @@ TOOLBAR_CaptureChanged(HWND hwnd) } static LRESULT -TOOLBAR_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_MouseLeave (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -6460,7 +6460,7 @@ TOOLBAR_Paint (HWND hwnd, WPARAM wParam) static LRESULT -TOOLBAR_SetFocus (HWND hwnd, WPARAM wParam) +TOOLBAR_SetFocus (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -6493,7 +6493,7 @@ TOOLBAR_SetFont(HWND hwnd, WPARAM wParam, LPARAM lParam) } static LRESULT -TOOLBAR_SetRedraw (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_SetRedraw (HWND hwnd, WPARAM wParam) /***************************************************** * * Function; @@ -6522,7 +6522,7 @@ TOOLBAR_SetRedraw (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLBAR_Size (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLBAR_Size (HWND hwnd) { TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); @@ -6610,7 +6610,7 @@ TOOLBAR_StyleChanged (HWND hwnd, INT nType, const STYLESTRUCT *lpStyle) static LRESULT -TOOLBAR_SysColorChange (HWND hwnd) +TOOLBAR_SysColorChange () { COMCTL32_RefreshSysColors(); @@ -6857,7 +6857,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_SetDrawTextFlags (hwnd, wParam, lParam); case TB_SETEXTENDEDSTYLE: - return TOOLBAR_SetExtendedStyle (hwnd, wParam, lParam); + return TOOLBAR_SetExtendedStyle (hwnd, lParam); case TB_SETHOTIMAGELIST: return TOOLBAR_SetHotImageList (hwnd, wParam, lParam); @@ -6942,13 +6942,13 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_Create (hwnd, lParam); case WM_DESTROY: - return TOOLBAR_Destroy (hwnd, wParam, lParam); + return TOOLBAR_Destroy (hwnd); case WM_ERASEBKGND: return TOOLBAR_EraseBackground (hwnd, wParam, lParam); case WM_GETFONT: - return TOOLBAR_GetFont (hwnd, wParam, lParam); + return TOOLBAR_GetFont (hwnd); case WM_KEYDOWN: return TOOLBAR_KeyDown (hwnd, wParam, lParam); @@ -6974,7 +6974,7 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_MouseMove (hwnd, wParam, lParam); case WM_MOUSELEAVE: - return TOOLBAR_MouseLeave (hwnd, wParam, lParam); + return TOOLBAR_MouseLeave (hwnd); case WM_CAPTURECHANGED: return TOOLBAR_CaptureChanged(hwnd); @@ -7002,22 +7002,22 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLBAR_Paint (hwnd, wParam); case WM_SETFOCUS: - return TOOLBAR_SetFocus (hwnd, wParam); + return TOOLBAR_SetFocus (hwnd); case WM_SETFONT: return TOOLBAR_SetFont(hwnd, wParam, lParam); case WM_SETREDRAW: - return TOOLBAR_SetRedraw (hwnd, wParam, lParam); + return TOOLBAR_SetRedraw (hwnd, wParam); case WM_SIZE: - return TOOLBAR_Size (hwnd, wParam, lParam); + return TOOLBAR_Size (hwnd); case WM_STYLECHANGED: return TOOLBAR_StyleChanged (hwnd, (INT)wParam, (LPSTYLESTRUCT)lParam); case WM_SYSCOLORCHANGE: - return TOOLBAR_SysColorChange (hwnd); + return TOOLBAR_SysColorChange (); case WM_THEMECHANGED: return theme_changed (hwnd);

1 0

Hwang YunSong(황윤성) : cryptui: Updated Korean resource.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 0e21db9a3fccae3fbc74d9f85f61f40aa05febf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e21db9a3fccae3fbc74d9f85… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Feb 16 10:12:27 2009 +0900 cryptui: Updated Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 195a3f1..57e9138 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -163,6 +163,14 @@ STRINGTABLE DISCARDABLE IDS_NO "�ƴϿ�" IDS_EXPORT_SUCCEEDED "�� ." IDS_EXPORT_FAILED "�� ." + IDS_EXPORT_PRIVATE_KEY_TITLE "�� Ű" + IDS_EXPORT_PRIVATE_KEY_SUBTITLE "�� Ű�� ϰ� �ֽ��ϴ�." + IDS_EXPORT_PASSWORD_TITLE "��ȣ �Է�" + IDS_EXPORT_PASSWORD_SUBTITLE "�� Ű�� Ƹ�� ȣ�� ȣ�Ǿ��ִ� �� ϴ�." + IDS_EXPORT_PASSWORD_MISMATCH "�� ȣ�� ʽ��ϴ�." + IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "��: �� Ű�� ϴ�." + IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "��: �� Ű�� ϴ�." + } IDD_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -366,6 +374,29 @@ BEGIN -1, 115,103,195,8 END +IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "�� Ű�� ⸦ ��ϸ�, �� Ű�� ȣ�� ȣ�� Է��ϰ� �� Դϴ�.", -1, 21,1,195,23 + LTEXT "�� Ű�� ⸦ ��մϱ�?", -1, 21,24,195,15 + AUTORADIOBUTTON "��(&Y), �� Ű ��", + IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + AUTORADIOBUTTON "�ƴϿ�(&O), �� Ű �� ", + IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON + LTEXT "", IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE, 21,60,200,24 +END + +IDD_EXPORT_PASSWORD DIALOG DISCARDABLE 0,0,317,143 +CAPTION "�� " +FONT 8, "MS Shell Dlg" +BEGIN +LTEXT "��ȣ(&P):", -1, 21,1,195,10 +EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP +LTEXT "��ȣ Ȯ��(&C):", -1, 21,35,195,10 +EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP +END + IDD_EXPORT_FORMAT DIALOG DISCARDABLE 0,0,317,143 CAPTION "�� " FONT 8, "MS Shell Dlg"

1 0

Gerald Pfeifer : comctl32: Simplify fifteen tooltips function invocations.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 91df8fd59ca11d47d63e628931f040a6600234b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91df8fd59ca11d47d63e62893… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 14 00:32:52 2009 +0100 comctl32: Simplify fifteen tooltips function invocations. --- dlls/comctl32/tooltips.c | 60 +++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index d819bd4..010f3a9 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1006,7 +1006,7 @@ TOOLTIPS_CheckTool (HWND hwnd, BOOL bShowTest) static LRESULT -TOOLTIPS_Activate (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_Activate (HWND hwnd, WPARAM wParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); @@ -1023,7 +1023,7 @@ TOOLTIPS_Activate (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_AddToolA (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam; @@ -1114,7 +1114,7 @@ TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_AddToolW (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam; @@ -1280,7 +1280,7 @@ TOOLTIPS_DelToolCommon (HWND hwnd, TOOLTIPS_INFO *infoPtr, INT nTool) } static LRESULT -TOOLTIPS_DelToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_DelToolA (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam; @@ -1302,7 +1302,7 @@ TOOLTIPS_DelToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_DelToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_DelToolW (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam; @@ -1451,7 +1451,7 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_GetCurrentToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_GetCurrentToolW (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTTOOLINFOW lpToolInfo = (LPTTTOOLINFOW)lParam; @@ -1485,7 +1485,7 @@ TOOLTIPS_GetCurrentToolW (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_GetDelayTime (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_GetDelayTime (HWND hwnd, WPARAM wParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); @@ -1510,7 +1510,7 @@ TOOLTIPS_GetDelayTime (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_GetMargin (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_GetMargin (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPRECT lpRect = (LPRECT)lParam; @@ -1600,7 +1600,7 @@ TOOLTIPS_GetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam) static inline LRESULT -TOOLTIPS_GetToolCount (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_GetToolCount (HWND hwnd) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); return infoPtr->uNumTools; @@ -1608,7 +1608,7 @@ TOOLTIPS_GetToolCount (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_GetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_GetToolInfoA (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam; @@ -1717,7 +1717,7 @@ TOOLTIPS_HitTestA (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_HitTestW (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_HitTestW (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTHITTESTINFOW lptthit = (LPTTHITTESTINFOW)lParam; @@ -1800,7 +1800,7 @@ TOOLTIPS_NewToolRectW (HWND hwnd, WPARAM wParam, LPARAM lParam) static inline LRESULT -TOOLTIPS_Pop (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_Pop (HWND hwnd) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); TOOLTIPS_Hide (hwnd, infoPtr); @@ -1918,7 +1918,7 @@ TOOLTIPS_SetDelayTime (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_SetMargin (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_SetMargin (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPRECT lpRect = (LPRECT)lParam; @@ -1956,7 +1956,7 @@ TOOLTIPS_SetTipBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam) static inline LRESULT -TOOLTIPS_SetTipTextColor (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_SetTipTextColor (HWND hwnd, WPARAM wParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); @@ -2035,7 +2035,7 @@ TOOLTIPS_SetTitleW (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_SetToolInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam) +TOOLTIPS_SetToolInfoA (HWND hwnd, LPARAM lParam) { TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); LPTTTOOLINFOA lpToolInfo = (LPTTTOOLINFOA)lParam; @@ -2672,19 +2672,19 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case TTM_ACTIVATE: - return TOOLTIPS_Activate (hwnd, wParam, lParam); + return TOOLTIPS_Activate (hwnd, wParam); case TTM_ADDTOOLA: - return TOOLTIPS_AddToolA (hwnd, wParam, lParam); + return TOOLTIPS_AddToolA (hwnd, lParam); case TTM_ADDTOOLW: - return TOOLTIPS_AddToolW (hwnd, wParam, lParam); + return TOOLTIPS_AddToolW (hwnd, lParam); case TTM_DELTOOLA: - return TOOLTIPS_DelToolA (hwnd, wParam, lParam); + return TOOLTIPS_DelToolA (hwnd, lParam); case TTM_DELTOOLW: - return TOOLTIPS_DelToolW (hwnd, wParam, lParam); + return TOOLTIPS_DelToolW (hwnd, lParam); case TTM_ENUMTOOLSA: return TOOLTIPS_EnumToolsA (hwnd, wParam, lParam); @@ -2699,13 +2699,13 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_GetCurrentToolA (hwnd, wParam, lParam); case TTM_GETCURRENTTOOLW: - return TOOLTIPS_GetCurrentToolW (hwnd, wParam, lParam); + return TOOLTIPS_GetCurrentToolW (hwnd, lParam); case TTM_GETDELAYTIME: - return TOOLTIPS_GetDelayTime (hwnd, wParam, lParam); + return TOOLTIPS_GetDelayTime (hwnd, wParam); case TTM_GETMARGIN: - return TOOLTIPS_GetMargin (hwnd, wParam, lParam); + return TOOLTIPS_GetMargin (hwnd, lParam); case TTM_GETMAXTIPWIDTH: return TOOLTIPS_GetMaxTipWidth (hwnd, wParam, lParam); @@ -2723,10 +2723,10 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_GetTipTextColor (hwnd, wParam, lParam); case TTM_GETTOOLCOUNT: - return TOOLTIPS_GetToolCount (hwnd, wParam, lParam); + return TOOLTIPS_GetToolCount (hwnd); case TTM_GETTOOLINFOA: - return TOOLTIPS_GetToolInfoA (hwnd, wParam, lParam); + return TOOLTIPS_GetToolInfoA (hwnd, lParam); case TTM_GETTOOLINFOW: return TOOLTIPS_GetToolInfoW (hwnd, wParam, lParam); @@ -2735,7 +2735,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_HitTestA (hwnd, wParam, lParam); case TTM_HITTESTW: - return TOOLTIPS_HitTestW (hwnd, wParam, lParam); + return TOOLTIPS_HitTestW (hwnd, lParam); case TTM_NEWTOOLRECTA: return TOOLTIPS_NewToolRectA (hwnd, wParam, lParam); @@ -2744,7 +2744,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_NewToolRectW (hwnd, wParam, lParam); case TTM_POP: - return TOOLTIPS_Pop (hwnd, wParam, lParam); + return TOOLTIPS_Pop (hwnd); case TTM_RELAYEVENT: return TOOLTIPS_RelayEvent (hwnd, wParam, lParam); @@ -2753,7 +2753,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_SetDelayTime (hwnd, wParam, lParam); case TTM_SETMARGIN: - return TOOLTIPS_SetMargin (hwnd, wParam, lParam); + return TOOLTIPS_SetMargin (hwnd, lParam); case TTM_SETMAXTIPWIDTH: return TOOLTIPS_SetMaxTipWidth (hwnd, wParam, lParam); @@ -2762,7 +2762,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_SetTipBkColor (hwnd, wParam, lParam); case TTM_SETTIPTEXTCOLOR: - return TOOLTIPS_SetTipTextColor (hwnd, wParam, lParam); + return TOOLTIPS_SetTipTextColor (hwnd, wParam); case TTM_SETTITLEA: return TOOLTIPS_SetTitleA (hwnd, wParam, lParam); @@ -2771,7 +2771,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TOOLTIPS_SetTitleW (hwnd, wParam, lParam); case TTM_SETTOOLINFOA: - return TOOLTIPS_SetToolInfoA (hwnd, wParam, lParam); + return TOOLTIPS_SetToolInfoA (hwnd, lParam); case TTM_SETTOOLINFOW: return TOOLTIPS_SetToolInfoW (hwnd, wParam, lParam);

1 0

Michael Stefaniuc : mshtml: Remove superfluous pointer casts.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 25e90e22512e773ef756323a58f441958980b4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e90e22512e773ef756323a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 16 09:53:46 2009 +0100 mshtml: Remove superfluous pointer casts. --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 2 +- dlls/mshtml/htmlgeneric.c | 2 +- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 2 +- dlls/mshtml/htmloption.c | 2 +- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlstyle.c | 4 ++-- dlls/mshtml/htmltable.c | 2 +- dlls/mshtml/htmltablerow.c | 2 +- dlls/mshtml/htmltextnode.c | 2 +- dlls/mshtml/protocol.c | 4 ++-- dlls/mshtml/script.c | 6 +++--- dlls/mshtml/tests/dom.c | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 4809543..819c80c 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -38,7 +38,7 @@ typedef struct { const IHTMLAnchorElementVtbl *lpHTMLAnchorElementVtbl; } HTMLAnchorElement; -#define HTMLANCHOR(x) ((IHTMLAnchorElement*) &(x)->lpHTMLAnchorElementVtbl) +#define HTMLANCHOR(x) (&(x)->lpHTMLAnchorElementVtbl) #define HTMLANCHOR_THIS(iface) DEFINE_THIS(HTMLAnchorElement, HTMLAnchorElement, iface) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 623d83d..0cbfc06 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -42,7 +42,7 @@ typedef struct { nsIDOMHTMLBodyElement *nsbody; } HTMLBodyElement; -#define HTMLBODY(x) ((IHTMLBodyElement*) &(x)->lpHTMLBodyElementVtbl) +#define HTMLBODY(x) (&(x)->lpHTMLBodyElementVtbl) static BOOL variant_to_nscolor(const VARIANT *v, nsAString *nsstr) { diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 82e05b3..f29d887 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -37,7 +37,7 @@ struct HTMLCommentElement { const IHTMLCommentElementVtbl *lpIHTMLCommentElementVtbl; }; -#define HTMLCOMMENT(x) ((IHTMLCommentElement*) &(x)->lpIHTMLCommentElementVtbl) +#define HTMLCOMMENT(x) (&(x)->lpIHTMLCommentElementVtbl) #define HTMLCOMMENT_THIS(iface) DEFINE_THIS(HTMLCommentElement, IHTMLCommentElement, iface) diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index fc53ee0..07e453e 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -38,7 +38,7 @@ typedef struct { const IHTMLGenericElementVtbl *lpHTMLGenericElementVtbl; } HTMLGenericElement; -#define HTMLGENERIC(x) ((IHTMLGenericElement*) &(x)->lpHTMLGenericElementVtbl) +#define HTMLGENERIC(x) (&(x)->lpHTMLGenericElementVtbl) #define HTMLGENERIC_THIS(iface) DEFINE_THIS(HTMLGenericElement, HTMLGenericElement, iface) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index f56bc16..146432b 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -41,7 +41,7 @@ typedef struct { HTMLDocument *content_doc; } HTMLIFrame; -#define HTMLFRAMEBASE2(x) ((IHTMLFrameBase2*) &(x)->lpIHTMLFrameBase2Vtbl) +#define HTMLFRAMEBASE2(x) (&(x)->lpIHTMLFrameBase2Vtbl) #define HTMLFRAMEBASE2_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase2, iface) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index e5c0372..a2a27c8 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -39,7 +39,7 @@ typedef struct { nsIDOMHTMLImageElement *nsimg; } HTMLImgElement; -#define HTMLIMG(x) ((IHTMLImgElement*) &(x)->lpHTMLImgElementVtbl) +#define HTMLIMG(x) (&(x)->lpHTMLImgElementVtbl) #define HTMLIMG_THIS(iface) DEFINE_THIS(HTMLImgElement, HTMLImgElement, iface) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 3c85118..dd40326 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -41,7 +41,7 @@ typedef struct { } HTMLInputElement; #define HTMLINPUT(x) ((IHTMLInputElement*) &(x)->lpHTMLInputElementVtbl) -#define HTMLINPUTTEXT(x) ((IHTMLInputTextElement*) &(x)->lpHTMLInputTextElementVtbl) +#define HTMLINPUTTEXT(x) (&(x)->lpHTMLInputTextElementVtbl) #define HTMLINPUT_THIS(iface) DEFINE_THIS(HTMLInputElement, HTMLInputElement, iface) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index fc3f892..ae36a99 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -39,7 +39,7 @@ typedef struct { nsIDOMHTMLOptionElement *nsoption; } HTMLOptionElement; -#define HTMLOPTION(x) ((IHTMLOptionElement*) &(x)->lpHTMLOptionElementVtbl) +#define HTMLOPTION(x) (&(x)->lpHTMLOptionElementVtbl) #define HTMLOPTION_THIS(iface) DEFINE_THIS(HTMLOptionElement, HTMLOptionElement, iface) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 8953b09..958877a 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -39,7 +39,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; } HTMLScriptElement; -#define HTMLSCRIPT(x) ((IHTMLScriptElement*) &(x)->lpHTMLScriptElementVtbl) +#define HTMLSCRIPT(x) (&(x)->lpHTMLScriptElementVtbl) #define HTMLSCRIPT_THIS(iface) DEFINE_THIS(HTMLScriptElement, HTMLScriptElement, iface) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 18d3e31..4ff81c0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2163,7 +2163,7 @@ static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttribut if(lFlags == 1) FIXME("Parameter lFlags ignored\n"); - hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, (LPOLESTR*)&strAttributeName, 1, + hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, &strAttributeName, 1, LOCALE_USER_DEFAULT, &dispid); if(hres == S_OK) { @@ -2205,7 +2205,7 @@ static HRESULT WINAPI HTMLStyle_getAttribute(IHTMLStyle *iface, BSTR strAttribut if(lFlags == 1) FIXME("Parameter lFlags ignored\n"); - hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, (LPOLESTR*)&strAttributeName, 1, + hres = HTMLStyle_GetIDsOfNames(iface, &IID_NULL, &strAttributeName, 1, LOCALE_USER_DEFAULT, &dispid); if(hres == S_OK) { diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 9396f44..b842e90 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -40,7 +40,7 @@ typedef struct { nsIDOMHTMLTableElement *nstable; } HTMLTable; -#define HTMLTABLE(x) ((IHTMLTable*) &(x)->lpHTMLTableVtbl) +#define HTMLTABLE(x) (&(x)->lpHTMLTableVtbl) #define HTMLTABLE_THIS(iface) DEFINE_THIS(HTMLTable, HTMLTable, iface) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index e040ac0..89c7e47 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -39,7 +39,7 @@ typedef struct { nsIDOMHTMLTableRowElement *nsrow; } HTMLTableRow; -#define HTMLTABLEROW(x) ((IHTMLTableRow*) &(x)->lpHTMLTableRowVtbl) +#define HTMLTABLEROW(x) (&(x)->lpHTMLTableRowVtbl) #define HTMLTABLEROW_THIS(iface) DEFINE_THIS(HTMLTableRow, HTMLTableRow, iface) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 7619961..630d2ba 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -37,7 +37,7 @@ struct HTMLDOMTextNode { const IHTMLDOMTextNodeVtbl *lpIHTMLDOMTextNodeVtbl; }; -#define HTMLTEXT(x) ((IHTMLDOMTextNode*) &(x)->lpIHTMLDOMTextNodeVtbl) +#define HTMLTEXT(x) (&(x)->lpIHTMLDOMTextNodeVtbl) #define HTMLTEXT_THIS(iface) DEFINE_THIS(HTMLDOMTextNode, IHTMLDOMTextNode, iface) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index e5e22da..220ef8a 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -39,9 +39,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); * common ProtocolFactory implementation */ -#define PROTOCOLINFO(x) ((IInternetProtocolInfo*) &(x)->lpInternetProtocolInfoVtbl) -#define CLASSFACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) +#define CLASSFACTORY(x) (&(x)->lpClassFactoryVtbl) #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) +#define PROTOCOLINFO(x) ((IInternetProtocolInfo*) &(x)->lpInternetProtocolInfoVtbl) typedef struct { const IInternetProtocolInfoVtbl *lpInternetProtocolInfoVtbl; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index fb90b46..55636d2 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -63,9 +63,9 @@ typedef struct { } ScriptHost; #define ACTSCPSITE(x) ((IActiveScriptSite*) &(x)->lpIActiveScriptSiteVtbl) -#define ACTSCPPOLL(x) ((IActiveScriptSiteInterruptPoll*) &(x)->lpIActiveScriptSiteInterruptPollVtbl) -#define ACTSCPWIN(x) ((IActiveScriptSiteWindow*) &(x)->lpIActiveScriptSiteWindowVtbl) -#define ACTSCPDBG32(x) ((IActiveScriptSiteDebug32*) &(x)->lpIActiveScriptSiteDebug32Vtbl) +#define ACTSCPPOLL(x) (&(x)->lpIActiveScriptSiteInterruptPollVtbl) +#define ACTSCPWIN(x) (&(x)->lpIActiveScriptSiteWindowVtbl) +#define ACTSCPDBG32(x) (&(x)->lpIActiveScriptSiteDebug32Vtbl) static BOOL init_script_engine(ScriptHost *script_host) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bcb14ef..e52e33e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1798,7 +1798,7 @@ static void _test_border_styles(unsigned line, IHTMLStyle *pStyle, BSTR Name) HRESULT hres; DISPID dispid; - hres = IHTMLStyle_GetIDsOfNames(pStyle, &IID_NULL, (LPOLESTR*)&Name, 1, + hres = IHTMLStyle_GetIDsOfNames(pStyle, &IID_NULL, &Name, 1, LOCALE_USER_DEFAULT, &dispid); ok_(__FILE__,line) (hres == S_OK, "GetIDsOfNames: %08x\n", hres); if(hres == S_OK)

1 0

Michael Stefaniuc : vwin32.vxd: Remove superfluous pointer casts.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: ff2da8ec00b1075a51cb4eaa9390e1ffd591f095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2da8ec00b1075a51cb4eaa9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 16 09:53:59 2009 +0100 vwin32.vxd: Remove superfluous pointer casts. --- dlls/vwin32.vxd/vwin32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index 484639d..7e070d1 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -118,8 +118,8 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, case VWIN32_DIOC_DOS_DRIVEINFO: { CONTEXT86 cxt; - DIOC_REGISTERS *pIn = (DIOC_REGISTERS *)lpvInBuffer; - DIOC_REGISTERS *pOut = (DIOC_REGISTERS *)lpvOutBuffer; + DIOC_REGISTERS *pIn = lpvInBuffer; + DIOC_REGISTERS *pOut = lpvOutBuffer; BYTE intnum = 0; TRACE( "Control '%s': "

1 0

Michael Stefaniuc : rpcrt4: Remove superfluous pointer casts.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: e3bb1c8243154ce3a830a553cf056e162ff8e226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3bb1c8243154ce3a830a553c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 16 09:54:10 2009 +0100 rpcrt4: Remove superfluous pointer casts. --- dlls/rpcrt4/cstub.c | 2 +- dlls/rpcrt4/ndr_contexthandle.c | 4 +- dlls/rpcrt4/ndr_es.c | 4 +- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/ndr_stubless.c | 4 +- dlls/rpcrt4/rpc_binding.c | 40 +++++++++++++++++++------------------- dlls/rpcrt4/rpc_epmap.c | 22 ++++++++++---------- dlls/rpcrt4/rpc_message.c | 12 +++++----- dlls/rpcrt4/rpc_server.c | 6 ++-- dlls/rpcrt4/tests/cstub.c | 8 +++--- dlls/rpcrt4/tests/ndr_marshall.c | 16 +++++--------- 11 files changed, 58 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3bb1c8243154ce3a830a…

1 0

Michael Stefaniuc : advapi32: Remove superfluous pointer casts.
by Alexandre Julliard 16 Feb '09

16 Feb '09

Module: wine Branch: master Commit: 6a48bb42177453d80c26bcfdedf261b59552f0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a48bb42177453d80c26bcfde… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 16 09:53:37 2009 +0100 advapi32: Remove superfluous pointer casts. --- dlls/advapi32/cred.c | 10 +++++----- dlls/advapi32/crypt.c | 2 +- dlls/advapi32/security.c | 21 ++++++++++----------- dlls/advapi32/service.c | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index 9ad4fb1..0fb36e6 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -74,7 +74,7 @@ static DWORD read_credential_blob(HKEY hkey, const BYTE key_data[KEY_SIZE], struct ustring data; struct ustring key; - ret = RegQueryValueExW(hkey, wszPasswordValue, 0, &type, (LPVOID)credential_blob, + ret = RegQueryValueExW(hkey, wszPasswordValue, 0, &type, credential_blob, credential_blob_size); if (ret != ERROR_SUCCESS) return ret; @@ -460,7 +460,7 @@ static DWORD write_credential_blob(HKEY hkey, LPCWSTR target_name, DWORD type, data.Buffer = encrypted_credential_blob; SystemFunction032(&data, &key); - ret = RegSetValueExW(hkey, wszPasswordValue, 0, REG_BINARY, (LPVOID)encrypted_credential_blob, credential_blob_size); + ret = RegSetValueExW(hkey, wszPasswordValue, 0, REG_BINARY, encrypted_credential_blob, credential_blob_size); HeapFree(GetProcessHeap(), 0, encrypted_credential_blob); return ret; @@ -647,7 +647,7 @@ static DWORD get_cred_mgr_encryption_key(HKEY hkeyMgr, BYTE key_data[KEY_SIZE]) memcpy(key_data, my_key_data, KEY_SIZE); count = KEY_SIZE; - ret = RegQueryValueExW(hkeyMgr, wszEncryptionKeyValue, NULL, &type, (LPVOID)key_data, + ret = RegQueryValueExW(hkeyMgr, wszEncryptionKeyValue, NULL, &type, key_data, &count); if (ret == ERROR_SUCCESS) { @@ -668,14 +668,14 @@ static DWORD get_cred_mgr_encryption_key(HKEY hkeyMgr, BYTE key_data[KEY_SIZE]) *(DWORD *)(key_data + 4) = value; ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, - (LPVOID)key_data, KEY_SIZE); + key_data, KEY_SIZE); if (ret == ERROR_ACCESS_DENIED) { ret = open_cred_mgr_key(&hkeyMgr, TRUE); if (ret == ERROR_SUCCESS) { ret = RegSetValueExW(hkeyMgr, wszEncryptionKeyValue, 0, REG_BINARY, - (LPVOID)key_data, KEY_SIZE); + key_data, KEY_SIZE); RegCloseKey(hkeyMgr); } } diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 8ef0a5f..cae03d8 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); static HWND crypt_hWindow; #define CRYPT_Alloc(size) (LocalAlloc(LMEM_ZEROINIT, size)) -#define CRYPT_Free(buffer) (LocalFree((HLOCAL)buffer)) +#define CRYPT_Free(buffer) (LocalFree(buffer)) static inline PWSTR CRYPT_GetProvKeyName(PCWSTR pProvName) { diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4153d93..65fa0db 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -341,7 +341,7 @@ static const WCHAR SDDL_AUDIT_FAILURE[] = {'F','A',0}; const char * debugstr_sid(PSID sid) { int auth = 0; - SID * psid = (SID *)sid; + SID * psid = sid; if (psid == NULL) return "(null)"; @@ -3172,7 +3172,7 @@ VOID WINAPI BuildTrusteeWithSidA(PTRUSTEEA pTrustee, PSID pSid) pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_SID; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPSTR) pSid; + pTrustee->ptstrName = pSid; } /****************************************************************************** @@ -3186,7 +3186,7 @@ VOID WINAPI BuildTrusteeWithSidW(PTRUSTEEW pTrustee, PSID pSid) pTrustee->MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; pTrustee->TrusteeForm = TRUSTEE_IS_SID; pTrustee->TrusteeType = TRUSTEE_IS_UNKNOWN; - pTrustee->ptstrName = (LPWSTR) pSid; + pTrustee->ptstrName = pSid; } /****************************************************************************** @@ -3955,7 +3955,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, StringAcl++; /* Parse ACE account sid */ - if (ParseStringSidToSid(StringAcl, pAce ? (PSID)&pAce->SidStart : NULL, &sidlen)) + if (ParseStringSidToSid(StringAcl, pAce ? &pAce->SidStart : NULL, &sidlen)) { while (*StringAcl && *StringAcl != ')') StringAcl++; @@ -4051,7 +4051,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( { DWORD bytes; - if (!ParseStringSidToSid(tok, (PSID)lpNext, &bytes)) + if (!ParseStringSidToSid(tok, lpNext, &bytes)) goto lend; if (SecurityDescriptor) @@ -4069,7 +4069,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( { DWORD bytes; - if (!ParseStringSidToSid(tok, (PSID)lpNext, &bytes)) + if (!ParseStringSidToSid(tok, lpNext, &bytes)) goto lend; if (SecurityDescriptor) @@ -4203,8 +4203,7 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( NULL, &cBytes)) goto lend; - psd = *SecurityDescriptor = (SECURITY_DESCRIPTOR*) LocalAlloc( - GMEM_ZEROINIT, cBytes); + psd = *SecurityDescriptor = LocalAlloc(GMEM_ZEROINIT, cBytes); if (!psd) goto lend; psd->Revision = SID_REVISION; @@ -4383,7 +4382,7 @@ static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) return FALSE; } - piace = (ACCESS_ALLOWED_ACE *)pace; + piace = pace; DumpString(&openbr, 1, pwptr, plen); switch (piace->Header.AceType) { @@ -4423,7 +4422,7 @@ static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) DumpString(&semicolon, 1, pwptr, plen); /* objects not supported */ DumpString(&semicolon, 1, pwptr, plen); - if (!DumpSid((PSID)&piace->SidStart, pwptr, plen)) + if (!DumpSid(&piace->SidStart, pwptr, plen)) return FALSE; DumpString(&closebr, 1, pwptr, plen); return TRUE; @@ -5074,7 +5073,7 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, return ERROR_INVALID_SECURITY_DESCR; } - relative = (SECURITY_DESCRIPTOR_RELATIVE *)*descriptor; + relative = *descriptor; relative->Control |= SE_SELF_RELATIVE; buffer = (BYTE *)relative; offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index e0efa2b..9af7952 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1809,7 +1809,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, if (dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { - LPSERVICE_DESCRIPTIONA sd = (LPSERVICE_DESCRIPTIONA) lpInfo; + LPSERVICE_DESCRIPTIONA sd = lpInfo; SERVICE_DESCRIPTIONW sdw; sdw.lpDescription = SERV_dup( sd->lpDescription ); @@ -1820,7 +1820,7 @@ BOOL WINAPI ChangeServiceConfig2A( SC_HANDLE hService, DWORD dwInfoLevel, } else if (dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { - LPSERVICE_FAILURE_ACTIONSA fa = (LPSERVICE_FAILURE_ACTIONSA) lpInfo; + LPSERVICE_FAILURE_ACTIONSA fa = lpInfo; SERVICE_FAILURE_ACTIONSW faw; faw.dwResetPeriod = fa->dwResetPeriod;

1 0