June 2012 - Wine-Commits - list.winehq.org

Detlef Riekenberg : devenum: Do not fail with a IBindCtx (with tests).
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: a8f4364388a841b4debd5fc25e340f21dadd3623 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f4364388a841b4debd5fc25… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Jun 16 19:36:24 2012 +0200 devenum: Do not fail with a IBindCtx (with tests). --- dlls/devenum/mediacatenum.c | 12 +++++++++++- dlls/devenum/tests/devenum.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index f167feb..24d236d 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -465,9 +465,19 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToStorage(IMoniker *iface, IB *ppvObj = NULL; - if (pbc || pmkToLeft) + if (pmkToLeft) return MK_E_NOSTORAGE; + if (pbc != NULL) + { + static DWORD reported; + if (!reported) + { + FIXME("ignoring IBindCtx %p\n", pbc); + reported++; + } + } + if (IsEqualGUID(riid, &IID_IPropertyBag)) { HANDLE hkey; diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index d8cd92f..c7f765b 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -47,28 +47,24 @@ static struct category am_categories[] = { "Video compressor category", &CLSID_VideoCompressorCategory } }; -static void test_devenum(void) +static void test_devenum(IBindCtx *bind_ctx) { HRESULT res; ICreateDevEnum* create_devenum; IEnumMoniker* enum_moniker = NULL; int i; - CoInitialize(NULL); - res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); if (res != S_OK) { skip("Cannot create SystemDeviceEnum object (%x)\n", res); - CoUninitialize(); return; } - trace("\n"); - for (i = 0; i < (sizeof(am_categories) / sizeof(struct category)); i++) { - trace("%s:\n", am_categories[i].name); + if (winetest_debug > 1) + trace("%s:\n", am_categories[i].name); res = ICreateDevEnum_CreateClassEnumerator(create_devenum, am_categories[i].clsid, &enum_moniker, 0); ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); @@ -82,7 +78,7 @@ static void test_devenum(void) HRESULT hr; VariantInit(&var); - hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); if (SUCCEEDED(hr)) @@ -92,7 +88,8 @@ static void test_devenum(void) if (SUCCEEDED(hr)) { - trace(" %s\n", wine_dbgstr_w(V_UNION(&var, bstrVal))); + if (winetest_debug > 1) + trace(" %s\n", wine_dbgstr_w(V_UNION(&var, bstrVal))); VariantClear(&var); } else @@ -107,18 +104,29 @@ static void test_devenum(void) } IEnumMoniker_Release(enum_moniker); } - - trace("\n"); } ICreateDevEnum_Release(create_devenum); - - CoUninitialize(); } /* CLSID_CDeviceMoniker */ START_TEST(devenum) { - test_devenum(); + IBindCtx *bind_ctx = NULL; + HRESULT hr; + + CoInitialize(NULL); + + test_devenum(NULL); + + /* IBindCtx is allowed in IMoniker_BindToStorage (IMediaCatMoniker_BindToStorage) */ + hr = CreateBindCtx(0, &bind_ctx); + ok(hr == S_OK, "Cannot create BindCtx: (res = 0x%x)\n", hr); + if (bind_ctx) { + test_devenum(bind_ctx); + IBindCtx_Release(bind_ctx); + } + + CoUninitialize(); }

1 0

Hilko Bengen : sfnt2fnt: Fix broken .fon files on big-endian architectures.
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: fb16ce1fe092438216e878a9d5fad63d06100caa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb16ce1fe092438216e878a9d… Author: Hilko Bengen <bengen(a)hilluzination.de> Date: Mon Jun 18 23:27:49 2012 +0200 sfnt2fnt: Fix broken .fon files on big-endian architectures. --- tools/sfnt2fnt.c | 135 ++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 102 insertions(+), 33 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index df43ec0..07c82b1 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -43,6 +43,7 @@ #include "wine/unicode.h" #include "wingdi.h" +#include "basetsd.h" #include "pshpack1.h" @@ -187,11 +188,30 @@ typedef struct } FT_Version_t; static FT_Version_t FT_Version; +#include "poppack.h" + #define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] ) #define GET_BE_DWORD(ptr) ((DWORD)MAKELONG( GET_BE_WORD(&((WORD *)(ptr))[1]), \ GET_BE_WORD(&((WORD *)(ptr))[0]) )) - -#include "poppack.h" +#ifdef WORDS_BIGENDIAN +static WORD byteswap_word(WORD x) +{ + return ( ( (x & 0xff) << 8) | + ( (x & 0xff00) >> 8) ); +} +static DWORD byteswap_dword(DWORD x) +{ + return ( ( (x & 0xff) << 24) | + ( (x & 0xff00) << 8) | + ( (x & 0xff0000) >> 8) | + ( (x & 0xff000000) >> 24) ); +} +# define PUT_LE_WORD(x) byteswap_word(x) +# define PUT_LE_DWORD(x) byteswap_dword(x) +#else +# define PUT_LE_WORD(x) (x) +# define PUT_LE_DWORD(x) (x) +#endif struct fontinfo { @@ -378,7 +398,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, size_table = (bitmapSizeTable_t *)(eblc + 1); for(i = 0; i < num_sizes; i++) { - if(size_table->hori.ascender - size_table->hori.descender == ppem) + if( (signed char)size_table->hori.ascender - (signed char)size_table->hori.descender == ppem) { ascent = size_table->hori.ascender; break; @@ -570,11 +590,50 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, return info; } +static void adjust_fontinfo( FONTINFO16 * fi ) +{ + fi->dfType = PUT_LE_WORD(fi->dfType); + fi->dfPoints = PUT_LE_WORD(fi->dfPoints); + fi->dfVertRes = PUT_LE_WORD(fi->dfVertRes); + fi->dfHorizRes = PUT_LE_WORD(fi->dfHorizRes); + fi->dfAscent = PUT_LE_WORD(fi->dfAscent); + fi->dfInternalLeading = PUT_LE_WORD(fi->dfInternalLeading); + fi->dfExternalLeading = PUT_LE_WORD(fi->dfExternalLeading); + fi->dfWeight = PUT_LE_WORD(fi->dfWeight); + fi->dfPixWidth = PUT_LE_WORD(fi->dfPixWidth); + fi->dfPixHeight = PUT_LE_WORD(fi->dfPixHeight); + fi->dfAvgWidth = PUT_LE_WORD(fi->dfAvgWidth); + fi->dfMaxWidth = PUT_LE_WORD(fi->dfMaxWidth); + fi->dfWidthBytes = PUT_LE_WORD(fi->dfWidthBytes); + fi->dfAspace = PUT_LE_WORD(fi->dfAspace); + fi->dfBspace = PUT_LE_WORD(fi->dfBspace); + fi->dfCspace = PUT_LE_WORD(fi->dfCspace); + fi->dfDevice = PUT_LE_DWORD(fi->dfDevice); + fi->dfFace = PUT_LE_DWORD(fi->dfFace); + fi->dfBitsPointer = PUT_LE_DWORD(fi->dfBitsPointer); + fi->dfBitsOffset = PUT_LE_DWORD(fi->dfBitsOffset); + fi->dfFlags = PUT_LE_DWORD(fi->dfFlags); + fi->dfColorPointer = PUT_LE_DWORD(fi->dfColorPointer); +} + static void write_fontinfo( const struct fontinfo *info, FILE *fp ) { - fwrite( &info->hdr, sizeof(info->hdr), 1, fp ); - fwrite( info->dfCharTable + info->hdr.fi.dfFirstChar, sizeof(*info->dfCharTable), - ((unsigned char)info->hdr.fi.dfLastChar - (unsigned char)info->hdr.fi.dfFirstChar) + 3, fp ); + FNT_HEADER tmp_hdr; + int num_chars, i; + CHAR_TABLE_ENTRY tmp_chartable[258]; + memcpy(&tmp_hdr, &info->hdr, sizeof(info->hdr)); + tmp_hdr.dfVersion = PUT_LE_WORD(tmp_hdr.dfVersion); + tmp_hdr.dfSize = PUT_LE_DWORD(tmp_hdr.dfSize); + adjust_fontinfo(&(tmp_hdr.fi)); + fwrite( &tmp_hdr, sizeof(info->hdr), 1, fp ); + num_chars = ((unsigned char)info->hdr.fi.dfLastChar - (unsigned char)info->hdr.fi.dfFirstChar) + 3; + + memcpy(&tmp_chartable, info->dfCharTable + info->hdr.fi.dfFirstChar, num_chars * sizeof(CHAR_TABLE_ENTRY)); + for (i=0; i < num_chars; ++i) { + tmp_chartable[i].width = PUT_LE_WORD(tmp_chartable[i].width); + tmp_chartable[i].offset = PUT_LE_DWORD(tmp_chartable[i].offset); + } + fwrite( tmp_chartable, sizeof(CHAR_TABLE_ENTRY), num_chars, fp ); fwrite( info->data, info->hdr.dfSize - info->hdr.fi.dfBitsOffset, 1, fp ); } @@ -630,6 +689,7 @@ int main(int argc, char **argv) struct fontinfo **info; char *input_file; char **args; + short tmp16; args = parse_options( argc, argv ); @@ -696,21 +756,21 @@ int main(int argc, char **argv) non_resident_name_off = sizeof(MZ_hdr) + module_ref_off + sizeof(align); memset(&NE_hdr, 0, sizeof(NE_hdr)); - NE_hdr.ne_magic = 0x454e; + NE_hdr.ne_magic = PUT_LE_WORD(0x454e); NE_hdr.ne_ver = 5; NE_hdr.ne_rev = 1; - NE_hdr.ne_flags = NE_FFLAGS_LIBMODULE | NE_FFLAGS_GUI; - NE_hdr.ne_cbnrestab = non_resident_name_len; - NE_hdr.ne_segtab = sizeof(NE_hdr); - NE_hdr.ne_rsrctab = sizeof(NE_hdr); - NE_hdr.ne_restab = resident_name_off; - NE_hdr.ne_modtab = module_ref_off; - NE_hdr.ne_imptab = module_ref_off; + NE_hdr.ne_flags = PUT_LE_WORD(NE_FFLAGS_LIBMODULE | NE_FFLAGS_GUI); + NE_hdr.ne_cbnrestab = PUT_LE_WORD(non_resident_name_len); + NE_hdr.ne_segtab = PUT_LE_WORD(sizeof(NE_hdr)); + NE_hdr.ne_rsrctab = PUT_LE_WORD(sizeof(NE_hdr)); + NE_hdr.ne_restab = PUT_LE_WORD(resident_name_off); + NE_hdr.ne_modtab = PUT_LE_WORD(module_ref_off); + NE_hdr.ne_imptab = PUT_LE_WORD(module_ref_off); NE_hdr.ne_enttab = NE_hdr.ne_modtab; - NE_hdr.ne_nrestab = non_resident_name_off; - NE_hdr.ne_align = 4; + NE_hdr.ne_nrestab = PUT_LE_DWORD(non_resident_name_off); + NE_hdr.ne_align = PUT_LE_WORD(4); NE_hdr.ne_exetyp = NE_OSFLAGS_WINDOWS; - NE_hdr.ne_expver = 0x400; + NE_hdr.ne_expver = PUT_LE_WORD(0x400); fontdir_off = (non_resident_name_off + non_resident_name_len + 15) & ~0xf; font_off = (fontdir_off + fontdir_len + 15) & ~0x0f; @@ -749,34 +809,34 @@ int main(int argc, char **argv) fwrite(MZ_hdr, sizeof(MZ_hdr), 1, ofp); fwrite(&NE_hdr, sizeof(NE_hdr), 1, ofp); - align = 4; + align = PUT_LE_WORD(4); fwrite(&align, sizeof(align), 1, ofp); - rc_type.type_id = NE_RSCTYPE_FONTDIR; - rc_type.count = 1; + rc_type.type_id = PUT_LE_WORD(NE_RSCTYPE_FONTDIR); + rc_type.count = PUT_LE_WORD(1); rc_type.resloader = 0; fwrite(&rc_type, sizeof(rc_type), 1, ofp); - rc_name.offset = fontdir_off >> 4; - rc_name.length = (fontdir_len + 15) >> 4; - rc_name.flags = NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_PRELOAD; - rc_name.id = resident_name_off - sizeof("FONTDIR") - NE_hdr.ne_rsrctab; + rc_name.offset = PUT_LE_WORD(fontdir_off >> 4); + rc_name.length = PUT_LE_WORD((fontdir_len + 15) >> 4); + rc_name.flags = PUT_LE_WORD(NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_PRELOAD); + rc_name.id = PUT_LE_WORD(resident_name_off - sizeof("FONTDIR") - sizeof(NE_hdr)); rc_name.handle = 0; rc_name.usage = 0; fwrite(&rc_name, sizeof(rc_name), 1, ofp); - rc_type.type_id = NE_RSCTYPE_FONT; - rc_type.count = num_files; + rc_type.type_id = PUT_LE_WORD(NE_RSCTYPE_FONT); + rc_type.count = PUT_LE_WORD(num_files); rc_type.resloader = 0; fwrite(&rc_type, sizeof(rc_type), 1, ofp); for(res = first_res | 0x8000, i = 0; i < num_files; i++, res++) { int len = (info[i]->hdr.dfSize + 15) & ~0xf; - rc_name.offset = font_off >> 4; - rc_name.length = len >> 4; - rc_name.flags = NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_SHAREABLE | NE_SEGFLAGS_DISCARDABLE; - rc_name.id = res; + rc_name.offset = PUT_LE_WORD(font_off >> 4); + rc_name.length = PUT_LE_WORD(len >> 4); + rc_name.flags = PUT_LE_WORD(NE_SEGFLAGS_MOVEABLE | NE_SEGFLAGS_SHAREABLE | NE_SEGFLAGS_DISCARDABLE); + rc_name.id = PUT_LE_WORD(res); rc_name.handle = 0; rc_name.usage = 0; fwrite(&rc_name, sizeof(rc_name), 1, ofp); @@ -812,12 +872,21 @@ int main(int argc, char **argv) fputc(0x00, ofp); /* FONTDIR resource */ - fwrite(&num_files, sizeof(num_files), 1, ofp); + tmp16 = PUT_LE_WORD(num_files); + fwrite(&tmp16, sizeof(tmp16), 1, ofp); for(res = first_res, i = 0; i < num_files; i++, res++) { + FNT_HEADER tmp_hdr; + int sz; const char *name = get_face_name( info[i] ); - fwrite(&res, sizeof(res), 1, ofp); - fwrite(&info[i]->hdr, FIELD_OFFSET(FNT_HEADER,fi.dfBitsOffset), 1, ofp); + tmp16 = PUT_LE_WORD(res); + fwrite(&tmp16, sizeof(tmp16), 1, ofp); + sz = FIELD_OFFSET(FNT_HEADER,fi.dfBitsOffset); + memcpy(&tmp_hdr, &info[i]->hdr, sz); + tmp_hdr.dfVersion = PUT_LE_WORD(tmp_hdr.dfVersion); + tmp_hdr.dfSize = PUT_LE_DWORD(tmp_hdr.dfSize); + adjust_fontinfo(&(tmp_hdr.fi)); + fwrite(&tmp_hdr, FIELD_OFFSET(FNT_HEADER,fi.dfBitsOffset), 1, ofp); fputc(0x00, ofp); fwrite(name, strlen(name) + 1, 1, ofp); }

1 0

Andrew Eikum : hhctrl.ocx: Don't use GWLP_USERDATA to store private data.
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: 8041c9bd8eda5d8b15cfbfa4468bf6f44e5e4341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8041c9bd8eda5d8b15cfbfa44… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 19 13:22:46 2012 -0500 hhctrl.ocx: Don't use GWLP_USERDATA to store private data. --- dlls/hhctrl.ocx/help.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index fb9ea08..e42fb6d 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -227,7 +227,7 @@ static void SB_OnLButtonDown(HWND hWnd, WPARAM wParam, LPARAM lParam) static void SB_OnLButtonUp(HWND hWnd, WPARAM wParam, LPARAM lParam) { - HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, 0); POINT pt; pt.x = (short)LOWORD(lParam); @@ -278,7 +278,7 @@ static void HH_RegisterSizeBarClass(HHInfo *pHHInfo) wcex.style = 0; wcex.lpfnWndProc = SizeBar_WndProc; wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; + wcex.cbWndExtra = sizeof(LONG_PTR); wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_SIZEWE); @@ -324,7 +324,7 @@ static BOOL HH_AddSizeBar(HHInfo *pHHInfo) return FALSE; /* store the pointer to the HH info struct */ - SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)pHHInfo); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)pHHInfo); pHHInfo->hwndSizeBar = hWnd; return TRUE; @@ -428,7 +428,7 @@ static void ResizeTabChild(HHInfo *info, int tab) static LRESULT Child_OnSize(HWND hwnd) { - HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, 0); RECT rect; if(!info || hwnd != info->WinType.hwndNavigation) @@ -447,7 +447,7 @@ static LRESULT Child_OnSize(HWND hwnd) static LRESULT OnTabChange(HWND hwnd) { - HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hwnd, 0); int tab_id, tab_index, i; TRACE("%p\n", hwnd); @@ -586,7 +586,7 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP case WM_SIZE: return Child_OnSize(hWnd); case WM_NOTIFY: { - HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, 0); NMHDR *nmhdr = (NMHDR*)lParam; switch(nmhdr->code) { @@ -669,7 +669,7 @@ static void HH_RegisterChildWndClass(HHInfo *pHHInfo) wcex.style = 0; wcex.lpfnWndProc = Child_WndProc; wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; + wcex.cbWndExtra = sizeof(LONG_PTR); wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); @@ -735,7 +735,7 @@ static void DisplayPopupMenu(HHInfo *info) static void TB_OnClick(HWND hWnd, DWORD dwID) { - HHInfo *info = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *info = (HHInfo *)GetWindowLongPtrW(hWnd, 0); switch (dwID) { @@ -967,7 +967,7 @@ static BOOL HH_AddNavigationPane(HHInfo *info) if (!hWnd) return FALSE; - SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)info); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)info); hwndTabCtrl = CreateWindowExW(dwExStyles, WC_TABCONTROLW, szEmpty, dwStyles | WS_VISIBLE, 0, TAB_TOP_PADDING, @@ -1039,7 +1039,7 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) return FALSE; /* store the pointer to the HH info struct */ - SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)pHHInfo); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)pHHInfo); ShowWindow(hWnd, SW_SHOW); UpdateWindow(hWnd); @@ -1151,7 +1151,7 @@ static BOOL AddSearchTab(HHInfo *info) info->search.hwndContainer = hwndContainer; info->tabs[TAB_SEARCH].hwnd = hwndContainer; - SetWindowLongPtrW(hwndContainer, GWLP_USERDATA, (LONG_PTR)info); + SetWindowLongPtrW(hwndContainer, 0, (LONG_PTR)info); ResizeTabChild(info, TAB_SEARCH); @@ -1191,7 +1191,7 @@ static void ResizePopupChild(HHInfo *info) static LRESULT CALLBACK HelpPopup_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - HHInfo *info = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *info = (HHInfo *)GetWindowLongPtrW(hWnd, 0); switch (message) { @@ -1221,7 +1221,7 @@ static LRESULT CALLBACK PopupChild_WndProc(HWND hWnd, UINT message, WPARAM wPara switch(nmhdr->code) { case NM_DBLCLK: { - HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, 0); IndexSubItem *iter; if(info == 0 || lParam == 0) @@ -1234,7 +1234,7 @@ static LRESULT CALLBACK PopupChild_WndProc(HWND hWnd, UINT message, WPARAM wPara return 0; } case NM_RETURN: { - HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *info = (HHInfo*)GetWindowLongPtrW(hWnd, 0); IndexSubItem *iter; LVITEMW lvItem; @@ -1276,7 +1276,7 @@ static BOOL AddIndexPopup(HHInfo *info) wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = HelpPopup_WndProc; wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; + wcex.cbWndExtra = sizeof(LONG_PTR); wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); @@ -1290,7 +1290,7 @@ static BOOL AddIndexPopup(HHInfo *info) wcex.style = 0; wcex.lpfnWndProc = PopupChild_WndProc; wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; + wcex.cbWndExtra = sizeof(LONG_PTR); wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); @@ -1338,8 +1338,8 @@ static BOOL AddIndexPopup(HHInfo *info) info->popup.hwndCallback = hwndCallback; info->popup.hwndPopup = hwndPopup; info->popup.hwndList = hwndList; - SetWindowLongPtrW(hwndPopup, GWLP_USERDATA, (LONG_PTR)info); - SetWindowLongPtrW(hwndCallback, GWLP_USERDATA, (LONG_PTR)info); + SetWindowLongPtrW(hwndPopup, 0, (LONG_PTR)info); + SetWindowLongPtrW(hwndCallback, 0, (LONG_PTR)info); ResizePopupChild(info); ShowWindow(hwndList, SW_SHOW); @@ -1382,7 +1382,7 @@ static void ExpandContract(HHInfo *pHHInfo) static LRESULT Help_OnSize(HWND hWnd) { - HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA); + HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, 0); DWORD dwSize; RECT rc; @@ -1423,7 +1423,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA case WM_SIZE: return Help_OnSize(hWnd); case WM_CLOSE: - ReleaseHelpViewer((HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA)); + ReleaseHelpViewer((HHInfo *)GetWindowLongPtrW(hWnd, 0)); return 0; case WM_DESTROY: if(hh_process) @@ -1454,7 +1454,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = Help_WndProc; wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; + wcex.cbWndExtra = sizeof(LONG_PTR); wcex.hInstance = hhctrl_hinstance; wcex.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); @@ -1518,7 +1518,7 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) UpdateWindow(hWnd); /* store the pointer to the HH info struct */ - SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)info); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)info); info->WinType.hwndHelp = hWnd; return TRUE;

1 0

Lucas Zawacki : joy.cpl: Hardcode axis name strings that were in joy.rc.
by Alexandre Julliard June 19, 2012

June 19, 2012

1 0

Dmitry Timoshkov : gdiplus: Create a copy of the source stream when loading an image.
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: 9e12bc0175f6a65ee45ebce1ca519eac6f5ca501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e12bc0175f6a65ee45ebce1c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 19 16:51:54 2012 +0900 gdiplus: Create a copy of the source stream when loading an image. --- dlls/gdiplus/gdiplus_private.h | 3 ++- dlls/gdiplus/image.c | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 322fb02..9ac9be2 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -260,7 +260,8 @@ struct GpAdustableArrowCap{ }; struct GpImage{ - IPicture* picture; + IPicture *picture; + IStream *stream; /* a copy of the source stream */ ImageType type; GUID format; UINT flags; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 8ad1d24..7da052f 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1779,6 +1779,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->height = height; (*bitmap)->format = format; (*bitmap)->image.picture = NULL; + (*bitmap)->image.stream = NULL; (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; (*bitmap)->bits = bits; @@ -2029,6 +2030,8 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) } if (image->picture) IPicture_Release(image->picture); + if (image->stream) + IStream_Release(image->stream); GdipFree(image->palette_entries); image->type = ~0; GdipFree(image); @@ -2704,6 +2707,7 @@ end: bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; + bitmap->image.stream = stream; } return status; @@ -2771,6 +2775,7 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid *image = GdipAlloc(sizeof(GpMetafile)); if(!*image) return OutOfMemory; (*image)->type = ImageTypeMetafile; + (*image)->stream = stream; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; (*image)->frame_count = 1; @@ -2857,21 +2862,42 @@ static GpStatus get_decoder_info(IStream* stream, const struct image_codec **res return GenericError; } -GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) +GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *source, GpImage **image) { GpStatus stat; LARGE_INTEGER seek; HRESULT hr; const struct image_codec *codec=NULL; + IStream *stream; + + hr = IStream_Clone(source, &stream); + if (FAILED(hr)) + { + STATSTG statstg; + + hr = IStream_Stat(source, &statstg, STATFLAG_NOOPEN); + if (FAILED(hr)) return hresult_to_status(hr); + + stat = GdipCreateStreamOnFile(statstg.pwcsName, GENERIC_READ, &stream); + if(stat != Ok) return stat; + } /* choose an appropriate image decoder */ stat = get_decoder_info(stream, &codec); - if (stat != Ok) return stat; + if (stat != Ok) + { + IStream_Release(stream); + return stat; + } /* seek to the start of the stream */ seek.QuadPart = 0; hr = IStream_Seek(stream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) return hresult_to_status(hr); + if (FAILED(hr)) + { + IStream_Release(stream); + return hresult_to_status(hr); + } /* call on the image decoder to do the real work */ stat = codec->decode_func(stream, &codec->info.Clsid, 0, image); @@ -2880,8 +2906,10 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) if (stat == Ok) { memcpy(&(*image)->format, &codec->info.FormatID, sizeof(GUID)); + return Ok; } + IStream_Release(stream); return stat; }

1 0

Dmitry Timoshkov : gdiplus: Add active frame parameter to the WIC decoder interface.
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: 8b1bbd4fe51f921c4b9c58e6c33b04476a626bd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1bbd4fe51f921c4b9c58e6c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 19 16:51:45 2012 +0900 gdiplus: Add active frame parameter to the WIC decoder interface. --- dlls/gdiplus/image.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4fba788..8ad1d24 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2583,7 +2583,7 @@ static const PixelFormat wic_gdip_formats[] = { PixelFormat32bppPARGB, }; -static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { GpStatus status=Ok; GpBitmap *bitmap; @@ -2609,8 +2609,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, GpImage **imag if (SUCCEEDED(hr)) { IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); - /* FIXME: set current frame */ - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); } if (SUCCEEDED(hr)) /* got frame */ @@ -2704,23 +2703,23 @@ end: /* Native GDI+ used to be smarter, but since Win7 it just sets these flags. */ bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; bitmap->image.frame_count = frame_count; - bitmap->image.current_frame = 0; + bitmap->image.current_frame = active_frame; } return status; } -static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICIcoDecoder, image); + return decode_image_wic(stream, &CLSID_WICIcoDecoder, active_frame, image); } -static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { GpStatus status; GpBitmap* bitmap; - status = decode_image_wic(stream, &CLSID_WICBmpDecoder, image); + status = decode_image_wic(stream, &CLSID_WICBmpDecoder, active_frame, image); bitmap = (GpBitmap*)*image; @@ -2733,27 +2732,27 @@ static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, GpImage **imag return status; } -static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICJpegDecoder, image); + return decode_image_wic(stream, &CLSID_WICJpegDecoder, active_frame, image); } -static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICPngDecoder, image); + return decode_image_wic(stream, &CLSID_WICPngDecoder, active_frame, image); } -static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICGifDecoder, image); + return decode_image_wic(stream, &CLSID_WICGifDecoder, active_frame, image); } -static GpStatus decode_image_tiff(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_tiff(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICTiffDecoder, image); + return decode_image_wic(stream, &CLSID_WICTiffDecoder, active_frame, image); } -static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid, GpImage **image) +static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { IPicture *pic; @@ -2789,7 +2788,7 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid typedef GpStatus (*encode_image_func)(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params); -typedef GpStatus (*decode_image_func)(IStream *stream, REFCLSID clsid, GpImage** image); +typedef GpStatus (*decode_image_func)(IStream *stream, REFCLSID clsid, UINT active_frame, GpImage **image); typedef struct image_codec { ImageCodecInfo info; @@ -2875,7 +2874,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) if (FAILED(hr)) return hresult_to_status(hr); /* call on the image decoder to do the real work */ - stat = codec->decode_func(stream, &codec->info.Clsid, image); + stat = codec->decode_func(stream, &codec->info.Clsid, 0, image); /* take note of the original data format */ if (stat == Ok)

1 0

Dmitry Timoshkov : gdiplus: Fix parameter order in expect() calls.
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: 9de1d861320a3a5796cf31c4fea6c914b40c6e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de1d861320a3a5796cf31c4f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 19 16:51:34 2012 +0900 gdiplus: Fix parameter order in expect() calls. --- dlls/gdiplus/tests/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index e22d45a..635b633 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -432,14 +432,14 @@ static void test_SavingImages(void) if (stat != Ok) goto cleanup; stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0); - expect(stat, Ok); + expect(Ok, stat); GdipDisposeImage((GpImage*)bm); bm = 0; /* re-load and check image stats */ stat = GdipLoadImageFromFile(filename, (GpImage**)&bm); - expect(stat, Ok); + expect(Ok, stat); if (stat != Ok) goto cleanup; stat = GdipGetImageDimension((GpImage*)bm, &w, &h);

1 0

Dmitry Timoshkov : gdiplus: Add a test for creating a nonexistent font with GdipCreateFontFromLogfont.
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: eeb52474c1a04a9f8f75ab7602d4113bae6d0fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb52474c1a04a9f8f75ab760… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 19 12:05:17 2012 +0900 gdiplus: Add a test for creating a nonexistent font with GdipCreateFontFromLogfont. --- dlls/gdiplus/tests/font.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 982db39..03f5769 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -105,6 +105,11 @@ static void test_logfont(void) memset(&lfa, 0, sizeof(LOGFONTA)); memset(&lfa2, 0xff, sizeof(LOGFONTA)); + lstrcpyA(lfa.lfFaceName, "Nonexistent font"); + stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); + ok(stat == NotTrueTypeFont || broken(stat == FileNotFound), /* before XP */ + "expected NotTrueTypeFont, got %d\n", stat); + /* empty FaceName */ lfa.lfFaceName[0] = 0; stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font);

1 0

Dmitry Timoshkov : gdiplus: GdipCreateFontFromLogfont also returns NotTrueTypeFont for a not present font .
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: 3439f286791f9c3947f6a765853e2391e29167e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3439f286791f9c3947f6a7658… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 19 12:05:30 2012 +0900 gdiplus: GdipCreateFontFromLogfont also returns NotTrueTypeFont for a not present font. --- dlls/gdiplus/tests/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 0d31365..3cb33c7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1970,7 +1970,7 @@ static void test_GdipDrawString(void) expect(Ok, status); status = GdipCreateFontFromLogfontA(hdc, &logfont, &fnt); - if (status == FileNotFound) + if (status == NotTrueTypeFont || status == FileNotFound) { skip("Arial not installed.\n"); return;

1 0

Hans Leidekker : include: Fix the definition of IWbemClassObject::GetNames.
by Alexandre Julliard June 19, 2012

June 19, 2012

Module: wine Branch: master Commit: 612f380ad0b8880b945548419f8db43b21386e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=612f380ad0b8880b945548419… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:19:19 2012 +0200 include: Fix the definition of IWbemClassObject::GetNames. --- dlls/wbemprox/class.c | 2 +- include/wbemcli.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a1fbb70..423e754 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -312,7 +312,7 @@ static HRESULT WINAPI class_object_GetNames( LPCWSTR wszQualifierName, LONG lFlags, VARIANT *pQualifierVal, - SAFEARRAY *pNames ) + SAFEARRAY **pNames ) { FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszQualifierName), lFlags, pQualifierVal, pNames); return E_NOTIMPL; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index a339ab5..a023491 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -476,7 +476,7 @@ interface IWbemClassObject : IUnknown [in,string] LPCWSTR wszQualifierName, [in] long lFlags, [in] VARIANT *pQualifierVal, - [out] SAFEARRAY *pNames); + [out] SAFEARRAY **pNames); HRESULT BeginEnumeration( [in] long lEnumFlags);

1 0