wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Matteo Bruni : d3dcompiler: Variables and functions can' t have the same name.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 1252930bc0a2b12604bc8e5ae350e985b36e6514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1252930bc0a2b12604bc8e5ae… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:21 2012 +0200 d3dcompiler: Variables and functions can't have the same name. --- dlls/d3dcompiler_43/hlsl.y | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index b421402..eedf357 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -132,8 +132,17 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) "modifier '%s' invalid for local variables", debug_modifiers(invalid)); } } + else + { + if (find_function(decl->name)) + { + hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_ERROR, + "redefinition of '%s'", decl->name); + return FALSE; + } + } ret = add_declaration(hlsl_ctx.cur_scope, decl, local); - if (ret == FALSE) + if (!ret) { struct hlsl_ir_var *old = get_variable(hlsl_ctx.cur_scope, decl->name); @@ -381,6 +390,13 @@ func_declaration: func_prototype compound_statement func_prototype: var_modifiers type var_identifier '(' parameters ')' semantic { + if (get_variable(hlsl_ctx.globals, $3)) + { + hlsl_report_message(hlsl_ctx.source_file, @3.first_line, @3.first_column, + HLSL_LEVEL_ERROR, "redefinition of '%s'\n", $3); + return 1; + } + $$ = new_func_decl($3, $2, $5); if (!$$) {

1 0

Matteo Bruni : d3dcompiler: Pass the complete location to add_func_parameter().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 7ebab8c4f75cffb64e2d31d5a270da42666d4356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ebab8c4f75cffb64e2d31d5a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:20 2012 +0200 d3dcompiler: Pass the complete location to add_func_parameter(). --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 ++- dlls/d3dcompiler_43/hlsl.y | 15 ++++++++++----- dlls/d3dcompiler_43/utils.c | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 194ed25..21ed57e 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -882,7 +882,8 @@ static inline struct hlsl_ir_constructor *constructor_from_node(const struct hls BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, unsigned int line) DECLSPEC_HIDDEN; +BOOL add_func_parameter(struct list *list, struct parse_parameter *param, + const struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index f7f62fe..b421402 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -430,9 +430,12 @@ parameters: scope_start param_list: parameter { + struct source_location loc; + $$ = d3dcompiler_alloc(sizeof(*$$)); list_init($$); - if (!add_func_parameter($$, &$1, hlsl_ctx.line_no)) + set_location(&loc, &@1); + if (!add_func_parameter($$, &$1, &loc)) { ERR("Error adding function parameter %s.\n", $1.name); set_parse_status(&hlsl_ctx.status, PARSE_ERR); @@ -441,12 +444,14 @@ param_list: parameter } | param_list ',' parameter { + struct source_location loc; + $$ = $1; - if (!add_func_parameter($$, &$3, hlsl_ctx.line_no)) + set_location(&loc, &@3); + if (!add_func_parameter($$, &$3, &loc)) { - hlsl_message("Line %u: duplicate parameter %s.\n", - hlsl_ctx.line_no, $3.name); - set_parse_status(&hlsl_ctx.status, PARSE_ERR); + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "duplicate parameter %s", $3.name); return 1; } } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index c4dd2e8..ce95bb5 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -805,7 +805,7 @@ void free_declaration(struct hlsl_ir_var *decl) d3dcompiler_free(decl); } -BOOL add_func_parameter(struct list *list, struct parse_parameter *param, unsigned int line) +BOOL add_func_parameter(struct list *list, struct parse_parameter *param, const struct source_location *loc) { struct hlsl_ir_var *decl = d3dcompiler_alloc(sizeof(*decl)); @@ -816,7 +816,7 @@ BOOL add_func_parameter(struct list *list, struct parse_parameter *param, unsign } decl->node.type = HLSL_IR_VAR; decl->node.data_type = param->type; - decl->node.loc.line = line; + decl->node.loc = *loc; decl->name = param->name; decl->semantic = param->semantic; decl->modifiers = param->modifiers;

1 0

Matteo Bruni : d3dcompiler: Store location information in constants, variable dereferences and constructors.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: be350b0bb39ee1f2bc76237cbacf7ea8d788752e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be350b0bb39ee1f2bc76237cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 16 20:39:19 2012 +0200 d3dcompiler: Store location information in constants, variable dereferences and constructors. --- dlls/d3dcompiler_43/hlsl.y | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cf0c7b5..f7f62fe 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -799,6 +799,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("float", HLSL_CLASS_SCALAR, HLSL_TYPE_FLOAT, 1, 1); c->v.value.f[0] = $1; $$ = &c->node; @@ -812,6 +813,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("int", HLSL_CLASS_SCALAR, HLSL_TYPE_INT, 1, 1); c->v.value.i[0] = $1; $$ = &c->node; @@ -825,6 +827,7 @@ primary_expr: C_FLOAT return -1; } c->node.type = HLSL_IR_CONSTANT; + set_location(&c->node.loc, &yylloc); c->node.data_type = new_hlsl_type("bool", HLSL_CLASS_SCALAR, HLSL_TYPE_BOOL, 1, 1); c->v.value.b[0] = $1; $$ = &c->node; @@ -832,7 +835,13 @@ primary_expr: C_FLOAT | variable { struct hlsl_ir_deref *deref = new_var_deref($1); - $$ = deref ? &deref->node : NULL; + if (deref) + { + $$ = &deref->node; + set_location(&$$->loc, &@1); + } + else + $$ = NULL; } | '(' expr ')' { @@ -888,6 +897,7 @@ postfix_expr: primary_expr constructor = d3dcompiler_alloc(sizeof(*constructor)); constructor->node.type = HLSL_IR_CONSTRUCTOR; + set_location(&constructor->node.loc, &@3); constructor->node.data_type = $2; constructor->arguments = $4;

1 0

Alexandre Julliard : opengl32/tests: Run more tests against the GDI renderer.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 55f9e9ff4ff27523355ef1e1579849989d8f9f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f9e9ff4ff27523355ef1e15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 00:22:24 2012 +0200 opengl32/tests: Run more tests against the GDI renderer. --- dlls/opengl32/tests/opengl.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 77b4cf5..53e9863 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -388,7 +388,6 @@ static void test_makecurrent(HDC winhdc) { BOOL ret; HGLRC hglrc; - DWORD error; hglrc = wglCreateContext(winhdc); ok( hglrc != 0, "wglCreateContext failed\n" ); @@ -411,9 +410,9 @@ static void test_makecurrent(HDC winhdc) SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, NULL ); ok( ret, "wglMakeCurrent failed\n" ); @@ -428,9 +427,9 @@ static void test_makecurrent(HDC winhdc) SetLastError( 0xdeadbeef ); ret = wglMakeCurrent( NULL, NULL ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - error = GetLastError(); - ok( error == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got error=%x\n", error); + ok( !ret || broken(ret) /* nt4 */, "wglMakeCurrent succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_HANDLE, + "Expected ERROR_INVALID_HANDLE, got error=%x\n", GetLastError() ); ret = wglMakeCurrent( winhdc, hglrc ); ok( ret, "wglMakeCurrent failed\n" ); @@ -808,6 +807,7 @@ static void test_getprocaddress(HDC hdc) if (!gl_extension_supported(extensions, "GL_ARB_multitexture")) { skip("skipping test because lack of GL_ARB_multitexture support\n"); + return; } func = wglGetProcAddress("glActiveTextureARB"); @@ -1478,7 +1478,10 @@ START_TEST(opengl) * any WGL call :( On Wine this would work but not on real Windows because there can be different implementations (software, ICD, MCD). */ init_functions(); + test_getprocaddress(hdc); test_deletecontext(hwnd, hdc); + test_makecurrent(hdc); + /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) { @@ -1486,8 +1489,6 @@ START_TEST(opengl) return; } - test_getprocaddress(hdc); - test_makecurrent(hdc); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc);

1 0

Lucas Zawacki : joy.cpl: Correct joystick testing thread behavior.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 6e60adbf5b4d2f02475e231553149c2f9cc97acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e60adbf5b4d2f02475e23155… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 16 14:05:39 2012 -0300 joy.cpl: Correct joystick testing thread behavior. --- dlls/joy.cpl/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index eb8f982..e9b3a72 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -424,9 +424,11 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM } break; - case PSN_RESET: + case PSN_RESET: /* intentional fall-through */ + case PSN_KILLACTIVE: /* Stop input thread */ data->stop = TRUE; + MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, 0); CloseHandle(thread); break; }

1 0

Hans Leidekker : msi/tests: Mark some test results as broken.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: cbd83d0307d601e3a0689e0e8b836b3b6afb89ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd83d0307d601e3a0689e0e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 16 18:40:40 2012 +0200 msi/tests: Mark some test results as broken. --- dlls/msi/tests/install.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index e41bef4..9508ea8 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6720,7 +6720,7 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "32-bit component key not removed\n"); + ok(res == ERROR_FILE_NOT_FOUND || broken(!res), "32-bit component key not removed\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n"); @@ -6747,7 +6747,7 @@ static void test_mixed_package(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "32-bit component key not removed\n"); + ok(res == ERROR_FILE_NOT_FOUND || broken(!res), "32-bit component key not removed\n"); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "64-bit component key not removed\n");

1 0

Dmitry Timoshkov : gdiplus: Fix palette flags for a not indexed 1-bpp image .
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: ebf31c0ac62c6de409af782df1f673583c5b129d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf31c0ac62c6de409af782df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 11:50:05 2012 +0900 gdiplus: Fix palette flags for a not indexed 1-bpp image. --- dlls/gdiplus/image.c | 3 +++ dlls/gdiplus/tests/image.c | 1 - 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 18df589..f7bfd1a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2983,6 +2983,7 @@ static GpStatus decode_image_wic(IStream* stream, REFCLSID clsid, UINT active_fr gdip_format = PixelFormat32bppARGB; IWICBitmapSource_Release(bmp_source); } + TRACE("%s => %#x\n", wine_dbgstr_guid(&wic_format), gdip_format); } if (SUCCEEDED(hr)) /* got source */ @@ -3063,6 +3064,8 @@ end: bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; bitmap->image.stream = stream; + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) + bitmap->image.palette_flags = 0; /* Pin the source stream */ IStream_AddRef(stream); } diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a735172..69970ec 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3340,7 +3340,6 @@ static void test_tiff_palette(void) status = GdipGetImagePalette(image, &palette.pal, size); expect(Ok, status); -todo_wine expect(0, palette.pal.Flags); expect(2, palette.pal.Count); if (palette.pal.Count == 2)

1 0

Dmitry Timoshkov : gdiplus: Make sure that 1bpp bitmap images get loaded in native format.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: eca107412c581c28dc198d0808949bc999197872 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca107412c581c28dc198d080… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 11:47:57 2012 +0900 gdiplus: Make sure that 1bpp bitmap images get loaded in native format. --- dlls/gdiplus/image.c | 4 ++++ dlls/gdiplus/tests/image.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9b36280..18df589 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2908,6 +2908,8 @@ GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR* filename,GpImage * } static const WICPixelFormatGUID * const wic_pixel_formats[] = { + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, @@ -2917,6 +2919,8 @@ static const WICPixelFormatGUID * const wic_pixel_formats[] = { }; static const PixelFormat wic_gdip_formats[] = { + PixelFormat1bppIndexed, + PixelFormat1bppIndexed, PixelFormat16bppRGB555, PixelFormat24bppRGB, PixelFormat32bppRGB, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 1f5ace1..a735172 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3326,7 +3326,6 @@ static void test_tiff_palette(void) status = GdipGetImagePixelFormat(image, &format); expect(Ok, status); -todo_wine ok(format == PixelFormat1bppIndexed, "expected PixelFormat1bppIndexed, got %#x\n", format); status = GdipGetImagePaletteSize(image, &size); @@ -3337,13 +3336,12 @@ todo_wine GdipDisposeImage(image); return; } -todo_wine expect(sizeof(ColorPalette) + sizeof(ARGB), size); status = GdipGetImagePalette(image, &palette.pal, size); expect(Ok, status); - expect(0, palette.pal.Flags); todo_wine + expect(0, palette.pal.Flags); expect(2, palette.pal.Count); if (palette.pal.Count == 2) {

1 0

Bruno Jesus : user32/tests: Update DlgDirList tests.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 81cbf29ef3f9a0164e861fdb908bb56e4edba22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cbf29ef3f9a0164e861fdb9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jul 12 20:41:16 2012 -0300 user32/tests: Update DlgDirList tests. Based on original patch from Christian Lupien. --- dlls/user32/tests/listbox.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 1d6e8a3..4be7604 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1335,6 +1335,27 @@ static void test_listbox_dlgdir(void) ok (itemCount == itemCount_justDrives + itemCount_allDirs, "DlgDirList() incorrectly filled the listbox!\n"); + /* Test behavior when loading folders from root with and without wildcard */ + strcpy(pathBuffer, "C:\\"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\ folders\n"); + todo_wine ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + strcpy(pathBuffer, "C:\\*"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + ok(res || broken(!res) /* NT4/W2K */, "DlgDirList failed to list C:\\* folders\n"); + ok(!strcmp(pathBuffer, "*") || broken(!res) /* NT4/W2K */, + "DlgDirList set the invalid path spec '%s', expected '*'\n", pathBuffer); + + /* Try loading files from an invalid folder */ + SetLastError(0xdeadbeef); + strcpy(pathBuffer, "C:\\INVALID$$DIR"); + res = DlgDirList(hWnd, pathBuffer, ID_TEST_LISTBOX, 0, DDL_DIRECTORY | DDL_EXCLUSIVE); + todo_wine ok(!res, "DlgDirList should have failed with 0 but %d was returned\n", res); + todo_wine ok(GetLastError() == ERROR_NO_WILDCARD_CHARACTERS, + "GetLastError should return 0x589, got 0x%X\n",GetLastError()); + /* Now test DlgDirSelectEx() in normal operation */ /* Fill with everything - drives, directory and all plain files. */

1 0

Erich Hoover : hhctrl.ocx: Permit WS_CHILD help windows.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 2686b9b5880e2b9b27c131dd93d1c85743386253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2686b9b5880e2b9b27c131dd9… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jul 12 10:25:07 2012 -0600 hhctrl.ocx: Permit WS_CHILD help windows. --- dlls/hhctrl.ocx/help.c | 16 ++++++++++++---- dlls/hhctrl.ocx/hhctrl.c | 4 ++-- dlls/hhctrl.ocx/hhctrl.h | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 2f2fba1..ed5528c 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1585,7 +1585,7 @@ static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPA static BOOL HH_CreateHelpWindow(HHInfo *info) { - HWND hWnd; + HWND hWnd, parent = 0; RECT winPos = info->WinType.rcWindowPos; WNDCLASSEXW wcex; DWORD dwStyles, dwExStyles; @@ -1613,7 +1613,11 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) /* Read in window parameters if available */ if (info->WinType.fsValidMembers & HHWIN_PARAM_STYLES) - dwStyles = info->WinType.dwStyles | WS_OVERLAPPEDWINDOW; + { + dwStyles = info->WinType.dwStyles; + if (!(info->WinType.dwStyles & WS_CHILD)) + dwStyles |= WS_OVERLAPPEDWINDOW; + } else dwStyles = WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; @@ -1655,8 +1659,11 @@ static BOOL HH_CreateHelpWindow(HHInfo *info) caption = info->WinType.pszCaption; if (!*caption) caption = info->pCHMInfo->defTitle; + if (info->WinType.dwStyles & WS_CHILD) + parent = info->WinType.hwndCaller; + hWnd = CreateWindowExW(dwExStyles, windowClassW, caption, - dwStyles, x, y, width, height, NULL, NULL, hhctrl_hinstance, NULL); + dwStyles, x, y, width, height, parent, NULL, hhctrl_hinstance, NULL); if (!hWnd) return FALSE; @@ -1773,7 +1780,7 @@ void ReleaseHelpViewer(HHInfo *info) OleUninitialize(); } -HHInfo *CreateHelpViewer(LPCWSTR filename) +HHInfo *CreateHelpViewer(LPCWSTR filename, HWND caller) { HHInfo *info = heap_alloc_zero(sizeof(HHInfo)); int i; @@ -1796,6 +1803,7 @@ HHInfo *CreateHelpViewer(LPCWSTR filename) ReleaseHelpViewer(info); return NULL; } + info->WinType.hwndCaller = caller; if(!CreateViewer(info)) { ReleaseHelpViewer(info); diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index a5e7e37..bda435a 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -181,7 +181,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } index = default_index; - info = CreateHelpViewer(fullname); + info = CreateHelpViewer(fullname, caller); if(!info) { heap_free(default_index); @@ -253,7 +253,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return 0; } - info = CreateHelpViewer(fullname); + info = CreateHelpViewer(fullname, caller); if(!info) return NULL; diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index f03d476..bfc6618 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -194,7 +194,7 @@ IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; -HHInfo *CreateHelpViewer(LPCWSTR) DECLSPEC_HIDDEN; +HHInfo *CreateHelpViewer(LPCWSTR,HWND) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012