November 2008 - Wine-Commits

Huw Davies : version: Fixed comments.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 559112d472b977fafe8a564f557a11534cefa127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=559112d472b977fafe8a564f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 25 14:48:49 2008 +0000 version: Fixed comments. --- dlls/version/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/resource.c b/dlls/version/resource.c index 03076d8..fdfd3ba 100644 --- a/dlls/version/resource.c +++ b/dlls/version/resource.c @@ -169,7 +169,7 @@ static int read_xx_header( HFILE lzfd ) } /*********************************************************************** - * load_ne_resource [internal] + * find_ne_resource [internal] */ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, DWORD *resLen, DWORD *resOff ) @@ -268,7 +268,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, } /*********************************************************************** - * load_pe_resource [internal] + * find_pe_resource [internal] */ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, DWORD *resLen, DWORD *resOff )

1 0

Maarten Lankhorst : tools: Add calling conventions for win64 to winegcc.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: cd360cc00713569604966748a3a7061d8fcc7115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd360cc00713569604966748a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 3 00:00:31 2008 -0700 tools: Add calling conventions for win64 to winegcc. --- tools/winegcc/winegcc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 113819d..40dacf8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -287,7 +287,14 @@ static void compile(struct options* opts, const char* lang) if (gcc_defs) { -#ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ +#ifdef __x86_64__ + strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D__cdecl=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D_stdcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); + strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); +#elif defined(__APPLE__) /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))");

1 0

Huw Davies : comdlg32: GetPrinterW and GetPrinterDriverW return the size in bytes so don' t multiply by sizeof(WCHAR).
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 31fd0d5d7a5a44868d5807596401e8878448c0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fd0d5d7a5a44868d5807596… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 25 15:40:05 2008 +0000 comdlg32: GetPrinterW and GetPrinterDriverW return the size in bytes so don't multiply by sizeof(WCHAR). --- dlls/comdlg32/printdlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 749f8e1..bdc2a0d 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1125,11 +1125,11 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, return FALSE; } GetPrinterW(hprn, 2, NULL, 0, &needed); - PrintStructures->lpPrinterInfo = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); + PrintStructures->lpPrinterInfo = HeapAlloc(GetProcessHeap(),0,needed); GetPrinterW(hprn, 2, (LPBYTE)PrintStructures->lpPrinterInfo, needed, &needed); GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); - PrintStructures->lpDriverInfo = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); + PrintStructures->lpDriverInfo = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)PrintStructures->lpDriverInfo, needed, &needed)) { ERR("GetPrinterDriverA failed for %s, fix your config!\n",debugstr_w(PrintStructures->lpPrinterInfo->pPrinterName)); @@ -2283,11 +2283,11 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd) } GetPrinterW(hprn, 2, NULL, 0, &needed); - pbuf = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*needed); + pbuf = HeapAlloc(GetProcessHeap(), 0, needed); GetPrinterW(hprn, 2, (LPBYTE)pbuf, needed, &needed); GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed); - dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed); + dbuf = HeapAlloc(GetProcessHeap(),0,needed); if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) { ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n", GetLastError(),debugstr_w(pbuf->pPrinterName));

1 0

Maarten Lankhorst : wldap32: Fix winldap_private header compatibility with 64-bit.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 39d80a3c96daf440696ea49f6da9478c18c6d14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d80a3c96daf440696ea49f6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 25 09:05:46 2008 +0100 wldap32: Fix winldap_private header compatibility with 64-bit. --- dlls/wldap32/winldap_private.h | 338 ++++++++++++++++++++-------------------- 1 files changed, 169 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39d80a3c96daf440696ea…

1 0

Henri Verbeet : wined3d: Const correctness fixes for surface.c.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 4cea13dec75e007566adc7345d3cafa2e12db10e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cea13dec75e007566adc7345… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Const correctness fixes for surface.c. --- dlls/wined3d/surface.c | 84 ++++++++++++++++++++++++++--------------------- 1 files changed, 46 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4cea13dec75e007566adc…

1 0

Henri Verbeet : wined3d: Const correctness fixes for glsl_shader.c.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: fecfddfb3a598eef5382bba21abee60acba550d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecfddfb3a598eef5382bba21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Const correctness fixes for glsl_shader.c. --- dlls/wined3d/glsl_shader.c | 161 +++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 77 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fecfddfb3a598eef5382b…

1 0

Henri Verbeet : wined3d: Const correctness fixes for arb_program_shader.c.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: d8f6e63541ea8fcb1b3a2499ac17bae567c80249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f6e63541ea8fcb1b3a2499a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Const correctness fixes for arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 84 +++++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 3 +- dlls/wined3d/baseshader.c | 14 ++--- dlls/wined3d/glsl_shader.c | 6 ++- dlls/wined3d/nvidia_texture_shader.c | 3 +- dlls/wined3d/state.c | 3 +- dlls/wined3d/wined3d_private.h | 15 ++---- 7 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8f6e63541ea8fcb1b3a2…

1 0

Henri Verbeet : wined3d: Make the SHADER_OPCODE_ARG parameter to shader handlers const.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: cfb3bea895c58bd541797788668260c0b7d46d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb3bea895c58bd5417977886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 25 14:36:09 2008 +0100 wined3d: Make the SHADER_OPCODE_ARG parameter to shader handlers const. --- dlls/wined3d/arb_program_shader.c | 110 +++++++++++++--------- dlls/wined3d/glsl_shader.c | 186 +++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 180 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfb3bea895c58bd541797…

1 0

Alexandre Julliard : widl: Make sure format strings for structure and union types are only output once .
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 0b7478a79fb0594daba5cee3c0288884c352ad39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7478a79fb0594daba5cee3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 25 21:47:47 2008 +0100 widl: Make sure format strings for structure and union types are only output once. --- tools/widl/typegen.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 45467e5..98145a7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1864,8 +1864,9 @@ static size_t write_struct_tfs(FILE *file, type_t *type, nothing is written to file yet. On the actual writing pass, this will have been updated. */ unsigned int absoff = type->ptrdesc ? type->ptrdesc : *tfsoff; - short reloff = absoff - *tfsoff; - print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", + int reloff = absoff - *tfsoff; + assert( reloff >= 0 ); + print_file(file, 2, "NdrFcShort(0x%x),\t/* Offset= %d (%u) */\n", reloff, reloff, absoff); *tfsoff += 2; } @@ -2254,6 +2255,8 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f if (is_base_type(type->type)) return 0; + if (processed(type)) return type->typestring_offset; + switch (type->type) { case RPC_FC_STRUCT:

1 0

Alexandre Julliard : kernel32/tests: Fix the unimplemented check for EnumSystemLanguageGroupsA.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: f0483957ddc8d74070b7d6b3497bb56c0883ae32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0483957ddc8d74070b7d6b34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 26 12:04:32 2008 +0100 kernel32/tests: Fix the unimplemented check for EnumSystemLanguageGroupsA. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index c5f3ddb..4dce733 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2163,7 +2163,7 @@ static void test_EnumSystemLanguageGroupsA(void) /* No enumeration proc */ SetLastError(0); ret = pEnumSystemLanguageGroupsA(0, LGRPID_INSTALLED, 0); - if (ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("EnumSystemLanguageGroupsA is not implemented\n"); return;

1 0