wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Alexandre Julliard : opengl32: Make the script default to version 1.1. Remove the glGetLevelParameter stubs.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: cd8f5c86ef04d353d519f14bdef615f423b2ed52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8f5c86ef04d353d519f14bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 11 11:53:40 2009 +0200 opengl32: Make the script default to version 1.1. Remove the glGetLevelParameter stubs. --- dlls/opengl32/make_opengl | 8 +++----- dlls/opengl32/opengl32.spec | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 752ac87..b2966dc 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -22,7 +22,7 @@ use strict; # http://oss.sgi.com/cgi-bin/cvsweb.cgi/projects/ogl-sample/main/doc/registry… # # - opengl_version is the OpenGL version emulated by the library -# (can be 1.0 to 1.5). The default is 1.2. +# (can be 1.0 to 1.5). The default is 1.1. # # This script generates the three following files : # @@ -314,7 +314,7 @@ if (@ARGV > 1) { $name0=~s%^.*/%%; die "Usage: $name0 [version]\n"; } -my $version = $ARGV[0] || "1.2"; +my $version = $ARGV[0] || "1.1"; if ($version eq "1.0") { %norm_categories = %cat_1_0; } elsif ($version eq "1.1") { @@ -644,9 +644,7 @@ foreach (sort keys %norm_functions) { print SPEC ") wine_$func_name\n"; } -print SPEC "@ stub glGetLevelParameterfv -@ stub glGetLevelParameteriv -@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat +print SPEC "@ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext @ stdcall wglCreateLayerContext(long long) diff --git a/dlls/opengl32/opengl32.spec b/dlls/opengl32/opengl32.spec index 09ddf47..a965771 100644 --- a/dlls/opengl32/opengl32.spec +++ b/dlls/opengl32/opengl32.spec @@ -334,8 +334,6 @@ @ stdcall glVertex4sv( ptr ) wine_glVertex4sv @ stdcall glVertexPointer( long long long ptr ) wine_glVertexPointer @ stdcall glViewport( long long long long ) wine_glViewport -@ stub glGetLevelParameterfv -@ stub glGetLevelParameteriv @ stdcall wglChoosePixelFormat(long ptr) gdi32.ChoosePixelFormat @ stdcall wglCopyContext(long long long) gdi32.wglCopyContext @ stdcall wglCreateContext(long) gdi32.wglCreateContext

1 0

Roderick Colenbrander : opengl32: Get rid of glext.h.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: ab20785b1ba81e34067e9572aca0244ea03d70bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab20785b1ba81e34067e9572a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 10 21:54:22 2009 +0200 opengl32: Get rid of glext.h. --- dlls/opengl32/opengl_ext.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 8ae7c2f..988317f 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -24,11 +24,7 @@ #undef WINAPI #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ -#define GL_GLEXT_PROTOTYPES #include <GL/gl.h> -#ifdef HAVE_GL_GLEXT_H -# include <GL/glext.h> -#endif #undef XMD_H #undef APIENTRY

1 0

Roderick Colenbrander : opengl32: Sync with the latest opengl 3. 1 extensions and don't export opengl32 1.2 functions.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 16439a430c37eb1bc3251deae42c03d63385cdd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16439a430c37eb1bc3251deae… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jun 10 21:43:01 2009 +0200 opengl32: Sync with the latest opengl 3.1 extensions and don't export opengl32 1.2 functions. --- dlls/opengl32/opengl32.spec | 42 +--- dlls/opengl32/opengl_ext.c | 630 +++++++++++++++++++++++++++++++++++-------- dlls/opengl32/opengl_norm.c | 380 -------------------------- 3 files changed, 522 insertions(+), 530 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16439a430c37eb1bc3251…

1 0

Andrew Talbot : credui: Constify a variable.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: c495df68835b94b2f1d0aa467fbb1cd24ec03c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c495df68835b94b2f1d0aa467… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jun 10 20:54:55 2009 +0100 credui: Constify a variable. --- dlls/credui/credui_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 7e3c8a0..a6bbde6 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -138,7 +138,7 @@ struct cred_dialog_params BOOL fBalloonTipActive; }; -static void CredDialogFillUsernameCombo(HWND hwndUsername, struct cred_dialog_params *params) +static void CredDialogFillUsernameCombo(HWND hwndUsername, const struct cred_dialog_params *params) { DWORD count; DWORD i;

1 0

Damjan Jovanovic : start.exe: Add infrastructure to launch windows file open associations from freedesktop .
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 3b52d42ab4151f4620313dae351f4ae35366f00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b52d42ab4151f4620313dae3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 10 21:11:48 2009 +0200 start.exe: Add infrastructure to launch windows file open associations from freedesktop. --- programs/start/Cs.rc | 1 + programs/start/De.rc | 1 + programs/start/En.rc | 1 + programs/start/Es.rc | 1 + programs/start/Fr.rc | 1 + programs/start/It.rc | 1 + programs/start/Ko.rc | 1 + programs/start/Nl.rc | 1 + programs/start/Pl.rc | 1 + programs/start/Pt.rc | 1 + programs/start/Ru.rc | 1 + programs/start/Si.rc | 1 + programs/start/Tr.rc | 1 + programs/start/start.c | 21 +++++++++++++++++++-- 14 files changed, 32 insertions(+), 2 deletions(-) diff --git a/programs/start/Cs.rc b/programs/start/Cs.rc index b319f8d..1693f8b 100644 --- a/programs/start/Cs.rc +++ b/programs/start/Cs.rc @@ -37,6 +37,7 @@ Volby:\n\ /MAX[imalizovan�] Spust� program maximalizovan�.\n\ /R Spust� program norm�ln� (ani minimalizovan� ani maximalizovan�).\n\ /W �ek� na dokon�en� spu�t�n�ho programu, vrac� n�vratov� k�d.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Zobraz� licenci.\n\ \n\ start.exe verze 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/De.rc b/programs/start/De.rc index 3ab7aa0..4f54a53 100644 --- a/programs/start/De.rc +++ b/programs/start/De.rc @@ -34,6 +34,7 @@ Optionen:\n\ /MAX[imized] Starte das Programm maximiert.\n\ /R[estored] Starte das Programm normal (weder minimiert noch maximiert).\n\ /W[ait] Wartet bis das gestartete Programm sich beendet,\n\t dann beendet sich start mit dessen Exitcode des Programmes.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Zeige die Endbenutzerlizenz an.\n\ \n\ start.exe Version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/En.rc b/programs/start/En.rc index f44ba11..0429fe9 100644 --- a/programs/start/En.rc +++ b/programs/start/En.rc @@ -34,6 +34,7 @@ Options:\n\ /R[estored] Start the program normally (neither minimized nor maximized).\n\ /W[ait] Wait for started program to finish, then exit with its exit code.\n\ /Unix Use a Unix filename and start the file like windows explorer.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Show end-user license.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Es.rc b/programs/start/Es.rc index fd74d8f..ac1c6d7 100644 --- a/programs/start/Es.rc +++ b/programs/start/Es.rc @@ -34,6 +34,7 @@ Opciones:\n\ /R[estored] Inicia el programa normalmente (ni minimizado ni maximizado).\n\ /W[ait] Espera que termine el programa iniciado y despu�s sale con su c�digo de salida.\n\ /Unix Usa un nombre de archivo de Unix e inicia el archivo como en el explorador de windows.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Muestra la licencia para el usuario final.\n\ \n\ start.exe versi�n 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Fr.rc b/programs/start/Fr.rc index 7373637..a2c8fd7 100644 --- a/programs/start/Fr.rc +++ b/programs/start/Fr.rc @@ -37,6 +37,7 @@ Options :\n\ /MAX[imized] Lance le programme maximisé.\n\ /R[estored] Lance le programme normalement (ni minimisé ni maximisé).\n\ /W[ait] Attend que le programme lancé se termine, et termine ensuite avec son code de sortie.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Montre la licence d'utilisation.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/It.rc b/programs/start/It.rc index aa83497..42f59ac 100644 --- a/programs/start/It.rc +++ b/programs/start/It.rc @@ -35,6 +35,7 @@ Options:\n\ /MAX[imized] Avvia il programma massimizato.\n\ /R[estored] Avvia il programma normalmente (n� minimizzato n� massimizato).\n\ /W[ait] Attendi l'uscita del programma, poi esci con il suo codice di uscita.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Mostra l'accordo di licenza con l'utente finale.\n\ \n\ start.exe versione 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Ko.rc b/programs/start/Ko.rc index 6c177fe..bc58ebc 100644 --- a/programs/start/Ko.rc +++ b/programs/start/Ko.rc @@ -35,6 +35,7 @@ Options:\n\ /R[estored] Ǯ�׸�� ·� ��۽�Ű�� (�ּ�ȭ�� ƴϰ� �ִ�ȭ�� ƴ�).\n\ /W[ait] ��۵� Ǯ�׸�� ٸ�, �� ڵ带 ��.\n\ /Unix �� ͽ��÷ξ�� н� ��̸�� ؼ� ��.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L �� ̼�� \n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Nl.rc b/programs/start/Nl.rc index 725789a..69012a1 100644 --- a/programs/start/Nl.rc +++ b/programs/start/Nl.rc @@ -34,6 +34,7 @@ Options:\n\ /R[estored] Start het programma normaal (noch geminimaliseerd noch gemaximaliseerd).\n\ /W[ait] Wacht totdat het gestarte programma is be�indigd, eindig dan met de exit code van dat programma.\n\ /Unix Gebruik een Unix bestandsnaam en start het bestand als de windows verkenner.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Laat de gebruikerslicentie zien.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Pl.rc b/programs/start/Pl.rc index 514c192..09b9f51 100644 --- a/programs/start/Pl.rc +++ b/programs/start/Pl.rc @@ -35,6 +35,7 @@ Opcje:\n\ /R[estored] Uruchamia program normalnie (bez minimalizacji ani maksymalizacji).\n\ /W[ait] Zaczekaj a� program zako�czy dzia�anie (i zako�cz\n\ \t kodem wyj�cia programu).\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Poka� licencj� u�ytkownika.\n\ \n\ start.exe wersja 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Pt.rc b/programs/start/Pt.rc index 9030238..51ff53b 100644 --- a/programs/start/Pt.rc +++ b/programs/start/Pt.rc @@ -34,6 +34,7 @@ Options:\n\ /MAX[imized] Inicia o programa maximizado.\n\ /R[estored] Inicia o programa normalmente (sem minimizar nem maximizar).\n\ /W[ait] Aguarda que o programa iniciado termine e ent�o retorno um c�digo (exit code).\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Mostra a licen�a ao usu�rio.\n\ \n\ start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index 3e9cf62..97e9854 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -34,6 +34,7 @@ start [options] /R[estored] �� (�� ).\n\ /W[ait] �� .\n\ /Unix �� Unix �� .\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L �� .\n\ \n\ start.exe �� 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Si.rc b/programs/start/Si.rc index b7ff270..e10ddf7 100644 --- a/programs/start/Si.rc +++ b/programs/start/Si.rc @@ -35,6 +35,7 @@ Možnosti:\n\ /MAX[imized] Zažene program z razširjenim oknom.\n\ /R[estored] Zažene program z običajno velikostjo okna.\n\ /W[ait] Počaka, da se zagnani program zaključi, nato se zaključi in vrne izhodno kodo programa.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Prikaže licenčno pogodbo.\n\ \n\ start.exe različica 0.2 Copyright (C) 2003, Dan Kegel\n\ diff --git a/programs/start/Tr.rc b/programs/start/Tr.rc index 28f15a2..de7a69d 100644 --- a/programs/start/Tr.rc +++ b/programs/start/Tr.rc @@ -33,6 +33,7 @@ Se /MAX[imized] Ekran� kaplayacak �ekilde ba�lat.\n\ /R[estored] Program� normal bir �ekilde ba�lat (simge halinde veya b�y�t�lm�� halde olabilir).\n\ /W[ait] Ba�lat�lm�� program�n bitmesini bekle, sonra ��k�� koduyla ��k.\n\ +/ProgIDOpen Open a document using the following progID.\n\ /L Son-kullan�c� lisans�n� g�ster.\n\ \n\ start.exe s�r�m 0.2 Telif Hakk� (C) 2003, Dan Kegel\n\ diff --git a/programs/start/start.c b/programs/start/start.c index ed7df03..e58d4c0 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -176,12 +176,15 @@ int wmain (int argc, WCHAR *argv[]) WCHAR *args = NULL; int i; int unix_mode = 0; + int progid_open = 0; WCHAR *dos_filename = NULL; WCHAR *parent_directory = NULL; DWORD binary_type; static const WCHAR openW[] = { 'o', 'p', 'e', 'n', 0 }; static const WCHAR unixW[] = { 'u', 'n', 'i', 'x', 0 }; + static const WCHAR progIDOpenW[] = + { 'p', 'r', 'o', 'g', 'I', 'D', 'O', 'p', 'e', 'n', 0}; memset(&sei, 0, sizeof(sei)); sei.cbSize = sizeof(sei); @@ -203,7 +206,7 @@ int wmain (int argc, WCHAR *argv[]) break; /* Unix paths can start with / so we have to assume anything following /U is not a flag */ - if (unix_mode) + if (unix_mode || progid_open) break; /* Handle all options in this word */ @@ -235,6 +238,15 @@ int wmain (int argc, WCHAR *argv[]) usage(); } break; + case 'p': + case 'P': + if (strncmpiW(&argv[i][ci], progIDOpenW, 17) == 0) + progid_open = 1; + else { + WINE_ERR("Option '%s' not recognized\n", wine_dbgstr_w( argv[i]+ci-1)); + usage(); + } + break; case 'w': case 'W': sei.fMask |= SEE_MASK_NOCLOSEPROCESS; @@ -252,12 +264,17 @@ int wmain (int argc, WCHAR *argv[]) if (i == argc) usage(); + if (progid_open) { + sei.lpClass = argv[i++]; + sei.fMask |= SEE_MASK_CLASSNAME; + } + sei.lpFile = argv[i++]; args = build_args( argc - i, &argv[i] ); sei.lpParameters = args; - if (unix_mode) { + if (unix_mode || progid_open) { LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR); char* multibyte_unixpath; int multibyte_unixpath_len;

1 0

Huw Davies : oleaut32: Calling SetLcid with LOCALE_NEUTRAL is a special case which sets the first header lcid to US English and the second one to 0 .
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: d84693cc291db686cdcd2e2e3d9b83991f2de4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84693cc291db686cdcd2e2e3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 10 16:45:29 2009 +0100 oleaut32: Calling SetLcid with LOCALE_NEUTRAL is a special case which sets the first header lcid to US English and the second one to 0. --- dlls/oleaut32/tests/typelib.c | 55 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 7 ++++- 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 6a07a49..2748ed0 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1378,6 +1378,58 @@ static const char *create_test_typelib(void) return filename; } +static void test_create_typelib_lcid(LCID lcid) +{ + char filename[MAX_PATH]; + WCHAR name[MAX_PATH]; + HRESULT hr; + ICreateTypeLib2 *tl; + HANDLE file; + DWORD msft_header[5]; /* five is enough for now */ + DWORD read; + + GetTempFileNameA( ".", "tlb", 0, filename ); + MultiByteToWideChar(CP_ACP, 0, filename, -1, name, MAX_PATH); + + hr = CreateTypeLib2(SYS_WIN32, name, &tl); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SetLcid(tl, lcid); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ICreateTypeLib2_SaveAllChanges(tl); + ICreateTypeLib2_Release(tl); + + file = CreateFileA( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" ); + + ReadFile( file, msft_header, sizeof(msft_header), &read, NULL ); + ok(read == sizeof(msft_header), "read %d\n", read); + CloseHandle( file ); + + ok(msft_header[0] == 0x5446534d, "got %08x\n", msft_header[0]); + ok(msft_header[1] == 0x00010002, "got %08x\n", msft_header[1]); + ok(msft_header[2] == 0xffffffff, "got %08x\n", msft_header[2]); + ok(msft_header[3] == (lcid ? lcid : 0x409), "got %08x (lcid %08x)\n", msft_header[3], lcid); + ok(msft_header[4] == lcid, "got %08x (lcid %08x)\n", msft_header[4], lcid); + + DeleteFileA(filename); +} + +static void test_create_typelibs(void) +{ + test_create_typelib_lcid(LOCALE_SYSTEM_DEFAULT); + test_create_typelib_lcid(LOCALE_USER_DEFAULT); + test_create_typelib_lcid(LOCALE_NEUTRAL); + + test_create_typelib_lcid(0x009); + test_create_typelib_lcid(0x409); + test_create_typelib_lcid(0x809); + + test_create_typelib_lcid(0x007); + test_create_typelib_lcid(0x407); +} + START_TEST(typelib) { const char *filename; @@ -1394,4 +1446,7 @@ START_TEST(typelib) test_dump_typelib( filename ); DeleteFile( filename ); } + + test_create_typelibs(); + } diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 3d092e5..b011342 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3204,7 +3204,10 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 * iface, /****************************************************************************** * ICreateTypeLib2_SetLcid {OLEAUT32} * - * See ICreateTypeLib_SetLcid. + * Sets both the lcid and lcid2 members in the header to lcid. + * + * As a special case if lcid == LOCALE_NEUTRAL (0), then the first header lcid + * is set to US English while the second one is set to 0. */ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lcid) { @@ -3214,6 +3217,8 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lc This->typelib_header.lcid = This->typelib_header.lcid2 = lcid; + if(lcid == LOCALE_NEUTRAL) This->typelib_header.lcid = MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US); + return S_OK; }

1 0

Hib Eris : msi: Fix a crash when freeing memory.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 8fb7fdd0295df22b19bc9ee55431ff54521a6ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb7fdd0295df22b19bc9ee55… Author: Hib Eris <hib(a)hiberis.nl> Date: Wed Jun 10 17:13:59 2009 +0200 msi: Fix a crash when freeing memory. --- dlls/msi/streams.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 2d869cc..12f707e 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -60,7 +60,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) if (size >= sv->max_streams) { sv->max_streams *= 2; - sv->streams = msi_realloc(sv->streams, sv->max_streams * sizeof(STREAM *)); + sv->streams = msi_realloc_zero(sv->streams, sv->max_streams * sizeof(STREAM *)); if (!sv->streams) return FALSE; } @@ -387,7 +387,7 @@ static UINT STREAMS_delete(struct tagMSIVIEW *view) for (i = 0; i < sv->num_rows; i++) { - if (sv->streams[i]->stream) + if (sv->streams[i] && sv->streams[i]->stream) IStream_Release(sv->streams[i]->stream); msi_free(sv->streams[i]); } @@ -462,7 +462,7 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) return -1; sv->max_streams = 1; - sv->streams = msi_alloc(sizeof(STREAM *)); + sv->streams = msi_alloc_zero(sizeof(STREAM *)); if (!sv->streams) return -1;

1 0

Ken Sharp : olesvr32: Add OleRevokeServer stub.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: a277da5b480429be0fd2cc9af1f13c04d8f51524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a277da5b480429be0fd2cc9af… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 10 13:08:12 2009 +0100 olesvr32: Add OleRevokeServer stub. --- dlls/olesvr32/olesvr32.spec | 2 +- dlls/olesvr32/olesvr_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/olesvr32/olesvr32.spec b/dlls/olesvr32/olesvr32.spec index 9fdd02d..9db60ec 100644 --- a/dlls/olesvr32/olesvr32.spec +++ b/dlls/olesvr32/olesvr32.spec @@ -1,6 +1,6 @@ 1 stub WEP 2 stdcall OleRegisterServer(str ptr ptr long long) - 3 stub OleRevokeServer + 3 stdcall OleRevokeServer(long) 4 stdcall OleBlockServer(long) 5 stdcall OleUnblockServer(long ptr) 6 stdcall OleRegisterServerDoc(ptr str ptr ptr) diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index b48d58b..57c28e1 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -210,3 +210,13 @@ OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) FIXME("(%d): stub.\n", hDoc); return OLE_OK; } + +/****************************************************************************** + * OleRevokeServer [OLESVR32.3] + * + */ +OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer) +{ + FIXME("(%d): stub.\n", hServer); + return OLE_OK; +}

1 0

Paul Vriens : riched32/tests: Correct a test to better show the behavior.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 3a228fb59382d692d3005dae468f0905ed463a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a228fb59382d692d3005dae4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jun 10 13:17:45 2009 +0200 riched32/tests: Correct a test to better show the behavior. --- dlls/riched32/tests/editor.c | 56 ++++++++++++++++++++++++++++++----------- 1 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 8e0388c..da74b72 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -827,7 +827,7 @@ static void test_word_wrap(void) POINTL point = {0, 60}; /* This point must be below the first line */ const char *text = "Must be long enough to test line wrapping"; DWORD dwCommonStyle = WS_VISIBLE|WS_POPUP|WS_VSCROLL|ES_MULTILINE; - int res, pos, lines; + int res, pos, lines, prevlines, reflines[3]; /* Test the effect of WS_HSCROLL and ES_AUTOHSCROLL styles on wrapping * when specified on window creation and set later. */ @@ -920,29 +920,55 @@ static void test_word_wrap(void) ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); DestroyWindow(hwnd); - /* Test to see if wrapping happens with redraw disabled. */ + /* First lets see if the text would wrap normally (needed for reference) */ hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, - 0, 0, 400, 80, NULL, NULL, hmoduleRichEdit, NULL); + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); + ok(IsWindowVisible(hwnd), "Window should be visible.\n"); + res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); + ok(res, "EM_REPLACESEL failed.\n"); + /* Should have wrapped */ + reflines[0] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(reflines[0] > 1, "Line was expected to wrap (%d lines).\n", reflines[0]); + /* Resize the window to fit the line */ + MoveWindow(hwnd, 0, 0, 600, 80, TRUE); + /* Text should not be wrapped */ + reflines[1] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(reflines[1] == 1, "Line wasn't expected to wrap (%d lines).\n", reflines[1]); + /* Resize the window again to make sure the line wraps again */ + MoveWindow(hwnd, 0, 0, 10, 80, TRUE); + reflines[2] = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(reflines[2] > 1, "Line was expected to wrap (%d lines).\n", reflines[2]); + DestroyWindow(hwnd); + + /* Same test with redraw disabled */ + hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle, + 0, 0, 200, 80, NULL, NULL, hmoduleRichEdit, NULL); ok(hwnd != NULL, "error: %d\n", (int) GetLastError()); ok(IsWindowVisible(hwnd), "Window should be visible.\n"); + /* Redraw is disabled by making the window invisible. */ SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); - /* redraw is disabled by making the window invisible. */ ok(!IsWindowVisible(hwnd), "Window shouldn't be visible.\n"); res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); ok(res, "EM_REPLACESEL failed.\n"); - MoveWindow(hwnd, 0, 0, 100, 80, TRUE); - SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); - /* Wrapping didn't happen while redraw was disabled. */ + /* Should have wrapped */ + prevlines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); + ok(prevlines == reflines[0], + "Line was expected to wrap (%d lines).\n", prevlines); + /* Resize the window to fit the line, no change to the number of lines */ + MoveWindow(hwnd, 0, 0, 600, 80, TRUE); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - todo_wine ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); - /* There isn't even a rewrap from resizing the window. */ + todo_wine + ok(lines == prevlines || + broken(lines == reflines[1]), /* Win98, WinME and NT4 */ + "Expected no change in the number of lines\n"); + /* Resize the window again to make sure the line wraps again */ + MoveWindow(hwnd, 0, 0, 10, 80, TRUE); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - todo_wine ok(lines == 1, "Line wasn't expected to wrap (lines=%d).\n", lines); - res = SendMessage(hwnd, EM_REPLACESEL, FALSE, (LPARAM) text); - ok(res, "EM_REPLACESEL failed.\n"); - lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); - + todo_wine + ok(lines == prevlines || + broken(lines == reflines[2]), /* Win98, WinME and NT4 */ + "Expected no change in the number of lines\n"); DestroyWindow(hwnd); }

1 0

Alexandre Julliard : rpcrt4: Adjust the start of the proxy virtual table for stubless proxies.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: c35aa1d46d0a05ce1e738d14867c3e233e04fd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35aa1d46d0a05ce1e738d148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 10 16:54:30 2009 +0200 rpcrt4: Adjust the start of the proxy virtual table for stubless proxies. --- dlls/rpcrt4/cpsf.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index fe55185..ac1eccf 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -167,8 +167,9 @@ static void init_psfactory( CStdPSFactoryBuffer *psfac, const ProxyFileInfo **fi if (file_list[i]->pDelegatedIIDs && file_list[i]->pDelegatedIIDs[j]) { - fill_delegated_proxy_table( (IUnknownVtbl *)proxies[j]->Vtbl, - stubs[j]->header.DispatchTableCount ); + void **vtbl = proxies[j]->Vtbl; + if (file_list[i]->TableVersion > 1) vtbl++; + fill_delegated_proxy_table( (IUnknownVtbl *)vtbl, stubs[j]->header.DispatchTableCount ); pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Delegating_Vtbl; }

1 0

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 June 2009